SLING-6285 - Implement LoginAdminWhitelist in JCR Base
- adjust to moved LoginAdminWhitelist
-minor cleanup
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1769963 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index f3e7158..6b5a344 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -296,9 +296,9 @@
</feature>
<!-- Apache Sling JCR -->
<feature name="sling-jcr" version="${feature.version}">
- <configfile finalname="/etc/org.apache.sling.jcr.oak.server.internal.LoginAdminWhitelist.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.oak.server.internal.LoginAdminWhitelist</configfile>
+ <configfile finalname="/etc/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist</configfile>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.api/2.4.0</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.jcr.base/2.4.1-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.base/2.4.3-SNAPSHOT</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.classloader/3.2.2</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.contentloader/2.1.10</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.davex/1.3.4</bundle>
@@ -404,14 +404,14 @@
<feature version="${feature.version}" prerequisite="true">sling-launchpad-oak</feature>
<bundle>mvn:org.apache.jackrabbit/oak-lucene/${org.apache.jackrabbit.oak.version}</bundle>
<bundle>mvn:org.apache.jackrabbit/oak-segment/${org.apache.jackrabbit.oak.version}</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.1.1-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.1.3-SNAPSHOT</bundle>
</feature>
<feature name="sling-launchpad-oak-mongo" version="${feature.version}">
<configfile finalname="/etc/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.cfg">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/cfg/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService</configfile>
<feature version="${feature.version}" prerequisite="true">sling-launchpad-oak</feature>
<bundle>mvn:org.apache.jackrabbit/oak-lucene/${org.apache.jackrabbit.oak.version}</bundle>
<bundle>mvn:org.mongodb/mongo-java-driver/2.14.3</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.1.1-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.1.3-SNAPSHOT</bundle>
</feature>
<!-- Apache Sling NoSQL -->
<feature name="sling-nosql-generic" version="${feature.version}">
