GitLab Mirror pushed to branch trunk at cms-community / hippo-jackrabbit
Commits: 1fde1e92 by Julian Reschke at 2017-10-23T21:13:43+00:00 JCR-4206: Switch to official OSGi versioning annotations Part 3: other annotations in jackrabbit-api git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1813098 13f79535-47bb-0310-9956-ffa450edef68 - - - - - 8 changed files: - jackrabbit-api/pom.xml - jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlEntry.java - jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlList.java - jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlManager.java - jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlPolicy.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/user/UserManager.java - jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/package-info.java Changes: ===================================== jackrabbit-api/pom.xml ===================================== --- a/jackrabbit-api/pom.xml +++ b/jackrabbit-api/pom.xml @@ -59,12 +59,6 @@ <artifactId>jcr</artifactId> </dependency> <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> ===================================== jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlEntry.java ===================================== --- a/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlEntry.java +++ b/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlEntry.java @@ -21,7 +21,7 @@ import javax.jcr.Value; import javax.jcr.ValueFormatException; import javax.jcr.security.AccessControlEntry; -import aQute.bnd.annotation.ProviderType; +import org.osgi.annotation.versioning.ProviderType; /** * <code>JackrabbitAccessControlEntry</code> is a Jackrabbit specific extension ===================================== jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlList.java ===================================== --- a/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlList.java +++ b/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlList.java @@ -27,7 +27,7 @@ import javax.jcr.security.AccessControlList; import javax.jcr.security.AccessControlPolicy; import javax.jcr.security.Privilege; -import aQute.bnd.annotation.ProviderType; +import org.osgi.annotation.versioning.ProviderType; /** * <code>JackrabbitAccessControlList</code> is an extension of the <code>AccessControlList</code>. ===================================== jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlManager.java ===================================== --- a/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlManager.java +++ b/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlManager.java @@ -24,10 +24,11 @@ import javax.jcr.security.AccessControlException; import javax.jcr.security.AccessControlManager; import javax.jcr.security.AccessControlPolicy; import javax.jcr.security.Privilege; + import java.security.Principal; import java.util.Set; -import aQute.bnd.annotation.ProviderType; +import org.osgi.annotation.versioning.ProviderType; /** * <code>JackrabbitAccessControlManager</code> provides extensions to the ===================================== jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlPolicy.java ===================================== --- a/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlPolicy.java +++ b/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlPolicy.java @@ -18,7 +18,7 @@ package org.apache.jackrabbit.api.security; import javax.jcr.security.AccessControlPolicy; -import aQute.bnd.annotation.ProviderType; +import org.osgi.annotation.versioning.ProviderType; /** * <code>JackrabbitAccessControlPolicy</code> is an extension of the ===================================== 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 @@ -19,5 +19,4 @@ * Token credentials. */ @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/user/UserManager.java ===================================== --- a/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/UserManager.java +++ b/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/UserManager.java @@ -23,7 +23,7 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; import javax.jcr.UnsupportedRepositoryOperationException; -import aQute.bnd.annotation.ProviderType; +import org.osgi.annotation.versioning.ProviderType; /** * The <code>UserManager</code> provides access to and means to maintain ===================================== 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. */ -@org.osgi.annotation.versioning.Version("2.4.0") +@org.osgi.annotation.versioning.Version("2.4.1") package org.apache.jackrabbit.api.security.user; View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/1fde1e92eaee3b82bc1d9a01a1270417459e2a1d --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/1fde1e92eaee3b82bc1d9a01a1270417459e2a1d 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
