This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-repoinit.git
commit 18b9881a8c0f7dfee0a1790d199d8d929525bd1e Author: Robert Munteanu <[email protected]> AuthorDate: Wed Sep 18 17:43:00 2019 +0200 SLING-8627 - Update sling-jcr-repoinit to Oak 1.16.0 and Jackrabbit 2.18.2 Preparatory work: - disable Maven classpath extension to simplify reasoning about the classpath - use the latest Sling 11 for ITs --- pom.xml | 1 + src/main/java/org/apache/sling/jcr/repoinit/impl/AclUtil.java | 4 +--- src/test/provisioning/it-model.txt | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index daa626b..5b4a697 100644 --- a/pom.xml +++ b/pom.xml @@ -143,6 +143,7 @@ <configuration> <usePomDependencies>true</usePomDependencies> <attachArtifact>false</attachArtifact> + <disableExtendingMavenClasspath>true</disableExtendingMavenClasspath> <servers> <server> <id>singleinstance</id> diff --git a/src/main/java/org/apache/sling/jcr/repoinit/impl/AclUtil.java b/src/main/java/org/apache/sling/jcr/repoinit/impl/AclUtil.java index 1adb0e7..100cba6 100644 --- a/src/main/java/org/apache/sling/jcr/repoinit/impl/AclUtil.java +++ b/src/main/java/org/apache/sling/jcr/repoinit/impl/AclUtil.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; import javax.jcr.PathNotFoundException; import javax.jcr.RepositoryException; import javax.jcr.Session; @@ -39,7 +38,6 @@ import org.apache.jackrabbit.api.security.JackrabbitAccessControlList; import org.apache.jackrabbit.api.security.JackrabbitAccessControlManager; import org.apache.jackrabbit.api.security.user.Authorizable; import org.apache.jackrabbit.commons.jackrabbit.authorization.AccessControlUtils; -import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal; import org.apache.sling.repoinit.parser.operations.RestrictionClause; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -169,7 +167,7 @@ public class AclUtil { ", isAllow: " + entry.isAllow() + ", restrictionNames: " + entry.getRestrictionNames() + "]"; } - private static void checkState(boolean expression, @Nullable String msg) { + private static void checkState(boolean expression, String msg) { if (!expression) { throw new IllegalStateException(msg); } diff --git a/src/test/provisioning/it-model.txt b/src/test/provisioning/it-model.txt index f5860d0..ce43c3e 100644 --- a/src/test/provisioning/it-model.txt +++ b/src/test/provisioning/it-model.txt @@ -21,7 +21,7 @@ # Dependencies [artifacts] - org.apache.sling/org.apache.sling.launchpad/9/slingstart + org.apache.sling/org.apache.sling.starter/11/slingstart org.apache.sling/org.apache.sling.junit.core/1.0.26 # additional configuration for testing
