ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1748688 [2/2] - in /ace/trunk: ./ cnf/buildrepo/osgi.annotation/ cnf/ext/ cnf/gradle/ cnf/localrepo/ org.apache.ace.agent/src/org/apache/ace/agent/ org.apache.ace.agent/src/org/apache/ace/agent/impl/ org.apache.ace.agent/test/org/apache/ac...
Date Thu, 16 Jun 2016 11:26:54 GMT
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DeploymentVersionRepository.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DeploymentVersionRepository.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DeploymentVersionRepository.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DeploymentVersionRepository.java Thu Jun 16 11:26:52 2016
@@ -25,7 +25,7 @@ import org.apache.ace.client.repository.
 import org.apache.ace.client.repository.object.DeploymentArtifact;
 import org.apache.ace.client.repository.object.DeploymentVersionObject;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 
 /**

Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Distribution2TargetAssociationRepository.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Distribution2TargetAssociationRepository.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Distribution2TargetAssociationRepository.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Distribution2TargetAssociationRepository.java Thu Jun 16 11:26:52 2016
@@ -23,7 +23,7 @@ import org.apache.ace.client.repository.
 import org.apache.ace.client.repository.object.Distribution2TargetAssociation;
 import org.apache.ace.client.repository.object.DistributionObject;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Interface to a Distribution2TargetAssociationRepository. The functionality is defined by the generic AssociationRepository.

Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DistributionRepository.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DistributionRepository.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DistributionRepository.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DistributionRepository.java Thu Jun 16 11:26:52 2016
@@ -21,7 +21,7 @@ package org.apache.ace.client.repository
 import org.apache.ace.client.repository.ObjectRepository;
 import org.apache.ace.client.repository.object.DistributionObject;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Interface to a DistributionRepository. The functionality is defined by the generic AssociationRepository.

Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Feature2DistributionAssociationRepository.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Feature2DistributionAssociationRepository.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Feature2DistributionAssociationRepository.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Feature2DistributionAssociationRepository.java Thu Jun 16 11:26:52 2016
@@ -23,7 +23,7 @@ import org.apache.ace.client.repository.
 import org.apache.ace.client.repository.object.FeatureObject;
 import org.apache.ace.client.repository.object.DistributionObject;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Interface to a Feature2DistributionAssociationRepository. The functionality is defined by the generic AssociationRepository.

Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/FeatureRepository.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/FeatureRepository.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/FeatureRepository.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/FeatureRepository.java Thu Jun 16 11:26:52 2016
@@ -21,7 +21,7 @@ package org.apache.ace.client.repository
 import org.apache.ace.client.repository.ObjectRepository;
 import org.apache.ace.client.repository.object.FeatureObject;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Interface to a FeatureRepository. The functionality is defined by the generic AssociationRepository.

Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/RepositoryConfiguration.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/RepositoryConfiguration.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/RepositoryConfiguration.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/RepositoryConfiguration.java Thu Jun 16 11:26:52 2016
@@ -21,7 +21,7 @@ package org.apache.ace.client.repository
 
 import java.net.URL;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Provides the configuration options for several of the repositories.

Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/RepositoryConstants.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/RepositoryConstants.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/RepositoryConstants.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/RepositoryConstants.java Thu Jun 16 11:26:52 2016
@@ -21,7 +21,7 @@ package org.apache.ace.client.repository
 
 import java.net.URL;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Constants used for the repository.

Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/TargetRepository.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/TargetRepository.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/TargetRepository.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/TargetRepository.java Thu Jun 16 11:26:52 2016
@@ -21,7 +21,7 @@ package org.apache.ace.client.repository
 import org.apache.ace.client.repository.ObjectRepository;
 import org.apache.ace.client.repository.object.TargetObject;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Interface to a GatewayRepository. The functionality is defined by the generic AssociationRepository.

Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/packageinfo?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/packageinfo (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/packageinfo Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 2.0.0
\ No newline at end of file
+version 2.0.1
\ No newline at end of file

Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetObject.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetObject.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetObject.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetObject.java Thu Jun 16 11:26:52 2016
@@ -28,7 +28,7 @@ import org.apache.ace.client.repository.
 import org.apache.ace.client.repository.object.DistributionObject;
 import org.apache.ace.feedback.Event;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Represents the information that a <code>TargetObject</code>

Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetRepository.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetRepository.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetRepository.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetRepository.java Thu Jun 16 11:26:52 2016
@@ -22,7 +22,7 @@ import java.util.Map;
 
 import org.apache.ace.client.repository.ObjectRepository;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Represents a repository of <ode>StatefulTargetObject</code>'s.

Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/packageinfo?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/packageinfo (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/packageinfo Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 1.1.0
\ No newline at end of file
+version 1.1.1
\ No newline at end of file

Modified: ace/trunk/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/ConnectionFactory.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/ConnectionFactory.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/ConnectionFactory.java (original)
+++ ace/trunk/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/ConnectionFactory.java Thu Jun 16 11:26:52 2016
@@ -24,10 +24,10 @@ import java.net.URLConnection;
 
 import org.osgi.service.useradmin.User;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
- * Provides a service to create {@link URLConnection}s. The connection factory will be responsible 
+ * Provides a service to create {@link URLConnection}s. The connection factory will be responsible
  * for supplying the necessary credentials to ensure the authentication of the connection succeeds.
  */
 @ProviderType
