You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2018/07/30 11:34:34 UTC
svn commit: r1837048 - in /jackrabbit/branches/2.16: ./ jackrabbit-api/
jackrabbit-api/src/main/java/org/apache/jackrabbit/api/
jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/
jackrabbit-api/src/main/java/org/apache/jackr...
Author: reschke
Date: Mon Jul 30 11:34:34 2018
New Revision: 1837048
URL: http://svn.apache.org/viewvc?rev=1837048&view=rev
Log:
JCR-4301: get rid of JSR 305 dependency - switch to JetBrains annotations (ported to 2.16)
Modified:
jackrabbit/branches/2.16/ (props changed)
jackrabbit/branches/2.16/jackrabbit-api/pom.xml
jackrabbit/branches/2.16/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/JackrabbitSession.java
jackrabbit/branches/2.16/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/package-info.java
jackrabbit/branches/2.16/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/PrincipalSetPolicy.java
jackrabbit/branches/2.16/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/package-info.java
jackrabbit/branches/2.16/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/Group.java
jackrabbit/branches/2.16/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/package-info.java
Propchange: jackrabbit/branches/2.16/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 30 11:34:34 2018
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1816227,1817094,1817097-1817098,1817100,1817113,1817201,1817213,1817341,1817373,1817377,1818586,1819269,1819271,1819839,1819849,1820119,1820133,1820294,1820573,1820675,1821247,1821475,1821597,1821705,1821880,1822643,1822863,1822947,1822950,1824756,1824763-1824764,1824771,1824876,1826154,1826178,1826230,1826647,1826940,1826964,1828213,1830107,1830201,1830540,1830753,1830814,1830878,1830951,1831182,1831854,1831860,1832058,1832090,1833374,1833835,1833891,1834008,1834308,1834315,1834401,1834418,1834424,1834673,1834922,1835445,1835448,1835459,1836349
+/jackrabbit/trunk:1816227,1817094,1817097-1817098,1817100,1817113,1817201,1817213,1817341,1817373,1817377,1818586,1819269,1819271,1819839,1819849,1820119,1820133,1820294,1820573,1820675,1821247,1821475,1821597,1821705,1821880,1822643,1822863,1822947,1822950,1824756,1824763-1824764,1824771,1824876,1826154,1826178,1826230,1826647,1826940,1826964,1828213,1830107,1830201,1830540,1830753,1830814,1830878,1830951,1831182,1831854,1831860,1832058,1832090,1832177,1833374,1833835,1833891,1834008,1834308,1834315,1834401,1834418,1834424,1834673,1834922,1835445,1835448,1835459,1836349
Modified: jackrabbit/branches/2.16/jackrabbit-api/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.16/jackrabbit-api/pom.xml?rev=1837048&r1=1837047&r2=1837048&view=diff
==============================================================================
--- jackrabbit/branches/2.16/jackrabbit-api/pom.xml (original)
+++ jackrabbit/branches/2.16/jackrabbit-api/pom.xml Mon Jul 30 11:34:34 2018
@@ -64,11 +64,11 @@
<scope>provided</scope>
</dependency>
- <!-- Findbugs annotations -->
+ <!-- nullability, see JCR-4301 -->
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <scope>provided</scope>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
+ <version>16.0.2</version>
</dependency>
</dependencies>
</project>
Modified: jackrabbit/branches/2.16/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/JackrabbitSession.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.16/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/JackrabbitSession.java?rev=1837048&r1=1837047&r2=1837048&view=diff
==============================================================================
--- jackrabbit/branches/2.16/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/JackrabbitSession.java (original)
+++ jackrabbit/branches/2.16/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/JackrabbitSession.java Mon Jul 30 11:34:34 2018
@@ -19,7 +19,6 @@ package org.apache.jackrabbit.api;
import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.jackrabbit.api.security.principal.PrincipalManager;
-import javax.annotation.Nonnull;
import javax.jcr.Item;
import javax.jcr.Node;
import javax.jcr.Property;
@@ -28,6 +27,8 @@ import javax.jcr.AccessDeniedException;
import javax.jcr.RepositoryException;
import javax.jcr.UnsupportedRepositoryOperationException;
+import org.jetbrains.annotations.NotNull;
+
/**
* Jackrabbit specific extension of the JCR {@link javax.jcr.Session} interface.
*/
@@ -189,7 +190,7 @@ public interface JackrabbitSession exten
* @throws RepositoryException if an error occurs.
* @see Session#hasPermission(String, String)
*/
- public boolean hasPermission(@Nonnull String absPath, @Nonnull String... actions) throws RepositoryException;
+ public boolean hasPermission(@NotNull String absPath, @NotNull String... actions) throws RepositoryException;
/**
* Returns the <code>PrincipalManager</code> for the current <code>Session</code>.
Modified: jackrabbit/branches/2.16/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.16/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/package-info.java?rev=1837048&r1=1837047&r2=1837048&view=diff
==============================================================================
--- jackrabbit/branches/2.16/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/package-info.java (original)
+++ jackrabbit/branches/2.16/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/package-info.java Mon Jul 30 11:34:34 2018
@@ -18,5 +18,5 @@
/**
* Jackrabbit extensions for JCR core interfaces
*/
-@org.osgi.annotation.versioning.Version("2.4")
+@org.osgi.annotation.versioning.Version("2.4.1")
package org.apache.jackrabbit.api;
Modified: jackrabbit/branches/2.16/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/PrincipalSetPolicy.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.16/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/PrincipalSetPolicy.java?rev=1837048&r1=1837047&r2=1837048&view=diff
==============================================================================
--- jackrabbit/branches/2.16/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/PrincipalSetPolicy.java (original)
+++ jackrabbit/branches/2.16/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/PrincipalSetPolicy.java Mon Jul 30 11:34:34 2018
@@ -18,10 +18,12 @@ package org.apache.jackrabbit.api.securi
import java.security.Principal;
import java.util.Set;
-import javax.annotation.Nonnull;
+
import javax.jcr.security.AccessControlException;
import javax.jcr.security.AccessControlPolicy;
+import org.jetbrains.annotations.NotNull;
+
/**
* Extension of the JCR {@link javax.jcr.security.AccessControlPolicy AccessControlPolicy}
* intended to grant a set of {@code Principal}s the ability to perform certain
@@ -46,7 +48,7 @@ public interface PrincipalSetPolicy exte
* implementation specific actions on the those items where this policy
* takes effect.
*/
- @Nonnull
+ @NotNull
Set<Principal> getPrincipals();
/**
@@ -59,7 +61,7 @@ public interface PrincipalSetPolicy exte
* principals is considered invalid or if another access control specific
* error occurs.
*/
- boolean addPrincipals(@Nonnull Principal... principals) throws AccessControlException;
+ boolean addPrincipals(@NotNull Principal... principals) throws AccessControlException;
/**
* Remove the specified {@code Principal}s for the set of allowed principals
@@ -72,5 +74,5 @@ public interface PrincipalSetPolicy exte
* principals is considered invalid or if another access control specific
* error occurs.
*/
- boolean removePrincipals(@Nonnull Principal... principals) throws AccessControlException;
+ boolean removePrincipals(@NotNull Principal... principals) throws AccessControlException;
}
\ No newline at end of file
Modified: jackrabbit/branches/2.16/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.16/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/package-info.java?rev=1837048&r1=1837047&r2=1837048&view=diff
==============================================================================
--- jackrabbit/branches/2.16/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/package-info.java (original)
+++ jackrabbit/branches/2.16/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/package-info.java Mon Jul 30 11:34:34 2018
@@ -18,5 +18,5 @@
/**
* Jackrabbit extensions for authorization.
*/
-@org.osgi.annotation.versioning.Version("2.3")
+@org.osgi.annotation.versioning.Version("2.3.1")
package org.apache.jackrabbit.api.security.authorization;
Modified: jackrabbit/branches/2.16/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/Group.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.16/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/Group.java?rev=1837048&r1=1837047&r2=1837048&view=diff
==============================================================================
--- jackrabbit/branches/2.16/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/Group.java (original)
+++ jackrabbit/branches/2.16/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/Group.java Mon Jul 30 11:34:34 2018
@@ -16,13 +16,14 @@
*/
package org.apache.jackrabbit.api.security.user;
-import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import java.util.Iterator;
import java.util.Set;
+import org.jetbrains.annotations.NotNull;
+
/**
* A Group is a collection of {@link #getMembers() Authorizable}s.
*/
@@ -88,7 +89,7 @@ public interface Group extends Authoriza
* @throws RepositoryException If one of the specified memberIds is invalid or
* if some other error occurs.
*/
- Set<String> addMembers(@Nonnull String... memberIds) throws RepositoryException;
+ Set<String> addMembers(@NotNull String... memberIds) throws RepositoryException;
/**
* Remove a member from this Group.
@@ -114,5 +115,5 @@ public interface Group extends Authoriza
* @throws RepositoryException If one of the specified memberIds is invalid
* or if some other error occurs.
*/
- Set<String> removeMembers(@Nonnull String... memberIds) throws RepositoryException;
+ Set<String> removeMembers(@NotNull String... memberIds) throws RepositoryException;
}
Modified: jackrabbit/branches/2.16/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.16/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/package-info.java?rev=1837048&r1=1837047&r2=1837048&view=diff
==============================================================================
--- jackrabbit/branches/2.16/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/package-info.java (original)
+++ jackrabbit/branches/2.16/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/package-info.java Mon Jul 30 11:34:34 2018
@@ -18,5 +18,5 @@
/**
* Jackrabbit extensions for user management.
*/
-@org.osgi.annotation.versioning.Version("2.4.1")
+@org.osgi.annotation.versioning.Version("2.4.2")
package org.apache.jackrabbit.api.security.user;