svn commit: r1859647 - in /jackrabbit/branches/2.18: ./ jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/

[re...@apache.org]

Author: reschke
Date: Tue May 21 13:44:04 2019
New Revision: 1859647

URL: http://svn.apache.org/viewvc?rev=1859647&view=rev
Log:
JCR-4429 : Add extension of JackrabbitAccessControlList bound to a principal (ported to 2.18)

Added:
    jackrabbit/branches/2.18/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/PrincipalAccessControlList.java
      - copied, changed from r1858564, jackrabbit/trunk/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/PrincipalAccessControlList.java
Modified:
    jackrabbit/branches/2.18/   (props changed)
    jackrabbit/branches/2.18/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/package-info.java

Propchange: jackrabbit/branches/2.18/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 21 13:44:04 2019
@@ -1,3 +1,3 @@
 /jackrabbit/branches/JCR-2272:1173165-1176545
 /jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1850224,1851360,1851369,1851372,1851380,1851384,1851904,1851946,1851953,1851961,1852417,1853927,1854018,1856855,1856969,1857631,1857721,1859633
+/jackrabbit/trunk:1850224,1851360,1851369,1851372,1851380,1851384,1851904,1851946,1851953,1851961,1852417,1853927,1854018,1856855,1856969,1857631,1857721,1858564,1858566,1859633

Copied: jackrabbit/branches/2.18/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/PrincipalAccessControlList.java (from r1858564, jackrabbit/trunk/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/PrincipalAccessControlList.java)
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.18/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/PrincipalAccessControlList.java?p2=jackrabbit/branches/2.18/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/PrincipalAccessControlList.java&p1=jackrabbit/trunk/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/PrincipalAccessControlList.java&r1=1858564&r2=1859647&rev=1859647&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/PrincipalAccessControlList.java (original)
+++ jackrabbit/branches/2.18/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/PrincipalAccessControlList.java Tue May 21 13:44:04 2019
@@ -21,6 +21,7 @@ import org.apache.jackrabbit.api.securit
 import org.apache.jackrabbit.api.security.JackrabbitAccessControlPolicy;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.osgi.annotation.versioning.ProviderType;
 
 import javax.jcr.RepositoryException;
 import javax.jcr.Value;
@@ -60,6 +61,7 @@ import java.util.Set;
  * This access controlled node may or may not be associated with an (optional) representation of the associated
  * {@code Principal} inside the repository.
  */
+@ProviderType
 public interface PrincipalAccessControlList extends JackrabbitAccessControlList {
 
     /**

Modified: jackrabbit/branches/2.18/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.18/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/package-info.java?rev=1859647&r1=1859646&r2=1859647&view=diff
==============================================================================
--- jackrabbit/branches/2.18/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/package-info.java (original)
+++ jackrabbit/branches/2.18/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/package-info.java Tue May 21 13:44:04 2019
@@ -18,5 +18,5 @@
 /**
  * Jackrabbit extensions for authorization.
  */
-@org.osgi.annotation.versioning.Version("2.3.1")
+@org.osgi.annotation.versioning.Version("2.4.0")
 package org.apache.jackrabbit.api.security.authorization;