@@ -35,7 +35,7 @@ public interface ConnectionFactory {
 
     /**
      * Creates a new connection using the given URL, using the (optional) credentials.
-     * 
+     *
      * @param url the URL to connect to, cannot be <code>null</code>.
      * @return a {@link URLConnection} instance, never <code>null</code>.
      * @throws IllegalArgumentException in case the given URL was <code>null</code>;
@@ -45,7 +45,7 @@ public interface ConnectionFactory {
 
     /**
      * Creates a new connection using the given URL, using the (optional) credentials.
-     * 
+     *
      * @param url the URL to connect to, cannot be <code>null</code>;
      * @param user the user to fetch the credentials from, cannot be <code>null</code>.
      * @return a {@link URLConnection} instance, never <code>null</code>.

Modified: ace/trunk/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/packageinfo?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/packageinfo (original)
+++ ace/trunk/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/packageinfo Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.0.1
\ No newline at end of file

Modified: ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/processor/DeploymentProcessor.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/processor/DeploymentProcessor.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/processor/DeploymentProcessor.java (original)
+++ ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/processor/DeploymentProcessor.java Thu Jun 16 11:26:52 2016
@@ -24,7 +24,7 @@ import java.io.InputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Deployment processors can post process the deployment package before it is sent to the original requester. This allows you to

Modified: ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/processor/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/processor/packageinfo?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/processor/packageinfo (original)
+++ ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/processor/packageinfo Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.0.1
\ No newline at end of file

Modified: ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/ArtifactData.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/ArtifactData.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/ArtifactData.java (original)
+++ ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/ArtifactData.java Thu Jun 16 11:26:52 2016
@@ -21,7 +21,7 @@ package org.apache.ace.deployment.provid
 import java.net.URL;
 import java.util.jar.Attributes;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * The ArtifactData as returned by the <code>DeploymentProvider</code> class in this package. It contains several pieces

Modified: ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/DeploymentProvider.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/DeploymentProvider.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/DeploymentProvider.java (original)
+++ ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/DeploymentProvider.java Thu Jun 16 11:26:52 2016
@@ -21,7 +21,7 @@ package org.apache.ace.deployment.provid
 import java.io.IOException;
 import java.util.List;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * An interface that provides the meta information for the bundles

Modified: ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/OverloadedException.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/OverloadedException.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/OverloadedException.java (original)
+++ ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/OverloadedException.java Thu Jun 16 11:26:52 2016
@@ -18,7 +18,7 @@
  */
 package org.apache.ace.deployment.provider;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Exception that indicates that the deployment provider is overloaded.

Modified: ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/impl/ArtifactDataImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/impl/ArtifactDataImpl.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/impl/ArtifactDataImpl.java (original)
+++ ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/impl/ArtifactDataImpl.java Thu Jun 16 11:26:52 2016
@@ -24,7 +24,7 @@ import java.util.jar.Attributes;
 import org.apache.ace.deployment.provider.ArtifactData;
 import org.osgi.framework.Constants;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * Implementation of <code>ArtifactData</code>. It overrides equals to make comparisons between versions easier.

Modified: ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/impl/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/impl/packageinfo?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/impl/packageinfo (original)
+++ ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/impl/packageinfo Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 2.0.0
\ No newline at end of file
+version 2.0.1
\ No newline at end of file

Modified: ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/packageinfo?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/packageinfo (original)
+++ ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/packageinfo Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 1.1.0
\ No newline at end of file
+version 1.1.1
\ No newline at end of file

Modified: ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/streamgenerator/StreamGenerator.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/streamgenerator/StreamGenerator.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/streamgenerator/StreamGenerator.java (original)
+++ ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/streamgenerator/StreamGenerator.java Thu Jun 16 11:26:52 2016
@@ -23,7 +23,7 @@ import java.io.InputStream;
 
 import org.apache.ace.deployment.provider.OverloadedException;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 @ProviderType
 public interface StreamGenerator

Modified: ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/streamgenerator/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/streamgenerator/packageinfo?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/streamgenerator/packageinfo (original)
+++ ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/streamgenerator/packageinfo Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.0.1
\ No newline at end of file

Modified: ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/BundleStreamGenerator.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/BundleStreamGenerator.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/BundleStreamGenerator.java (original)
+++ ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/BundleStreamGenerator.java Thu Jun 16 11:26:52 2016
@@ -31,7 +31,7 @@ import java.util.jar.Manifest;
 import org.apache.ace.deployment.provider.ArtifactData;
 import org.osgi.framework.Constants;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 @ConsumerType
 public class BundleStreamGenerator {

Modified: ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestData.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestData.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestData.java (original)
+++ ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestData.java Thu Jun 16 11:26:52 2016
@@ -23,7 +23,7 @@ import java.util.jar.Attributes;
 
 import org.apache.ace.deployment.provider.ArtifactData;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 @ConsumerType
 public class TestData implements ArtifactData {

Modified: ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestProvider.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestProvider.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestProvider.java (original)
+++ ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestProvider.java Thu Jun 16 11:26:52 2016
@@ -26,7 +26,7 @@ import java.util.List;
 import org.apache.ace.deployment.provider.ArtifactData;
 import org.apache.ace.deployment.provider.DeploymentProvider;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 @ConsumerType
 public class TestProvider implements DeploymentProvider {

Modified: ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/packageinfo?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/packageinfo (original)
+++ ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/packageinfo Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 1.1.0
\ No newline at end of file
+version 1.1.1
\ No newline at end of file

Modified: ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/Discovery.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/Discovery.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/Discovery.java (original)
+++ ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/Discovery.java Thu Jun 16 11:26:52 2016
@@ -20,7 +20,7 @@ package org.apache.ace.discovery;
 
 import java.net.URL;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Service interface that can be used to locate the server.

Modified: ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/packageinfo?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/packageinfo (original)
+++ ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/packageinfo Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 1.1.0
\ No newline at end of file
+version 1.1.1
\ No newline at end of file

Modified: ace/trunk/org.apache.ace.http/src/org/apache/ace/http/package-info.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.http/src/org/apache/ace/http/package-info.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.http/src/org/apache/ace/http/package-info.java (original)
+++ ace/trunk/org.apache.ace.http/src/org/apache/ace/http/package-info.java Thu Jun 16 11:26:52 2016
@@ -17,5 +17,5 @@
  * under the License.
  */
 
-@aQute.bnd.annotation.Version("1.0.0")
+@org.osgi.annotation.versioning.Version("1.0.0")
 package org.apache.ace.http;

Modified: ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/Identification.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/Identification.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/Identification.java (original)
+++ ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/Identification.java Thu Jun 16 11:26:52 2016
@@ -18,7 +18,7 @@
  */
 package org.apache.ace.identification;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * The Identification service can be used to identify the system it is running on. This

Modified: ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/packageinfo?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/packageinfo (original)
+++ ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/packageinfo Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 1.1.0
\ No newline at end of file
+version 1.1.1
\ No newline at end of file

Modified: ace/trunk/org.apache.ace.log/src/org/apache/ace/log/Log.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/src/org/apache/ace/log/Log.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/src/org/apache/ace/log/Log.java (original)
+++ ace/trunk/org.apache.ace.log/src/org/apache/ace/log/Log.java Thu Jun 16 11:26:52 2016
@@ -20,7 +20,7 @@ package org.apache.ace.log;
 
 import java.util.Dictionary;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Log interface for a fairly generic logging mechanism, where each log entry has a type

Modified: ace/trunk/org.apache.ace.log/src/org/apache/ace/log/LogSync.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/src/org/apache/ace/log/LogSync.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/src/org/apache/ace/log/LogSync.java (original)
+++ ace/trunk/org.apache.ace.log/src/org/apache/ace/log/LogSync.java Thu Jun 16 11:26:52 2016
@@ -20,7 +20,7 @@ package org.apache.ace.log;
 
 import java.io.IOException;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Log synchronizing interface. It is intended to give direct access to the synchronizing

Modified: ace/trunk/org.apache.ace.log/src/org/apache/ace/log/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/src/org/apache/ace/log/packageinfo?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/src/org/apache/ace/log/packageinfo (original)
+++ ace/trunk/org.apache.ace.log/src/org/apache/ace/log/packageinfo Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 2.1.0
\ No newline at end of file
+version 2.1.1
\ No newline at end of file

Modified: ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/store/LogStore.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/store/LogStore.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/store/LogStore.java (original)
+++ ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/store/LogStore.java Thu Jun 16 11:26:52 2016
@@ -25,7 +25,7 @@ import java.util.List;
 import org.apache.ace.feedback.Descriptor;
 import org.apache.ace.feedback.Event;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Log store interface. Implementation of this service interface provide a persisted storage for Event logs.

Modified: ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/store/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/store/packageinfo?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/store/packageinfo (original)
+++ ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/store/packageinfo Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 2.1.0
\ No newline at end of file
+version 2.1.1
\ No newline at end of file

Modified: ace/trunk/org.apache.ace.log/src/org/apache/ace/log/target/store/LogStore.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/src/org/apache/ace/log/target/store/LogStore.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/src/org/apache/ace/log/target/store/LogStore.java (original)
+++ ace/trunk/org.apache.ace.log/src/org/apache/ace/log/target/store/LogStore.java Thu Jun 16 11:26:52 2016
@@ -24,7 +24,7 @@ import java.util.List;
 
 import org.apache.ace.feedback.Event;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Server log store interface for the targets. Implementations of this service interface provide a persisted storage for

Modified: ace/trunk/org.apache.ace.log/src/org/apache/ace/log/target/store/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/src/org/apache/ace/log/target/store/packageinfo?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/src/org/apache/ace/log/target/store/packageinfo (original)
+++ ace/trunk/org.apache.ace.log/src/org/apache/ace/log/target/store/packageinfo Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 2.0.0
\ No newline at end of file
+version 2.0.1
\ No newline at end of file

Modified: ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/metadata/MetadataGenerator.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/metadata/MetadataGenerator.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/metadata/MetadataGenerator.java (original)
+++ ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/metadata/MetadataGenerator.java Thu Jun 16 11:26:52 2016
@@ -21,7 +21,7 @@ package org.apache.ace.obr.metadata;
 import java.io.File;
 import java.io.IOException;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 @ProviderType
 public interface MetadataGenerator

Modified: ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/metadata/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/metadata/packageinfo?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/metadata/packageinfo (original)
+++ ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/metadata/packageinfo Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.0.1
\ No newline at end of file

Modified: ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/BundleStore.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/BundleStore.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/BundleStore.java (original)
+++ ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/BundleStore.java Thu Jun 16 11:26:52 2016
@@ -3,7 +3,7 @@ package org.apache.ace.obr.storage;
 import java.io.IOException;
 import java.io.InputStream;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -49,7 +49,7 @@ public interface BundleStore {
      * @throws java.io.IOException If there was a problem reading or writing the data of the resource.
      */
     public String put(InputStream data, String fileName, boolean replace) throws IOException;
-    
+
     /**
      * Removes the specified resource from the store.
      *

Modified: ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/packageinfo?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/packageinfo (original)
+++ ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/packageinfo Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 2.0.0
\ No newline at end of file
+version 2.0.1
\ No newline at end of file

Modified: ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/Range.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/Range.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/Range.java (original)
+++ ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/Range.java Thu Jun 16 11:26:52 2016
@@ -18,7 +18,7 @@
  */
 package org.apache.ace.range;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Class that captures a simple, modifiable range.

Modified: ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/RangeIterator.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/RangeIterator.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/RangeIterator.java (original)
+++ ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/RangeIterator.java Thu Jun 16 11:26:52 2016
@@ -21,7 +21,7 @@ package org.apache.ace.range;
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Iterates over a <code>SortedRangeSet</code>. Does not exactly implement

Modified: ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/SortedRangeSet.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/SortedRangeSet.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/SortedRangeSet.java (original)
+++ ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/SortedRangeSet.java Thu Jun 16 11:26:52 2016
@@ -25,7 +25,7 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.StringTokenizer;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Collection that stores a sorted set of ranges and is able to represent them

Modified: ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/packageinfo?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/packageinfo (original)
+++ ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/packageinfo Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 1.1.0
\ No newline at end of file
+version 1.1.1
\ No newline at end of file

Modified: ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/Repository.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/Repository.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/Repository.java (original)
+++ ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/Repository.java Thu Jun 16 11:26:52 2016
@@ -23,7 +23,7 @@ import java.io.InputStream;
 
 import org.apache.ace.range.SortedRangeSet;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Providing full access to a repository, which includes read and write access.

Modified: ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/RepositoryReplication.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/RepositoryReplication.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/RepositoryReplication.java (original)
+++ ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/RepositoryReplication.java Thu Jun 16 11:26:52 2016
@@ -23,7 +23,7 @@ import java.io.InputStream;
 
 import org.apache.ace.range.SortedRangeSet;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * The interface for replication of the data in a repository.

Modified: ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/BackupRepository.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/BackupRepository.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/BackupRepository.java (original)
+++ ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/BackupRepository.java Thu Jun 16 11:26:52 2016
@@ -21,7 +21,7 @@ package org.apache.ace.repository.ext;
 import java.io.IOException;
 import java.io.InputStream;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Provides an interface for backing up objects. <code>write</code> and <code>read</code>
@@ -68,7 +68,7 @@ public interface BackupRepository
 
     /**
      * Deletes the whole repository.
-     * 
+     *
      * @throws IOException when the repository could not be deleted.
      */
     public void delete() throws IOException;

Modified: ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/CachedRepository.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/CachedRepository.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/CachedRepository.java (original)
+++ ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/CachedRepository.java Thu Jun 16 11:26:52 2016
@@ -22,7 +22,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import org.apache.ace.repository.Repository;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Provides a cached repository representation, allowing the storing of local changes, without
@@ -87,10 +87,10 @@ public interface CachedRepository extend
      * @throws java.io.IOException Thrown when an error occurs communicating with the server.
      */
     public boolean isCurrent() throws IOException;
-    
+
     /**
      * Deletes the local repository.
-     * 
+     *
      * @throws IOException when the local repository could not be deleted
      */
     public void deleteLocal() throws IOException;

Modified: ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/CachedRepositoryImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/CachedRepositoryImpl.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/CachedRepositoryImpl.java (original)
+++ ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/CachedRepositoryImpl.java Thu Jun 16 11:26:52 2016
@@ -27,7 +27,7 @@ import org.apache.ace.repository.Reposit
 import org.apache.ace.repository.ext.BackupRepository;
 import org.apache.ace.repository.ext.CachedRepository;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * Provides a CachedRepository, which uses either a <code>Repository</code> and a <code>BackupRepository</code>
@@ -46,7 +46,7 @@ public class CachedRepositoryImpl implem
 
     /**
      * Creates a cached repository using.
-     * 
+     *
      * @param remote A repository which holds committed versions.
      * @param backup A backup repository for local changes.
      * @param mostRecentVersion The version from which <code>backup</code> was checked out or committed.
@@ -91,7 +91,7 @@ public class CachedRepositoryImpl implem
         }
         boolean result = commit(m_mostRecentVersion);
         if (result) {
-            // ACE-421: only bump in case of successful commit! 
+            // ACE-421: only bump in case of successful commit!
             m_mostRecentVersion++;
         }
         return result;
@@ -111,7 +111,7 @@ public class CachedRepositoryImpl implem
     }
 
     public InputStream getLocal(boolean fail) throws IllegalArgumentException, IOException {
-        // ACE-240: only fail in case there is no local version available; when mostRecentVersion 
+        // ACE-240: only fail in case there is no local version available; when mostRecentVersion
         // equals to 0, it means that nothing has been committed locally...
         if (m_mostRecentVersion <= 0 && fail) {
     		throw new IOException("No local version available of " + m_local + ", remote " + m_remote);
@@ -134,7 +134,7 @@ public class CachedRepositoryImpl implem
     public boolean isCurrent() throws IOException {
         return highestRemoteVersion() == m_mostRecentVersion;
     }
-    
+
     public void deleteLocal() throws IOException {
     	m_local.delete();
     }

Modified: ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/FilebasedBackupRepository.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/FilebasedBackupRepository.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/FilebasedBackupRepository.java (original)
+++ ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/FilebasedBackupRepository.java Thu Jun 16 11:26:52 2016
@@ -28,7 +28,7 @@ import java.io.OutputStream;
 
 import org.apache.ace.repository.ext.BackupRepository;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * A file-based implementation of the Backup Repository, using two files to store the current and backup version.

Modified: ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/RemoteRepository.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/RemoteRepository.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/RemoteRepository.java (original)
+++ ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/RemoteRepository.java Thu Jun 16 11:26:52 2016
@@ -34,7 +34,7 @@ import org.apache.ace.connectionfactory.
 import org.apache.ace.range.SortedRangeSet;
 import org.apache.ace.repository.Repository;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * This class works as a local interface for a remote repository by handling the network communication.

Modified: ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/packageinfo?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/packageinfo (original)
+++ ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/packageinfo Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.0.1
\ No newline at end of file

Modified: ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/packageinfo?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/packageinfo (original)
+++ ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/packageinfo Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.0.1
\ No newline at end of file

Modified: ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/packageinfo?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/packageinfo (original)
+++ ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/packageinfo Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 1.1.0
\ No newline at end of file
+version 1.1.1
\ No newline at end of file

Modified: ace/trunk/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/UserAdminConfigurator.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/UserAdminConfigurator.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/UserAdminConfigurator.java (original)
+++ ace/trunk/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/UserAdminConfigurator.java Thu Jun 16 11:26:52 2016
@@ -21,7 +21,7 @@ package org.apache.ace.resourceprocessor
 import java.io.IOException;
 import java.io.InputStream;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * The UserAdminConfigurator can be used to install, remove or explicitly set the users that should be present in the

Modified: ace/trunk/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/packageinfo?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/packageinfo (original)
+++ ace/trunk/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/packageinfo Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 2.0.0
\ No newline at end of file
+version 2.0.1
\ No newline at end of file

Modified: ace/trunk/org.apache.ace.test/src/org/apache/ace/test/constants/TestConstants.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.test/src/org/apache/ace/test/constants/TestConstants.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.test/src/org/apache/ace/test/constants/TestConstants.java (original)
+++ ace/trunk/org.apache.ace.test/src/org/apache/ace/test/constants/TestConstants.java Thu Jun 16 11:26:52 2016
@@ -18,7 +18,7 @@
  */
 package org.apache.ace.test.constants;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Constants for global test parameters. Use these throughout the test

Modified: ace/trunk/org.apache.ace.verifier/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/.settings/org.eclipse.jdt.core.prefs?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.verifier/.settings/org.eclipse.jdt.core.prefs (original)
+++ ace/trunk/org.apache.ace.verifier/.settings/org.eclipse.jdt.core.prefs Thu Jun 16 11:26:52 2016
@@ -1,4 +1,10 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
@@ -7,6 +13,89 @@ org.eclipse.jdt.core.compiler.compliance
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.8

Modified: ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/VerifierService.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/VerifierService.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/VerifierService.java (original)
+++ ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/VerifierService.java Thu Jun 16 11:26:52 2016
@@ -27,7 +27,7 @@ import org.osgi.framework.wiring.BundleR
 import org.osgi.framework.wiring.BundleRevision;
 import org.osgi.service.log.LogEntry;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 @ProviderType
 public interface VerifierService {

Modified: ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/packageinfo?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/packageinfo (original)
+++ ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/packageinfo Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.0.1
\ No newline at end of file

Modified: ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/NamedObject.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/NamedObject.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/NamedObject.java (original)
+++ ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/NamedObject.java Thu Jun 16 11:26:52 2016
@@ -20,7 +20,7 @@ package org.apache.ace.webui;
 
 import org.apache.ace.client.repository.RepositoryObject;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 @ProviderType
 public interface NamedObject {

Modified: ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/UIExtensionFactory.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/UIExtensionFactory.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/UIExtensionFactory.java (original)
+++ ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/UIExtensionFactory.java Thu Jun 16 11:26:52 2016
@@ -20,7 +20,7 @@ package org.apache.ace.webui;
 
 import java.util.Map;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 import com.vaadin.ui.Component;
 

Modified: ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/packageinfo?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/packageinfo (original)
+++ ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/packageinfo Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.0.1
\ No newline at end of file

Modified: ace/trunk/run-develop/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/run-develop/.classpath?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/run-develop/.classpath (original)
+++ ace/trunk/run-develop/.classpath Thu Jun 16 11:26:52 2016
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: ace/trunk/run-develop/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/run-develop/bnd.bnd?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/run-develop/bnd.bnd (original)
+++ ace/trunk/run-develop/bnd.bnd Thu Jun 16 11:26:52 2016
@@ -3,6 +3,3 @@
 -nobundles: true
 Bundle-Name: Apache ACE Development Target
 Bundle-Description: Bnd run project for a standard ACE Target when used in a development environment, such as Eclipse. This projects does not generate any artifacts.
-
-javac.source: 1.7
-javac.target: 1.7



Mime
View raw message