ACE-594 - upgrade to standard OSGi annotations:
- use osgi.annotations library instead of Bnd's annotation library;
- upgraded to Bndtools 3.2 libraries;
- fixed a couple of warnings wrt JREs and code use.
git-svn-id: https://svn.apache.org/repos/asf/ace/trunk@1748688 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build.gradle b/build.gradle
index 73e58ec..6854705 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,6 +25,15 @@
throw new GradleException("Unable to load workspace ${rootDir}/${bnd_cnf}")
}
+/* Disable JavaDoc linting. */
+if (JavaVersion.current().isJava8Compatible()) {
+ allprojects {
+ tasks.withType(Javadoc) {
+ options.addStringOption('Xdoclint:none', '-quiet')
+ }
+ }
+}
+
ext.cnf = rootProject.project(bnd_cnf)
/* Configure the subprojects */
@@ -36,15 +45,5 @@
test {
useTestNG()
}
-
- tasks.withType(Javadoc) {
- def runningJVM = JavaVersion.current().toString()
- if (runningJVM.matches("1\\.8.*")) {
- options.addStringOption('Xdoclint:none', '-quiet')
- }
- }
}
-
-
}
-
diff --git a/cnf/buildrepo/osgi.annotation/osgi.annotation-6.0.1.jar b/cnf/buildrepo/osgi.annotation/osgi.annotation-6.0.1.jar
new file mode 100644
index 0000000..2b017ad
--- /dev/null
+++ b/cnf/buildrepo/osgi.annotation/osgi.annotation-6.0.1.jar
Binary files differ
diff --git a/cnf/ext/defaults.bnd b/cnf/ext/defaults.bnd
index 334848e..1e39d3e 100644
--- a/cnf/ext/defaults.bnd
+++ b/cnf/ext/defaults.bnd
@@ -27,7 +27,7 @@
# Bnd Options
-sources: true
-sourcepath: ${project}/src
--buildpath: biz.aQute.bnd.annotation
+-buildpath: osgi.annotation;version='[6.0, 6.1)'
# Default Bundle headers
Bundle-DocURL: http://ace.apache.org/
@@ -45,7 +45,7 @@
org.osgi.service.http.port=28080,\
org.apache.felix.eventadmin.Timeout=0,\
org.apache.felix.log.storeDebug=true,\
- org.apache.felix.log.maxSize=1000
+ org.apache.felix.log.maxSize=1000
# Enable semantic versioning for all bundles
-baseline: *
diff --git a/cnf/gradle/biz.aQute.bnd.gradle-3.1.0.jar b/cnf/gradle/biz.aQute.bnd.gradle-3.1.0.jar
deleted file mode 100644
index 35a5fc6..0000000
--- a/cnf/gradle/biz.aQute.bnd.gradle-3.1.0.jar
+++ /dev/null
Binary files differ
diff --git a/cnf/gradle/biz.aQute.bnd.gradle-3.2.0.jar b/cnf/gradle/biz.aQute.bnd.gradle-3.2.0.jar
new file mode 100644
index 0000000..d4d50b4
--- /dev/null
+++ b/cnf/gradle/biz.aQute.bnd.gradle-3.2.0.jar
Binary files differ
diff --git a/cnf/localrepo/index.xml b/cnf/localrepo/index.xml
index ce29495..45307d3 100644
--- a/cnf/localrepo/index.xml
+++ b/cnf/localrepo/index.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<repository increment="1456435126000" name="Local" xmlns="http://www.osgi.org/xmlns/repository/v1.0.0">
+<repository increment="1456818699000" name="Local" xmlns="http://www.osgi.org/xmlns/repository/v1.0.0">
<resource>
<capability namespace="osgi.identity">
<attribute name="osgi.identity" value="bcpkix"/>
diff --git a/cnf/localrepo/index.xml.sha b/cnf/localrepo/index.xml.sha
index d227bdf..68fe604 100644
--- a/cnf/localrepo/index.xml.sha
+++ b/cnf/localrepo/index.xml.sha
@@ -1 +1 @@
-12e0829683c24b79a9343db8aa3a17d08b7d0b614587f0967a4c4a100ab3ed57
\ No newline at end of file
+a0912f1c0359120e9701bbd515e4e3c8e29a2e62b92a43d7627305b1914fcc8f
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 02a9026..63d276d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,8 @@
bnd_cnf=cnf
# bnd_plugin is the dependency declaration for the bnd gradle plugin
-bnd_plugin=cnf/gradle/biz.aQute.bnd.gradle-3.1.0.jar
+#bnd_plugin=biz.aQute.bnd:biz.aQute.bnd.gradle:3.2.0
+bnd_plugin=cnf/gradle/biz.aQute.bnd.gradle-3.2.0.jar
# bnd_build can be set to the name of a "master" project whose dependencies will seed the set of projects to build.
bnd_build=
diff --git a/org.apache.ace.agent/src/org/apache/ace/agent/AgentConstants.java b/org.apache.ace.agent/src/org/apache/ace/agent/AgentConstants.java
index cd3518d..a77853c 100644
--- a/org.apache.ace.agent/src/org/apache/ace/agent/AgentConstants.java
+++ b/org.apache.ace.agent/src/org/apache/ace/agent/AgentConstants.java
@@ -20,7 +20,7 @@
import org.apache.ace.feedback.AuditEvent;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Compile time constants for this package. Includes configuration keys and event topics.
diff --git a/org.apache.ace.agent/src/org/apache/ace/agent/AgentContext.java b/org.apache.ace.agent/src/org/apache/ace/agent/AgentContext.java
index 081b1f8..2cb71b4 100644
--- a/org.apache.ace.agent/src/org/apache/ace/agent/AgentContext.java
+++ b/org.apache.ace.agent/src/org/apache/ace/agent/AgentContext.java
@@ -20,7 +20,7 @@
import java.io.File;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Internal interface that provides access to handlers, supporting services and static configuration.
diff --git a/org.apache.ace.agent/src/org/apache/ace/agent/AgentContextAware.java b/org.apache.ace.agent/src/org/apache/ace/agent/AgentContextAware.java
index 4ee1e01..fb8c549 100644
--- a/org.apache.ace.agent/src/org/apache/ace/agent/AgentContextAware.java
+++ b/org.apache.ace.agent/src/org/apache/ace/agent/AgentContextAware.java
@@ -18,7 +18,7 @@
*/
package org.apache.ace.agent;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Providers interface for (extension) components.
@@ -32,7 +32,7 @@
* Use this method to register event listeners and/or perform other forms of initialization related tasks that need
* to be done prior to {@link #start(AgentContext)} being called.
* </p>
- *
+ *
* @param agentContext
* the agent context that is initializing, never <code>null</code>.
* @throws Exception
@@ -42,7 +42,7 @@
/**
* Called when the agent context is started.
- *
+ *
* @param agentContext
* the agent context that is started, never <code>null</code>.
* @throws Exception
@@ -52,7 +52,7 @@
/**
* Called when the agent context is stopped.
- *
+ *
* @throws Exception
* if the component fails to stop, which is logged and ignored by the agent.
*/
diff --git a/org.apache.ace.agent/src/org/apache/ace/agent/AgentControl.java b/org.apache.ace.agent/src/org/apache/ace/agent/AgentControl.java
index 3a225a8..11dda21 100644
--- a/org.apache.ace.agent/src/org/apache/ace/agent/AgentControl.java
+++ b/org.apache.ace.agent/src/org/apache/ace/agent/AgentControl.java
@@ -18,7 +18,7 @@
*/
package org.apache.ace.agent;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The agent's control (service) interface. Provides control functions and access to configuration for consumers that
diff --git a/org.apache.ace.agent/src/org/apache/ace/agent/AgentUpdateHandler.java b/org.apache.ace.agent/src/org/apache/ace/agent/AgentUpdateHandler.java
index 782635e..5836bad 100644
--- a/org.apache.ace.agent/src/org/apache/ace/agent/AgentUpdateHandler.java
+++ b/org.apache.ace.agent/src/org/apache/ace/agent/AgentUpdateHandler.java
@@ -18,7 +18,7 @@
*/
package org.apache.ace.agent;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Agent context delegate interface that is responsible for managing agent updates.
diff --git a/org.apache.ace.agent/src/org/apache/ace/agent/ConfigurationHandler.java b/org.apache.ace.agent/src/org/apache/ace/agent/ConfigurationHandler.java
index 6aec984..fca4a85 100644
--- a/org.apache.ace.agent/src/org/apache/ace/agent/ConfigurationHandler.java
+++ b/org.apache.ace.agent/src/org/apache/ace/agent/ConfigurationHandler.java
@@ -21,7 +21,7 @@
import java.util.Map;
import java.util.Set;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Agent context delegate interface that is responsible for managing persisted configuration. External launchers may
diff --git a/org.apache.ace.agent/src/org/apache/ace/agent/ConnectionHandler.java b/org.apache.ace.agent/src/org/apache/ace/agent/ConnectionHandler.java
index 41c56bf..db178a2 100644
--- a/org.apache.ace.agent/src/org/apache/ace/agent/ConnectionHandler.java
+++ b/org.apache.ace.agent/src/org/apache/ace/agent/ConnectionHandler.java
@@ -22,7 +22,7 @@
import java.net.URL;
import java.net.URLConnection;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Agent context delegate interface that is responsible for opening connection.
@@ -51,7 +51,7 @@
/**
* Return a connection for the specified url.
- *
+ *
* @param url The URL
* @return The connection
* @throws IOException If opening the connection fails
diff --git a/org.apache.ace.agent/src/org/apache/ace/agent/DeploymentHandler.java b/org.apache.ace.agent/src/org/apache/ace/agent/DeploymentHandler.java
index 1244276..6d0795b 100644
--- a/org.apache.ace.agent/src/org/apache/ace/agent/DeploymentHandler.java
+++ b/org.apache.ace.agent/src/org/apache/ace/agent/DeploymentHandler.java
@@ -18,7 +18,7 @@
*/
package org.apache.ace.agent;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Agent context delegate interface that provides the deployment functions.
diff --git a/org.apache.ace.agent/src/org/apache/ace/agent/DiscoveryHandler.java b/org.apache.ace.agent/src/org/apache/ace/agent/DiscoveryHandler.java
index 5f77547..5401f19 100644
--- a/org.apache.ace.agent/src/org/apache/ace/agent/DiscoveryHandler.java
+++ b/org.apache.ace.agent/src/org/apache/ace/agent/DiscoveryHandler.java
@@ -20,7 +20,7 @@
import java.net.URL;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Agent context delegate interface that is responsible for discovering servers. If the handler supports dynamic
diff --git a/org.apache.ace.agent/src/org/apache/ace/agent/DownloadHandle.java b/org.apache.ace.agent/src/org/apache/ace/agent/DownloadHandle.java
index 2199333..eaecdd0 100644
--- a/org.apache.ace.agent/src/org/apache/ace/agent/DownloadHandle.java
+++ b/org.apache.ace.agent/src/org/apache/ace/agent/DownloadHandle.java
@@ -20,7 +20,7 @@
import java.util.concurrent.Future;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* A {@link DownloadHandle} provides control over an asynchronous download and access to the resulting file when the it
diff --git a/org.apache.ace.agent/src/org/apache/ace/agent/DownloadHandler.java b/org.apache.ace.agent/src/org/apache/ace/agent/DownloadHandler.java
index 7626c95..915840d 100644
--- a/org.apache.ace.agent/src/org/apache/ace/agent/DownloadHandler.java
+++ b/org.apache.ace.agent/src/org/apache/ace/agent/DownloadHandler.java
@@ -20,7 +20,7 @@
import java.net.URL;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Service interface for downloading content from a particular {@link URL}.
diff --git a/org.apache.ace.agent/src/org/apache/ace/agent/DownloadResult.java b/org.apache.ace.agent/src/org/apache/ace/agent/DownloadResult.java
index 768b9dd..e4a2b95 100644
--- a/org.apache.ace.agent/src/org/apache/ace/agent/DownloadResult.java
+++ b/org.apache.ace.agent/src/org/apache/ace/agent/DownloadResult.java
@@ -21,7 +21,7 @@
import java.io.IOException;
import java.io.InputStream;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Represents the result of a download task.
diff --git a/org.apache.ace.agent/src/org/apache/ace/agent/DownloadState.java b/org.apache.ace.agent/src/org/apache/ace/agent/DownloadState.java
index e2b4075..9f6b7c6 100644
--- a/org.apache.ace.agent/src/org/apache/ace/agent/DownloadState.java
+++ b/org.apache.ace.agent/src/org/apache/ace/agent/DownloadState.java
@@ -18,7 +18,7 @@
*/
package org.apache.ace.agent;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The state of a download handle that completed.
diff --git a/org.apache.ace.agent/src/org/apache/ace/agent/EventListener.java b/org.apache.ace.agent/src/org/apache/ace/agent/EventListener.java
index 93653a2..34c83cb 100644
--- a/org.apache.ace.agent/src/org/apache/ace/agent/EventListener.java
+++ b/org.apache.ace.agent/src/org/apache/ace/agent/EventListener.java
@@ -20,7 +20,7 @@
import java.util.Map;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Listener interface for consumers that wish to be notified of agent events. This includes events deployment events as
diff --git a/org.apache.ace.agent/src/org/apache/ace/agent/EventsHandler.java b/org.apache.ace.agent/src/org/apache/ace/agent/EventsHandler.java
index 3a0c8c6..717c502 100644
--- a/org.apache.ace.agent/src/org/apache/ace/agent/EventsHandler.java
+++ b/org.apache.ace.agent/src/org/apache/ace/agent/EventsHandler.java
@@ -20,7 +20,7 @@
import java.util.Map;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Agent context delegate interface that is responsible for handling events.
diff --git a/org.apache.ace.agent/src/org/apache/ace/agent/FeedbackChannel.java b/org.apache.ace.agent/src/org/apache/ace/agent/FeedbackChannel.java
index d99a400..a9467e4 100644
--- a/org.apache.ace.agent/src/org/apache/ace/agent/FeedbackChannel.java
+++ b/org.apache.ace.agent/src/org/apache/ace/agent/FeedbackChannel.java
@@ -21,7 +21,7 @@
import java.io.IOException;
import java.util.Map;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Represents a channel on which feedback information can be reported back to the server. An agent can configure
diff --git a/org.apache.ace.agent/src/org/apache/ace/agent/FeedbackHandler.java b/org.apache.ace.agent/src/org/apache/ace/agent/FeedbackHandler.java
index 25ff7e0..dd44831 100644
--- a/org.apache.ace.agent/src/org/apache/ace/agent/FeedbackHandler.java
+++ b/org.apache.ace.agent/src/org/apache/ace/agent/FeedbackHandler.java
@@ -21,7 +21,7 @@
import java.io.IOException;
import java.util.Set;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Agent context delegate interface that is responsible for handling feedback channels.
diff --git a/org.apache.ace.agent/src/org/apache/ace/agent/IdentificationHandler.java b/org.apache.ace.agent/src/org/apache/ace/agent/IdentificationHandler.java
index d4581dc..bed37a9 100644
--- a/org.apache.ace.agent/src/org/apache/ace/agent/IdentificationHandler.java
+++ b/org.apache.ace.agent/src/org/apache/ace/agent/IdentificationHandler.java
@@ -18,7 +18,7 @@
*/
package org.apache.ace.agent;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Agent context delegate interface that is responsible for target identification.
diff --git a/org.apache.ace.agent/src/org/apache/ace/agent/InstallationFailedException.java b/org.apache.ace.agent/src/org/apache/ace/agent/InstallationFailedException.java
index 9d03488..954d5e0 100644
--- a/org.apache.ace.agent/src/org/apache/ace/agent/InstallationFailedException.java
+++ b/org.apache.ace.agent/src/org/apache/ace/agent/InstallationFailedException.java
@@ -21,7 +21,7 @@
import org.apache.ace.agent.impl.DeploymentHandlerImpl;
import org.osgi.service.deploymentadmin.DeploymentException;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Generic exception that is thrown when an installation of an update failed.
diff --git a/org.apache.ace.agent/src/org/apache/ace/agent/LoggingHandler.java b/org.apache.ace.agent/src/org/apache/ace/agent/LoggingHandler.java
index 3d444e9..11b04dd 100644
--- a/org.apache.ace.agent/src/org/apache/ace/agent/LoggingHandler.java
+++ b/org.apache.ace.agent/src/org/apache/ace/agent/LoggingHandler.java
@@ -22,7 +22,7 @@
import org.osgi.service.log.LogService;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Agent context delegate interface that is responsible for logging.
diff --git a/org.apache.ace.agent/src/org/apache/ace/agent/RetryAfterException.java b/org.apache.ace.agent/src/org/apache/ace/agent/RetryAfterException.java
index 22764b1..3922ead 100644
--- a/org.apache.ace.agent/src/org/apache/ace/agent/RetryAfterException.java
+++ b/org.apache.ace.agent/src/org/apache/ace/agent/RetryAfterException.java
@@ -18,7 +18,7 @@
*/
package org.apache.ace.agent;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/org.apache.ace.agent/src/org/apache/ace/agent/UpdateHandler.java b/org.apache.ace.agent/src/org/apache/ace/agent/UpdateHandler.java
index 0a2e0a9..902677d 100644
--- a/org.apache.ace.agent/src/org/apache/ace/agent/UpdateHandler.java
+++ b/org.apache.ace.agent/src/org/apache/ace/agent/UpdateHandler.java
@@ -24,7 +24,7 @@
import org.osgi.framework.Version;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Generic interface for installing updates.
diff --git a/org.apache.ace.agent/src/org/apache/ace/agent/impl/DeploymentHandlerImpl.java b/org.apache.ace.agent/src/org/apache/ace/agent/impl/DeploymentHandlerImpl.java
index 9c2ce6d..c1caad5 100644
--- a/org.apache.ace.agent/src/org/apache/ace/agent/impl/DeploymentHandlerImpl.java
+++ b/org.apache.ace.agent/src/org/apache/ace/agent/impl/DeploymentHandlerImpl.java
@@ -47,7 +47,7 @@
import org.osgi.service.log.LogService;
import org.osgi.service.packageadmin.PackageAdmin;
-@SuppressWarnings("deprecation")
+@SuppressWarnings({"restriction","deprecation"})
public class DeploymentHandlerImpl extends UpdateHandlerBase implements DeploymentHandler {
/**
diff --git a/org.apache.ace.agent/src/org/apache/ace/agent/packageinfo b/org.apache.ace.agent/src/org/apache/ace/agent/packageinfo
index 682b435..61bfc73 100644
--- a/org.apache.ace.agent/src/org/apache/ace/agent/packageinfo
+++ b/org.apache.ace.agent/src/org/apache/ace/agent/packageinfo
@@ -1 +1 @@
-version 2.0.0
\ No newline at end of file
+version 2.0.1
\ No newline at end of file
diff --git a/org.apache.ace.agent/test/org/apache/ace/agent/testutil/TestWebServer.java b/org.apache.ace.agent/test/org/apache/ace/agent/testutil/TestWebServer.java
index 3dac9f9..b2aeb17 100644
--- a/org.apache.ace.agent/test/org/apache/ace/agent/testutil/TestWebServer.java
+++ b/org.apache.ace.agent/test/org/apache/ace/agent/testutil/TestWebServer.java
@@ -45,6 +45,7 @@
* Test utility that manages a Jetty webserver with a {@link DefaultServlet} that support HTTP range downloads and a
* simple HTTP protocol dump filter. It can be extended with custom test servlets.
*/
+@SuppressWarnings("restriction")
public class TestWebServer {
static class HttpDumpFilter implements Filter {
diff --git a/org.apache.ace.authentication/src/org/apache/ace/authentication/api/AuthenticationProcessor.java b/org.apache.ace.authentication/src/org/apache/ace/authentication/api/AuthenticationProcessor.java
index 304a8a5..7186bfa 100644
--- a/org.apache.ace.authentication/src/org/apache/ace/authentication/api/AuthenticationProcessor.java
+++ b/org.apache.ace.authentication/src/org/apache/ace/authentication/api/AuthenticationProcessor.java
@@ -21,7 +21,7 @@
import org.osgi.service.useradmin.User;
import org.osgi.service.useradmin.UserAdmin;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Provides a pluggable authentication processor, responsible for the actual authentication of a
@@ -45,7 +45,7 @@
* and password might check whether the given context information consists of two
* strings.
* </p>
- *
+ *
* @param context the context information to check, should never be <code>null</code> or an
* empty array.
* @return <code>true</code> if this authentication processor can handle the given context
@@ -57,7 +57,7 @@
/**
* Authenticates a user based on the given context information.
- *
+ *
* @param userAdmin the user admin service, to use for verifying/retrieving user information,
* cannot be <code>null</code>;
* @param context the context information to authenticate the user with, should never be
diff --git a/org.apache.ace.authentication/src/org/apache/ace/authentication/api/AuthenticationService.java b/org.apache.ace.authentication/src/org/apache/ace/authentication/api/AuthenticationService.java
index cb0ecb1..62cb604 100644
--- a/org.apache.ace.authentication/src/org/apache/ace/authentication/api/AuthenticationService.java
+++ b/org.apache.ace.authentication/src/org/apache/ace/authentication/api/AuthenticationService.java
@@ -20,7 +20,7 @@
import org.osgi.service.useradmin.User;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Provides a generic and pluggable authentication service.
diff --git a/org.apache.ace.authentication/src/org/apache/ace/authentication/api/packageinfo b/org.apache.ace.authentication/src/org/apache/ace/authentication/api/packageinfo
index a4f1546..c266447 100644
--- a/org.apache.ace.authentication/src/org/apache/ace/authentication/api/packageinfo
+++ b/org.apache.ace.authentication/src/org/apache/ace/authentication/api/packageinfo
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.0.1
\ No newline at end of file
diff --git a/org.apache.ace.builder/src/org/apache/ace/builder/ArtifactData.java b/org.apache.ace.builder/src/org/apache/ace/builder/ArtifactData.java
index 3061bf0..dd2c89f 100644
--- a/org.apache.ace.builder/src/org/apache/ace/builder/ArtifactData.java
+++ b/org.apache.ace.builder/src/org/apache/ace/builder/ArtifactData.java
@@ -20,7 +20,7 @@
import java.net.URL;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
@ConsumerType
public class ArtifactData {
@@ -59,7 +59,7 @@
/**
* Some headers in OSGi allow for optional parameters, that are appended after the main value and always start with
* a semicolon.
- *
+ *
* @param name
* the name to remove the (optional) parameters from, cannot be <code>null</code>.
* @return the cleaned name, never <code>null</code>.
diff --git a/org.apache.ace.builder/src/org/apache/ace/builder/DeploymentPackageBuilder.java b/org.apache.ace.builder/src/org/apache/ace/builder/DeploymentPackageBuilder.java
index 77b55ff..d79ffba 100644
--- a/org.apache.ace.builder/src/org/apache/ace/builder/DeploymentPackageBuilder.java
+++ b/org.apache.ace.builder/src/org/apache/ace/builder/DeploymentPackageBuilder.java
@@ -30,11 +30,11 @@
import java.util.jar.Manifest;
import java.util.zip.ZipEntry;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Builder for deployment packages. Can handle bundles, resource processors and artifacts. Uses the builder pattern:
- *
+ *
* <pre>
* OutputStream out = new FileOutputStream("first.dp");
* DeploymentPackageBuilder.createDeploymentPackage("mydp", "1.0")
@@ -45,7 +45,7 @@
* .addArtifact(new URL("http://artifacts/data/v3.jar"), "rp.pid")
* .generate(out);
* </pre>
- *
+ *
* For bundles and resource processors, you can simply point to a valid URL and it will be queried for all required
* metadata. For artifacts, you need to specify both the URL and the PID of the resource processor. The builder will use
* the order you specify for bundles, resource processors and artifacts, but you don't have to specify all bundles and
@@ -72,7 +72,7 @@
/**
* Creates a new deployment package.
- *
+ *
* @param name
* the name of the deployment package
* @param version
@@ -85,7 +85,7 @@
/**
* Adds an artifact to the deployment package.
- *
+ *
* @param url
* a url that refers to the artifact
* @param processorPID
@@ -107,7 +107,7 @@
/**
* Adds a bundle to the deployment package.
- *
+ *
* @param url
* a url that refers to the bundle
* @return a builder to further add data to the deployment package
@@ -120,7 +120,7 @@
/**
* Adds a resource processor to the deployment package. A resource processor is a special type of bundle.
- *
+ *
* @param url
* a url that refers to the resource processor
* @return a builder to further add data to the deployment package
@@ -134,7 +134,7 @@
/**
* Generates a deployment package and streams it to the output stream you provide. Before it starts generating, it
* will first validate that you have actually specified a resource processor for each type of artifact you provided.
- *
+ *
* @param output
* the output stream to write to
* @throws Exception
diff --git a/org.apache.ace.builder/src/org/apache/ace/builder/packageinfo b/org.apache.ace.builder/src/org/apache/ace/builder/packageinfo
index 682b435..61bfc73 100644
--- a/org.apache.ace.builder/src/org/apache/ace/builder/packageinfo
+++ b/org.apache.ace.builder/src/org/apache/ace/builder/packageinfo
@@ -1 +1 @@
-version 2.0.0
\ No newline at end of file
+version 2.0.1
\ No newline at end of file
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Associatable.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Associatable.java
index fce69d3..2828900 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Associatable.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Associatable.java
@@ -20,7 +20,7 @@
import java.util.List;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The Associatable interface is to be implemented by any object that wants to be used in an Association.
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Association.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Association.java
index 4755e23..dbffcf9 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Association.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Association.java
@@ -20,7 +20,7 @@
import java.util.List;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Represents a basic association between two Associatable objects, whose types
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/AssociationRepository.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/AssociationRepository.java
index c7ddf80..8742639 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/AssociationRepository.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/AssociationRepository.java
@@ -21,7 +21,7 @@
import java.util.List;
import java.util.Map;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Represents a basic repository of associations. The associations are to be of type
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/ObjectRepository.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/ObjectRepository.java
index 404cc00..9d81e98 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/ObjectRepository.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/ObjectRepository.java
@@ -22,7 +22,7 @@
import java.util.Map;
import org.osgi.framework.Filter;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* A basic object repository, storing implementers of RepositoryObject.
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/PreCommitMember.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/PreCommitMember.java
index 131edae..c890959 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/PreCommitMember.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/PreCommitMember.java
@@ -20,7 +20,7 @@
import java.io.IOException;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* An interface that can be implemented by anybody that wants to be invoked as part of the
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdmin.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdmin.java
index d9c1e6f..835b35e 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdmin.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdmin.java
@@ -22,7 +22,7 @@
import org.apache.ace.client.repository.RepositoryObject.WorkingState;
import org.osgi.service.useradmin.User;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
@ProviderType
public interface RepositoryAdmin
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdminLoginContext.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdminLoginContext.java
index eda3c38..4799340 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdminLoginContext.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdminLoginContext.java
@@ -20,7 +20,7 @@
import java.net.URL;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* RepositoryAdminLoginContext represents a context for logins to the repository admin. It is used to specify
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryObject.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryObject.java
index 4f4a78f..2d37d86 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryObject.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryObject.java
@@ -23,7 +23,7 @@
import java.util.Enumeration;
import java.util.Map;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* A basic repository object, intended to be stored in a ObjectRepository of its given type.
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryUtil.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryUtil.java
index 4c32114..88b1e4b 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryUtil.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryUtil.java
@@ -18,7 +18,7 @@
*/
package org.apache.ace.client.repository;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
@ProviderType
public class RepositoryUtil
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/SessionFactory.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/SessionFactory.java
index 20ed9c1..664e298 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/SessionFactory.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/SessionFactory.java
@@ -20,7 +20,7 @@
import java.util.Map;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Factory service for creating and destroying sessions. Sessions are identified by some kind
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactHelper.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactHelper.java
index 5a8082e..d7635c3 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactHelper.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactHelper.java
@@ -22,7 +22,7 @@
import java.util.Map;
import org.apache.ace.client.repository.object.ArtifactObject;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Interface to an artifact helper. For each type of artifact, there should be a helper
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactPreprocessor.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactPreprocessor.java
index 1d4b144..6c08e83 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactPreprocessor.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactPreprocessor.java
@@ -21,7 +21,7 @@
import java.io.IOException;
import java.net.URL;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* An ArtifactPreprocessor processes an artifact before it is deployed.
@@ -44,7 +44,7 @@
/**
* Indicates whether the template should be processed again, given the properties, and the version to which it
* should be compared.
- *
+ *
* @param url A string representing a URL to the original artifact.
* @param props A PropertyResolver which can be used to fill in 'holes' in the template.
* @param targetID The targetID of the target for which this artifact is being processed.
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactRecognizer.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactRecognizer.java
index 7b7809a..1f42811 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactRecognizer.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactRecognizer.java
@@ -20,7 +20,7 @@
import java.util.Map;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Service interface for services that can recognize the type of an artifact, given a URL
@@ -32,7 +32,7 @@
/**
* Tries to determine the type of the artifact. If this recognizer cannot determine the type, it
* should return <code>null</code>.
- *
+ *
* @param artifact the artifact to recognize, cannot be <code>null</code>.
* @return The mimetype of the artifact, or <code>null</code> if the artifact is not recognized.
*/
@@ -40,7 +40,7 @@
/**
* Gets the relevant metadata for this artifact.
- *
+ *
* @param artifact the artifact to extract the metadata for, cannot be <code>null</code>.
* @return A map of strings, representing the relevant metadata specific for this artifact. The
* keys are best defined in the corresponding <code>ArtifactHelper</code> interface for this type of artifact.
@@ -54,7 +54,7 @@
/**
* Indicates whether this recognizer can handle (i.e., extract metadata) from an artifact of
* a given mime type.
- *
+ *
* @param mimetype The mimetype of an artifact.
* @return <code>true</code> when this type should be able to be handled by this recognizer;
* <code>false</code> otherwise.
@@ -63,9 +63,9 @@
/**
* Returns a preferred extension for the file name if a new one is created.
- *
+ *
* @param artifact the artifact to get the extension for, cannot be <code>null</code>.
- *
+ *
* @return The extension that is preferred or an empty string if there is none.
*/
public String getExtension(ArtifactResource artifact);
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactResource.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactResource.java
index f2b0ad1..559ad56 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactResource.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactResource.java
@@ -23,7 +23,7 @@
import java.io.InputStream;
import java.net.URL;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Denotes a 'physical' artifact that is located by an URL, and provide means to access the contents of this artifact.
@@ -43,14 +43,14 @@
* this may fail due to, for example, missing authentication credentials. Use {@link #openStream()} instead to
* access the contents of the resource.
* </p>
- *
+ *
* @return the URL to the 'physical' location of the artifact, never <code>null</code>.
*/
URL getURL();
/**
* Returns the size, in bytes, of this artifact.
- *
+ *
* @return a size, in bytes, >= 0L. If the size of this artifact is unknown, <tt>-1L</tt> should be returned.
* @throws IOException
* in case of I/O errors determining the size of the artifact.
@@ -59,7 +59,7 @@
/**
* Provides access to the contents of the artifact.
- *
+ *
* @return an input stream, never <code>null</code>.
* @throws IOException
* in case of I/O errors opening the artifact.
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/PropertyResolver.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/PropertyResolver.java
index 3d5cd93..ac566b7 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/PropertyResolver.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/PropertyResolver.java
@@ -18,7 +18,7 @@
*/
package org.apache.ace.client.repository.helper;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Interface for resolving properties about the template's
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/ArtifactPreprocessorBase.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/ArtifactPreprocessorBase.java
index 720a65f..85a6623 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/ArtifactPreprocessorBase.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/ArtifactPreprocessorBase.java
@@ -30,7 +30,7 @@
import org.apache.ace.client.repository.helper.ArtifactPreprocessor;
import org.apache.ace.connectionfactory.ConnectionFactory;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* This class can be used as a base class for artifact preprocessors. It comes with its own upload() method, which will
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/VelocityArtifactPreprocessor.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/VelocityArtifactPreprocessor.java
index d63bf32..834c0c5 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/VelocityArtifactPreprocessor.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/VelocityArtifactPreprocessor.java
@@ -43,7 +43,7 @@
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* This class can be used as a 'default' artifact preprocessor, using the Velocity template engine to preprocess
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/packageinfo b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/packageinfo
index a4f1546..5897e96 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/packageinfo
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/packageinfo
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.0.2
\ No newline at end of file
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/bundle/BundleHelper.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/bundle/BundleHelper.java
index eb335f0..628d1f1 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/bundle/BundleHelper.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/bundle/BundleHelper.java
@@ -22,7 +22,7 @@
import org.apache.ace.client.repository.object.ArtifactObject;
import org.osgi.framework.Constants;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Definitions for a BundleHelper, which are used to treat an artifact as a bundle.
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/bundle/packageinfo b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/bundle/packageinfo
index a4f1546..c266447 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/bundle/packageinfo
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/bundle/packageinfo
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.0.1
\ No newline at end of file
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/configuration/ConfigurationHelper.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/configuration/ConfigurationHelper.java
index f840bbd..8df7fdd 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/configuration/ConfigurationHelper.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/configuration/ConfigurationHelper.java
@@ -20,7 +20,7 @@
import org.apache.ace.client.repository.helper.ArtifactHelper;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Definitions for ConfigurationHelper,used to treat an artifact as an AutoConf file.
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/configuration/packageinfo b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/configuration/packageinfo
index a4f1546..5897e96 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/configuration/packageinfo
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/configuration/packageinfo
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.0.2
\ No newline at end of file
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/packageinfo b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/packageinfo
index b1793a2..3ef1862 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/packageinfo
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/packageinfo
@@ -1 +1 @@
-version 1.1.0
\ No newline at end of file
+version 1.1.1
\ No newline at end of file
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/user/UserAdminHelper.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/user/UserAdminHelper.java
index c5b5e4d..1a9f3d8 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/user/UserAdminHelper.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/user/UserAdminHelper.java
@@ -20,7 +20,7 @@
import org.apache.ace.client.repository.helper.ArtifactHelper;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Definitions for the UserAdminHelper artifact helper.
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/user/packageinfo b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/user/packageinfo
index a4f1546..5897e96 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/user/packageinfo
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/user/packageinfo
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.0.2
\ No newline at end of file
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Artifact2FeatureAssociation.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Artifact2FeatureAssociation.java
index 0b65042..920584e 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Artifact2FeatureAssociation.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Artifact2FeatureAssociation.java
@@ -20,7 +20,7 @@
import org.apache.ace.client.repository.Association;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Interface to a Artifact2FeatureAssociation. Most functionality is defined by the generic Association.
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/ArtifactObject.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/ArtifactObject.java
index 95f5dc0..9e7584c 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/ArtifactObject.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/ArtifactObject.java
@@ -22,7 +22,7 @@
import org.apache.ace.client.repository.RepositoryObject;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Interface to an ArtifactObject. The basic functionality is defined by RepositoryObject, but extended for
@@ -63,7 +63,7 @@
* Holds a human-readable description for this artifact.
*/
public static final String KEY_ARTIFACT_DESCRIPTION = "artifactDescription";
- /**
+ /**
* Key to be used in the <code>ArtifactObject</code>'s attributes.
* Holds the (estimated) size, in bytes, for this artifact.
*/
@@ -108,7 +108,7 @@
*/
public String getURL();
/**
- * Returns a ResourceId, if that has been customized.
+ * Returns a ResourceId, if that has been customized.
*/
public String getResourceId();
/**
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentArtifact.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentArtifact.java
index b3c8318..3e02838 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentArtifact.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentArtifact.java
@@ -18,7 +18,7 @@
*/
package org.apache.ace.client.repository.object;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Interface to a deployment artifact, which is used to gather information about
@@ -57,7 +57,7 @@
* @return the URL for this deployment artifact.
*/
public String getUrl();
-
+
/**
* @return the (estimated) size of this deployment artifact, in bytes.
*/
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentVersionObject.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentVersionObject.java
index 74b0917..3c3da28 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentVersionObject.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentVersionObject.java
@@ -20,7 +20,7 @@
import org.apache.ace.client.repository.RepositoryObject;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The interface to a DeploymentVersion. The basic functionality is defined
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Distribution2TargetAssociation.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Distribution2TargetAssociation.java
index ef51c7b..64bbb02 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Distribution2TargetAssociation.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Distribution2TargetAssociation.java
@@ -20,7 +20,7 @@
import org.apache.ace.client.repository.Association;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Interface to a Distribution2TargetAssociation. Most functionality is defined by the generic Association.
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DistributionObject.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DistributionObject.java
index 24edad4..53c812e 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DistributionObject.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DistributionObject.java
@@ -22,7 +22,7 @@
import org.apache.ace.client.repository.RepositoryObject;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Interface to a DistributionObject. The basic functionality is defined by RepositoryObject, but extended for
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Feature2DistributionAssociation.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Feature2DistributionAssociation.java
index b57492b..a23f26c 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Feature2DistributionAssociation.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Feature2DistributionAssociation.java
@@ -20,7 +20,7 @@
import org.apache.ace.client.repository.Association;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Interface to a Feature2DistributionAssociation. Most functionality is defined by the generic Association.
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/FeatureObject.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/FeatureObject.java
index 6293c18..ded7821 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/FeatureObject.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/FeatureObject.java
@@ -22,7 +22,7 @@
import org.apache.ace.client.repository.RepositoryObject;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Interface to a FeatureObject. The basic functionality is defined by RepositoryObject, but extended for
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/TargetObject.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/TargetObject.java
index 4e059e6..1646171 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/TargetObject.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/TargetObject.java
@@ -22,7 +22,7 @@
import org.apache.ace.client.repository.RepositoryObject;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
@ProviderType
public interface TargetObject extends RepositoryObject {
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/packageinfo b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/packageinfo
index b1793a2..3ef1862 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/packageinfo
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/packageinfo
@@ -1 +1 @@
-version 1.1.0
\ No newline at end of file
+version 1.1.1
\ No newline at end of file
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/packageinfo b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/packageinfo
index 682b435..61bfc73 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/packageinfo
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/packageinfo
@@ -1 +1 @@
-version 2.0.0
\ No newline at end of file
+version 2.0.1
\ No newline at end of file
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Artifact2FeatureAssociationRepository.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Artifact2FeatureAssociationRepository.java
index dc8725e..975ea41 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Artifact2FeatureAssociationRepository.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Artifact2FeatureAssociationRepository.java
@@ -23,7 +23,7 @@
import org.apache.ace.client.repository.object.ArtifactObject;
import org.apache.ace.client.repository.object.FeatureObject;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Interface to a Artifact2FeatureAssociationRepository. The functionality is defined by the generic AssociationRepository.
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/ArtifactRepository.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/ArtifactRepository.java
index fc648d5..76956df 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/ArtifactRepository.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/ArtifactRepository.java
@@ -26,7 +26,7 @@
import org.apache.ace.client.repository.object.ArtifactObject;
import org.apache.ace.client.repository.object.TargetObject;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Interface to a ArtifactRepository. The functionality is defined by the generic AssociationRepository.
@@ -67,7 +67,7 @@
/**
* Tries to import an artifact into storage, while extracting necessary metadata.
- *
+ *
* @param artifact
* a URL pointing to the 'physical' artifact.
* @param upload
@@ -85,7 +85,7 @@
/**
* Checks whether an artifact is 'usable', that is, there is a resource processor available for it, if necessary.
- *
+ *
* @param artifact
* A URL pointing to an artifact.
* @return <code>true</code> if the artifact is recognized, and a processor for it is available. <code>false</code>
@@ -95,7 +95,7 @@
/**
* Tries to import an artifact into storage, while extracting necessary metadata.
- *
+ *
* @param artifact
* a URL pointing to the 'physical' artifact.
* @param mimetype
@@ -114,7 +114,7 @@
/**
* Tries to locate a preprocessor for the passed artifact, an processes it. If no processing needs to be done, the
* original artifact's URL will be returned.
- *
+ *
* @param artifact
* An artifact
* @param props
@@ -132,7 +132,7 @@
/**
* Indicates whether the template should be processed again, given the properties, and the version to which it
* should be compared.
- *
+ *
* @param url
* A string representing a URL to the original artifact.
* @param props
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DeploymentVersionRepository.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DeploymentVersionRepository.java
index a4519f1..bab30cb 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DeploymentVersionRepository.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DeploymentVersionRepository.java
@@ -25,7 +25,7 @@
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;
/**
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Distribution2TargetAssociationRepository.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Distribution2TargetAssociationRepository.java
index 1997304..0da7912 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Distribution2TargetAssociationRepository.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Distribution2TargetAssociationRepository.java
@@ -23,7 +23,7 @@
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.
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DistributionRepository.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DistributionRepository.java
index 7df51e7..1922fee 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DistributionRepository.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DistributionRepository.java
@@ -21,7 +21,7 @@
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.
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Feature2DistributionAssociationRepository.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Feature2DistributionAssociationRepository.java
index fe3a9a9..a2a7e12 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Feature2DistributionAssociationRepository.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Feature2DistributionAssociationRepository.java
@@ -23,7 +23,7 @@
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.
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/FeatureRepository.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/FeatureRepository.java
index 618af26..8b0cf6f 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/FeatureRepository.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/FeatureRepository.java
@@ -21,7 +21,7 @@
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.
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/RepositoryConfiguration.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/RepositoryConfiguration.java
index 87515a1..e1a60dd 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/RepositoryConfiguration.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/RepositoryConfiguration.java
@@ -21,7 +21,7 @@
import java.net.URL;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Provides the configuration options for several of the repositories.
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/RepositoryConstants.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/RepositoryConstants.java
index 0fbd7b2..b39c75b 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/RepositoryConstants.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/RepositoryConstants.java
@@ -21,7 +21,7 @@
import java.net.URL;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Constants used for the repository.
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/TargetRepository.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/TargetRepository.java
index c7529b8..2debe21 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/TargetRepository.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/TargetRepository.java
@@ -21,7 +21,7 @@
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.
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/packageinfo b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/packageinfo
index 682b435..61bfc73 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/packageinfo
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/packageinfo
@@ -1 +1 @@
-version 2.0.0
\ No newline at end of file
+version 2.0.1
\ No newline at end of file
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetObject.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetObject.java
index 1514430..9b80cce 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetObject.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetObject.java
@@ -28,7 +28,7 @@
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>
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetRepository.java b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetRepository.java
index a98d08c..f706ed7 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetRepository.java
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetRepository.java
@@ -22,7 +22,7 @@
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.
diff --git a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/packageinfo b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/packageinfo
index b1793a2..3ef1862 100644
--- a/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/packageinfo
+++ b/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/packageinfo
@@ -1 +1 @@
-version 1.1.0
\ No newline at end of file
+version 1.1.1
\ No newline at end of file
diff --git a/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/ConnectionFactory.java b/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/ConnectionFactory.java
index 5375784..1b79c30 100644
--- a/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/ConnectionFactory.java
+++ b/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/ConnectionFactory.java
@@ -24,10 +24,10 @@
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 @@
/**
* 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 @@
/**
* 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>.
diff --git a/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/packageinfo b/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/packageinfo
index a4f1546..c266447 100644
--- a/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/packageinfo
+++ b/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/packageinfo
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.0.1
\ No newline at end of file
diff --git a/org.apache.ace.deployment/src/org/apache/ace/deployment/processor/DeploymentProcessor.java b/org.apache.ace.deployment/src/org/apache/ace/deployment/processor/DeploymentProcessor.java
index e3f7eb5..6166b3e 100644
--- a/org.apache.ace.deployment/src/org/apache/ace/deployment/processor/DeploymentProcessor.java
+++ b/org.apache.ace.deployment/src/org/apache/ace/deployment/processor/DeploymentProcessor.java
@@ -24,7 +24,7 @@
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
diff --git a/org.apache.ace.deployment/src/org/apache/ace/deployment/processor/packageinfo b/org.apache.ace.deployment/src/org/apache/ace/deployment/processor/packageinfo
index a4f1546..c266447 100644
--- a/org.apache.ace.deployment/src/org/apache/ace/deployment/processor/packageinfo
+++ b/org.apache.ace.deployment/src/org/apache/ace/deployment/processor/packageinfo
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.0.1
\ No newline at end of file
diff --git a/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/ArtifactData.java b/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/ArtifactData.java
index 1d2ad22..7e964fb 100644
--- a/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/ArtifactData.java
+++ b/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/ArtifactData.java
@@ -21,7 +21,7 @@
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
diff --git a/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/DeploymentProvider.java b/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/DeploymentProvider.java
index af59ea8..970485e 100644
--- a/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/DeploymentProvider.java
+++ b/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/DeploymentProvider.java
@@ -21,7 +21,7 @@
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
diff --git a/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/OverloadedException.java b/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/OverloadedException.java
index 9d93f4d..e64151f 100644
--- a/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/OverloadedException.java
+++ b/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/OverloadedException.java
@@ -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.
diff --git a/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/impl/ArtifactDataImpl.java b/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/impl/ArtifactDataImpl.java
index 0670f68..ea47e64 100644
--- a/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/impl/ArtifactDataImpl.java
+++ b/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/impl/ArtifactDataImpl.java
@@ -24,7 +24,7 @@
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.
diff --git a/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/impl/packageinfo b/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/impl/packageinfo
index 682b435..61bfc73 100644
--- a/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/impl/packageinfo
+++ b/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/impl/packageinfo
@@ -1 +1 @@
-version 2.0.0
\ No newline at end of file
+version 2.0.1
\ No newline at end of file
diff --git a/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/packageinfo b/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/packageinfo
index b1793a2..3ef1862 100644
--- a/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/packageinfo
+++ b/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/packageinfo
@@ -1 +1 @@
-version 1.1.0
\ No newline at end of file
+version 1.1.1
\ No newline at end of file
diff --git a/org.apache.ace.deployment/src/org/apache/ace/deployment/streamgenerator/StreamGenerator.java b/org.apache.ace.deployment/src/org/apache/ace/deployment/streamgenerator/StreamGenerator.java
index f647c5c..1e8d001 100644
--- a/org.apache.ace.deployment/src/org/apache/ace/deployment/streamgenerator/StreamGenerator.java
+++ b/org.apache.ace.deployment/src/org/apache/ace/deployment/streamgenerator/StreamGenerator.java
@@ -23,7 +23,7 @@
import org.apache.ace.deployment.provider.OverloadedException;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
@ProviderType
public interface StreamGenerator
diff --git a/org.apache.ace.deployment/src/org/apache/ace/deployment/streamgenerator/packageinfo b/org.apache.ace.deployment/src/org/apache/ace/deployment/streamgenerator/packageinfo
index a4f1546..c266447 100644
--- a/org.apache.ace.deployment/src/org/apache/ace/deployment/streamgenerator/packageinfo
+++ b/org.apache.ace.deployment/src/org/apache/ace/deployment/streamgenerator/packageinfo
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.0.1
\ No newline at end of file
diff --git a/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/BundleStreamGenerator.java b/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/BundleStreamGenerator.java
index 5f70c56..824792a 100644
--- a/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/BundleStreamGenerator.java
+++ b/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/BundleStreamGenerator.java
@@ -31,7 +31,7 @@
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 {
diff --git a/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestData.java b/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestData.java
index 2acd0c4..bcb1506 100644
--- a/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestData.java
+++ b/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestData.java
@@ -23,7 +23,7 @@
import org.apache.ace.deployment.provider.ArtifactData;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
@ConsumerType
public class TestData implements ArtifactData {
diff --git a/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestProvider.java b/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestProvider.java
index 9115a9d..f5d1b3c 100644
--- a/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestProvider.java
+++ b/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestProvider.java
@@ -26,7 +26,7 @@
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 {
diff --git a/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/packageinfo b/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/packageinfo
index b1793a2..3ef1862 100644
--- a/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/packageinfo
+++ b/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/packageinfo
@@ -1 +1 @@
-version 1.1.0
\ No newline at end of file
+version 1.1.1
\ No newline at end of file
diff --git a/org.apache.ace.discovery/src/org/apache/ace/discovery/Discovery.java b/org.apache.ace.discovery/src/org/apache/ace/discovery/Discovery.java
index cdfbe4f..4d98f55 100644
--- a/org.apache.ace.discovery/src/org/apache/ace/discovery/Discovery.java
+++ b/org.apache.ace.discovery/src/org/apache/ace/discovery/Discovery.java
@@ -20,7 +20,7 @@
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.
diff --git a/org.apache.ace.discovery/src/org/apache/ace/discovery/packageinfo b/org.apache.ace.discovery/src/org/apache/ace/discovery/packageinfo
index b1793a2..3ef1862 100644
--- a/org.apache.ace.discovery/src/org/apache/ace/discovery/packageinfo
+++ b/org.apache.ace.discovery/src/org/apache/ace/discovery/packageinfo
@@ -1 +1 @@
-version 1.1.0
\ No newline at end of file
+version 1.1.1
\ No newline at end of file
diff --git a/org.apache.ace.http/src/org/apache/ace/http/package-info.java b/org.apache.ace.http/src/org/apache/ace/http/package-info.java
index 21fbe2b..c3b92e3 100644
--- a/org.apache.ace.http/src/org/apache/ace/http/package-info.java
+++ b/org.apache.ace.http/src/org/apache/ace/http/package-info.java
@@ -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;
diff --git a/org.apache.ace.identification/src/org/apache/ace/identification/Identification.java b/org.apache.ace.identification/src/org/apache/ace/identification/Identification.java
index 1ddfbf2..7fcc14f 100644
--- a/org.apache.ace.identification/src/org/apache/ace/identification/Identification.java
+++ b/org.apache.ace.identification/src/org/apache/ace/identification/Identification.java
@@ -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
diff --git a/org.apache.ace.identification/src/org/apache/ace/identification/packageinfo b/org.apache.ace.identification/src/org/apache/ace/identification/packageinfo
index b1793a2..3ef1862 100644
--- a/org.apache.ace.identification/src/org/apache/ace/identification/packageinfo
+++ b/org.apache.ace.identification/src/org/apache/ace/identification/packageinfo
@@ -1 +1 @@
-version 1.1.0
\ No newline at end of file
+version 1.1.1
\ No newline at end of file
diff --git a/org.apache.ace.log/src/org/apache/ace/log/Log.java b/org.apache.ace.log/src/org/apache/ace/log/Log.java
index ef989d7..4a4ddfa 100644
--- a/org.apache.ace.log/src/org/apache/ace/log/Log.java
+++ b/org.apache.ace.log/src/org/apache/ace/log/Log.java
@@ -20,7 +20,7 @@
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
diff --git a/org.apache.ace.log/src/org/apache/ace/log/LogSync.java b/org.apache.ace.log/src/org/apache/ace/log/LogSync.java
index ad7ef0d..07710db 100644
--- a/org.apache.ace.log/src/org/apache/ace/log/LogSync.java
+++ b/org.apache.ace.log/src/org/apache/ace/log/LogSync.java
@@ -20,7 +20,7 @@
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
diff --git a/org.apache.ace.log/src/org/apache/ace/log/packageinfo b/org.apache.ace.log/src/org/apache/ace/log/packageinfo
index 2c9afe8..e68b954 100644
--- a/org.apache.ace.log/src/org/apache/ace/log/packageinfo
+++ b/org.apache.ace.log/src/org/apache/ace/log/packageinfo
@@ -1 +1 @@
-version 2.1.0
\ No newline at end of file
+version 2.1.1
\ No newline at end of file
diff --git a/org.apache.ace.log/src/org/apache/ace/log/server/store/LogStore.java b/org.apache.ace.log/src/org/apache/ace/log/server/store/LogStore.java
index 518adf0..eaa47d9 100644
--- a/org.apache.ace.log/src/org/apache/ace/log/server/store/LogStore.java
+++ b/org.apache.ace.log/src/org/apache/ace/log/server/store/LogStore.java
@@ -25,7 +25,7 @@
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.
diff --git a/org.apache.ace.log/src/org/apache/ace/log/server/store/packageinfo b/org.apache.ace.log/src/org/apache/ace/log/server/store/packageinfo
index 2c9afe8..e68b954 100644
--- a/org.apache.ace.log/src/org/apache/ace/log/server/store/packageinfo
+++ b/org.apache.ace.log/src/org/apache/ace/log/server/store/packageinfo
@@ -1 +1 @@
-version 2.1.0
\ No newline at end of file
+version 2.1.1
\ No newline at end of file
diff --git a/org.apache.ace.log/src/org/apache/ace/log/target/store/LogStore.java b/org.apache.ace.log/src/org/apache/ace/log/target/store/LogStore.java
index 8ab8fab..f0776df 100644
--- a/org.apache.ace.log/src/org/apache/ace/log/target/store/LogStore.java
+++ b/org.apache.ace.log/src/org/apache/ace/log/target/store/LogStore.java
@@ -24,7 +24,7 @@
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
diff --git a/org.apache.ace.log/src/org/apache/ace/log/target/store/packageinfo b/org.apache.ace.log/src/org/apache/ace/log/target/store/packageinfo
index 682b435..61bfc73 100644
--- a/org.apache.ace.log/src/org/apache/ace/log/target/store/packageinfo
+++ b/org.apache.ace.log/src/org/apache/ace/log/target/store/packageinfo
@@ -1 +1 @@
-version 2.0.0
\ No newline at end of file
+version 2.0.1
\ No newline at end of file
diff --git a/org.apache.ace.obr/src/org/apache/ace/obr/metadata/MetadataGenerator.java b/org.apache.ace.obr/src/org/apache/ace/obr/metadata/MetadataGenerator.java
index 64fa2de..4cabab6 100644
--- a/org.apache.ace.obr/src/org/apache/ace/obr/metadata/MetadataGenerator.java
+++ b/org.apache.ace.obr/src/org/apache/ace/obr/metadata/MetadataGenerator.java
@@ -21,7 +21,7 @@
import java.io.File;
import java.io.IOException;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
@ProviderType
public interface MetadataGenerator
diff --git a/org.apache.ace.obr/src/org/apache/ace/obr/metadata/packageinfo b/org.apache.ace.obr/src/org/apache/ace/obr/metadata/packageinfo
index a4f1546..c266447 100644
--- a/org.apache.ace.obr/src/org/apache/ace/obr/metadata/packageinfo
+++ b/org.apache.ace.obr/src/org/apache/ace/obr/metadata/packageinfo
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.0.1
\ No newline at end of file
diff --git a/org.apache.ace.obr/src/org/apache/ace/obr/storage/BundleStore.java b/org.apache.ace.obr/src/org/apache/ace/obr/storage/BundleStore.java
index f3dcdd1..72a7a54 100644
--- a/org.apache.ace.obr/src/org/apache/ace/obr/storage/BundleStore.java
+++ b/org.apache.ace.obr/src/org/apache/ace/obr/storage/BundleStore.java
@@ -3,7 +3,7 @@
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 @@
* @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.
*
diff --git a/org.apache.ace.obr/src/org/apache/ace/obr/storage/packageinfo b/org.apache.ace.obr/src/org/apache/ace/obr/storage/packageinfo
index 682b435..61bfc73 100644
--- a/org.apache.ace.obr/src/org/apache/ace/obr/storage/packageinfo
+++ b/org.apache.ace.obr/src/org/apache/ace/obr/storage/packageinfo
@@ -1 +1 @@
-version 2.0.0
\ No newline at end of file
+version 2.0.1
\ No newline at end of file
diff --git a/org.apache.ace.range.api/src/org/apache/ace/range/Range.java b/org.apache.ace.range.api/src/org/apache/ace/range/Range.java
index a85b197..e863b8b 100644
--- a/org.apache.ace.range.api/src/org/apache/ace/range/Range.java
+++ b/org.apache.ace.range.api/src/org/apache/ace/range/Range.java
@@ -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.
diff --git a/org.apache.ace.range.api/src/org/apache/ace/range/RangeIterator.java b/org.apache.ace.range.api/src/org/apache/ace/range/RangeIterator.java
index d7b2a77..d010f78 100644
--- a/org.apache.ace.range.api/src/org/apache/ace/range/RangeIterator.java
+++ b/org.apache.ace.range.api/src/org/apache/ace/range/RangeIterator.java
@@ -21,7 +21,7 @@
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
diff --git a/org.apache.ace.range.api/src/org/apache/ace/range/SortedRangeSet.java b/org.apache.ace.range.api/src/org/apache/ace/range/SortedRangeSet.java
index eccb673..4bfa9cc 100644
--- a/org.apache.ace.range.api/src/org/apache/ace/range/SortedRangeSet.java
+++ b/org.apache.ace.range.api/src/org/apache/ace/range/SortedRangeSet.java
@@ -25,7 +25,7 @@
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
diff --git a/org.apache.ace.range.api/src/org/apache/ace/range/packageinfo b/org.apache.ace.range.api/src/org/apache/ace/range/packageinfo
index b1793a2..3ef1862 100644
--- a/org.apache.ace.range.api/src/org/apache/ace/range/packageinfo
+++ b/org.apache.ace.range.api/src/org/apache/ace/range/packageinfo
@@ -1 +1 @@
-version 1.1.0
\ No newline at end of file
+version 1.1.1
\ No newline at end of file
diff --git a/org.apache.ace.repository/src/org/apache/ace/repository/Repository.java b/org.apache.ace.repository/src/org/apache/ace/repository/Repository.java
index 6f61936..2d83133 100644
--- a/org.apache.ace.repository/src/org/apache/ace/repository/Repository.java
+++ b/org.apache.ace.repository/src/org/apache/ace/repository/Repository.java
@@ -23,7 +23,7 @@
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.
diff --git a/org.apache.ace.repository/src/org/apache/ace/repository/RepositoryReplication.java b/org.apache.ace.repository/src/org/apache/ace/repository/RepositoryReplication.java
index 66a1f77..dfe551e 100644
--- a/org.apache.ace.repository/src/org/apache/ace/repository/RepositoryReplication.java
+++ b/org.apache.ace.repository/src/org/apache/ace/repository/RepositoryReplication.java
@@ -23,7 +23,7 @@
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.
diff --git a/org.apache.ace.repository/src/org/apache/ace/repository/ext/BackupRepository.java b/org.apache.ace.repository/src/org/apache/ace/repository/ext/BackupRepository.java
index 37d1984..9b1791d 100644
--- a/org.apache.ace.repository/src/org/apache/ace/repository/ext/BackupRepository.java
+++ b/org.apache.ace.repository/src/org/apache/ace/repository/ext/BackupRepository.java
@@ -21,7 +21,7 @@
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 @@
/**
* Deletes the whole repository.
- *
+ *
* @throws IOException when the repository could not be deleted.
*/
public void delete() throws IOException;
diff --git a/org.apache.ace.repository/src/org/apache/ace/repository/ext/CachedRepository.java b/org.apache.ace.repository/src/org/apache/ace/repository/ext/CachedRepository.java
index 7973bbb..75d9bc9 100644
--- a/org.apache.ace.repository/src/org/apache/ace/repository/ext/CachedRepository.java
+++ b/org.apache.ace.repository/src/org/apache/ace/repository/ext/CachedRepository.java
@@ -22,7 +22,7 @@
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 @@
* @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;
diff --git a/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/CachedRepositoryImpl.java b/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/CachedRepositoryImpl.java
index b056af4..2032bf1 100644
--- a/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/CachedRepositoryImpl.java
+++ b/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/CachedRepositoryImpl.java
@@ -27,7 +27,7 @@
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 @@
/**
* 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 @@
}
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 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 boolean isCurrent() throws IOException {
return highestRemoteVersion() == m_mostRecentVersion;
}
-
+
public void deleteLocal() throws IOException {
m_local.delete();
}
diff --git a/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/FilebasedBackupRepository.java b/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/FilebasedBackupRepository.java
index e84955b..8d46565 100644
--- a/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/FilebasedBackupRepository.java
+++ b/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/FilebasedBackupRepository.java
@@ -28,7 +28,7 @@
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.
diff --git a/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/RemoteRepository.java b/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/RemoteRepository.java
index e2f0c06..227d465 100644
--- a/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/RemoteRepository.java
+++ b/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/RemoteRepository.java
@@ -34,7 +34,7 @@
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.
diff --git a/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/packageinfo b/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/packageinfo
index a4f1546..c266447 100644
--- a/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/packageinfo
+++ b/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/packageinfo
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.0.1
\ No newline at end of file
diff --git a/org.apache.ace.repository/src/org/apache/ace/repository/ext/packageinfo b/org.apache.ace.repository/src/org/apache/ace/repository/ext/packageinfo
index a4f1546..c266447 100644
--- a/org.apache.ace.repository/src/org/apache/ace/repository/ext/packageinfo
+++ b/org.apache.ace.repository/src/org/apache/ace/repository/ext/packageinfo
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.0.1
\ No newline at end of file
diff --git a/org.apache.ace.repository/src/org/apache/ace/repository/packageinfo b/org.apache.ace.repository/src/org/apache/ace/repository/packageinfo
index b1793a2..3ef1862 100644
--- a/org.apache.ace.repository/src/org/apache/ace/repository/packageinfo
+++ b/org.apache.ace.repository/src/org/apache/ace/repository/packageinfo
@@ -1 +1 @@
-version 1.1.0
\ No newline at end of file
+version 1.1.1
\ No newline at end of file
diff --git a/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/UserAdminConfigurator.java b/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/UserAdminConfigurator.java
index 3df960a..01c1d50 100644
--- a/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/UserAdminConfigurator.java
+++ b/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/UserAdminConfigurator.java
@@ -21,7 +21,7 @@
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
diff --git a/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/packageinfo b/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/packageinfo
index 682b435..61bfc73 100644
--- a/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/packageinfo
+++ b/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/packageinfo
@@ -1 +1 @@
-version 2.0.0
\ No newline at end of file
+version 2.0.1
\ No newline at end of file
diff --git a/org.apache.ace.test/src/org/apache/ace/test/constants/TestConstants.java b/org.apache.ace.test/src/org/apache/ace/test/constants/TestConstants.java
index f48ebb5..2e33e2f 100644
--- a/org.apache.ace.test/src/org/apache/ace/test/constants/TestConstants.java
+++ b/org.apache.ace.test/src/org/apache/ace/test/constants/TestConstants.java
@@ -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
diff --git a/org.apache.ace.verifier/.settings/org.eclipse.jdt.core.prefs b/org.apache.ace.verifier/.settings/org.eclipse.jdt.core.prefs
index a698e59..d94a3c3 100644
--- a/org.apache.ace.verifier/.settings/org.eclipse.jdt.core.prefs
+++ b/org.apache.ace.verifier/.settings/org.eclipse.jdt.core.prefs
@@ -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.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
diff --git a/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/VerifierService.java b/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/VerifierService.java
index d907b67..52d6c1e 100644
--- a/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/VerifierService.java
+++ b/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/VerifierService.java
@@ -27,7 +27,7 @@
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 {
diff --git a/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/packageinfo b/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/packageinfo
index a4f1546..c266447 100644
--- a/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/packageinfo
+++ b/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/packageinfo
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.0.1
\ No newline at end of file
diff --git a/org.apache.ace.webui.vaadin/.settings/org.eclipse.jdt.core.prefs b/org.apache.ace.webui.vaadin/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d17b672..0000000
--- a/org.apache.ace.webui.vaadin/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-eclipse.preferences.version=1
-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.7
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
-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.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/NamedObject.java b/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/NamedObject.java
index 235a938..0c7a4f0 100644
--- a/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/NamedObject.java
+++ b/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/NamedObject.java
@@ -20,7 +20,7 @@
import org.apache.ace.client.repository.RepositoryObject;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
@ProviderType
public interface NamedObject {
diff --git a/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/UIExtensionFactory.java b/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/UIExtensionFactory.java
index 8bdc75f..880d678 100644
--- a/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/UIExtensionFactory.java
+++ b/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/UIExtensionFactory.java
@@ -20,7 +20,7 @@
import java.util.Map;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
import com.vaadin.ui.Component;
diff --git a/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/packageinfo b/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/packageinfo
index a4f1546..c266447 100644
--- a/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/packageinfo
+++ b/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/packageinfo
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.0.1
\ No newline at end of file
diff --git a/run-develop/.classpath b/run-develop/.classpath
index f89ae43..57c70f3 100644
--- a/run-develop/.classpath
+++ b/run-develop/.classpath
@@ -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>
diff --git a/run-develop/bnd.bnd b/run-develop/bnd.bnd
index 82854af..472395a 100644
--- a/run-develop/bnd.bnd
+++ b/run-develop/bnd.bnd
@@ -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
