GitLab Mirror pushed to branch trunk at cms-community / hippo-jackrabbit
Commits: b391d383 by Julian Reschke at 2017-10-23T19:23:13+00:00 JCR-4206: Switch to official OSGi versioning annotations Part 2: version annotations in jackrabbit-api git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1813064 13f79535-47bb-0310-9956-ffa450edef68 - - - - - 13 changed files: - jackrabbit-api/pom.xml - jackrabbit-api/src/main/java/org/apache/jackrabbit/api/jmx/package-info.java - jackrabbit-api/src/main/java/org/apache/jackrabbit/api/management/package-info.java - jackrabbit-api/src/main/java/org/apache/jackrabbit/api/observation/package-info.java - jackrabbit-api/src/main/java/org/apache/jackrabbit/api/package-info.java - jackrabbit-api/src/main/java/org/apache/jackrabbit/api/query/package-info.java - jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authentication/token/package-info.java - jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/package-info.java - jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/package-info.java - jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/principal/package-info.java - jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/package-info.java - jackrabbit-api/src/main/java/org/apache/jackrabbit/api/stats/package-info.java - jackrabbit-parent/pom.xml Changes: ===================================== jackrabbit-api/pom.xml ===================================== --- a/jackrabbit-api/pom.xml +++ b/jackrabbit-api/pom.xml @@ -61,6 +61,12 @@ <dependency> <groupId>biz.aQute</groupId> <artifactId>bndlib</artifactId> + <version>1.43.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.annotation</artifactId> <scope>provided</scope> </dependency> ===================================== jackrabbit-api/src/main/java/org/apache/jackrabbit/api/jmx/package-info.java ===================================== --- a/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/jmx/package-info.java +++ b/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/jmx/package-info.java @@ -18,5 +18,5 @@ /** * JMX management interfaces for JCR. */ -@aQute.bnd.annotation.Version("2.3.0") +@org.osgi.annotation.versioning.Version("2.3.0") package org.apache.jackrabbit.api.jmx; ===================================== jackrabbit-api/src/main/java/org/apache/jackrabbit/api/management/package-info.java ===================================== --- a/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/management/package-info.java +++ b/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/management/package-info.java @@ -18,5 +18,5 @@ /** * Interfaces for managing a Jackrabbit repository. */ -@aQute.bnd.annotation.Version("2.3.1") +@org.osgi.annotation.versioning.Version("2.3.1") package org.apache.jackrabbit.api.management; ===================================== jackrabbit-api/src/main/java/org/apache/jackrabbit/api/observation/package-info.java ===================================== --- a/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/observation/package-info.java +++ b/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/observation/package-info.java @@ -18,5 +18,5 @@ /** * Jackrabbit extensions for JCR observation. */ -@aQute.bnd.annotation.Version("2.3.1") +@org.osgi.annotation.versioning.Version("2.3.1") package org.apache.jackrabbit.api.observation; ===================================== jackrabbit-api/src/main/java/org/apache/jackrabbit/api/package-info.java ===================================== --- a/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/package-info.java +++ b/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/package-info.java @@ -18,5 +18,5 @@ /** * Jackrabbit extensions for JCR core interfaces */ -@aQute.bnd.annotation.Version("2.4") +@org.osgi.annotation.versioning.Version("2.4") package org.apache.jackrabbit.api; ===================================== jackrabbit-api/src/main/java/org/apache/jackrabbit/api/query/package-info.java ===================================== --- a/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/query/package-info.java +++ b/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/query/package-info.java @@ -15,5 +15,5 @@ * limitations under the License. */ /* see JCR-4060 */ -@aQute.bnd.annotation.Version("2.13.5") +@org.osgi.annotation.versioning.Version("2.13.5") package org.apache.jackrabbit.api.query; ===================================== jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authentication/token/package-info.java ===================================== --- a/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authentication/token/package-info.java +++ b/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authentication/token/package-info.java @@ -18,6 +18,6 @@ /** * Token credentials. */ -@aQute.bnd.annotation.Version("2.3") +@org.osgi.annotation.versioning.Version("2.3") @aQute.bnd.annotation.Export(optional = "provide:=true") package org.apache.jackrabbit.api.security.authentication.token; ===================================== jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/package-info.java ===================================== --- a/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/package-info.java +++ b/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/package-info.java @@ -18,5 +18,5 @@ /** * Jackrabbit extensions for authorization. */ -@aQute.bnd.annotation.Version("2.3") +@org.osgi.annotation.versioning.Version("2.3") package org.apache.jackrabbit.api.security.authorization; ===================================== jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/package-info.java ===================================== --- a/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/package-info.java +++ b/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/package-info.java @@ -18,5 +18,5 @@ /** * Jackrabbit extensions for access control. */ -@aQute.bnd.annotation.Version("2.4.0") +@org.osgi.annotation.versioning.Version("2.4.0") package org.apache.jackrabbit.api.security; ===================================== jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/principal/package-info.java ===================================== --- a/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/principal/package-info.java +++ b/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/principal/package-info.java @@ -18,5 +18,5 @@ /** * Jackrabbit extensions for JAAS principals. */ -@aQute.bnd.annotation.Version("2.3") +@org.osgi.annotation.versioning.Version("2.3") package org.apache.jackrabbit.api.security.principal; ===================================== jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/package-info.java ===================================== --- a/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/package-info.java +++ b/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/package-info.java @@ -18,5 +18,5 @@ /** * Jackrabbit extensions for user management. */ -@aQute.bnd.annotation.Version("2.4.0") +@org.osgi.annotation.versioning.Version("2.4.0") package org.apache.jackrabbit.api.security.user; ===================================== jackrabbit-api/src/main/java/org/apache/jackrabbit/api/stats/package-info.java ===================================== --- a/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/stats/package-info.java +++ b/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/stats/package-info.java @@ -18,5 +18,5 @@ /** * Jackrabbit repository statistics */ -@aQute.bnd.annotation.Version("1.2.0") +@org.osgi.annotation.versioning.Version("1.2.0") package org.apache.jackrabbit.api.stats; ===================================== jackrabbit-parent/pom.xml ===================================== --- a/jackrabbit-parent/pom.xml +++ b/jackrabbit-parent/pom.xml @@ -567,11 +567,6 @@ <version>${jetty.version}</version> </dependency> <dependency> - <groupId>biz.aQute</groupId> - <artifactId>bndlib</artifactId> - <version>1.43.0</version> - </dependency> - <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.annotation</artifactId> <version>6.0.0</version> View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/b391d383e32f0f7136a61e04d432a4060a37bd34 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/b391d383e32f0f7136a61e04d432a4060a37bd34 You're receiving this email because of your account on code.onehippo.org.
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
