svn commit: r1805266 - in /sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning: oak.txt sling.txt

[bd...@apache.org]

Author: bdelacretaz
Date: Thu Aug 17 07:37:40 2017
New Revision: 1805266

URL: http://svn.apache.org/viewvc?rev=1805266&view=rev
Log:
Use recent versions and avoid more snapshots

Modified:
    sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/oak.txt
    sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/sling.txt

Modified: sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/oak.txt
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/oak.txt?rev=1805266&r1=1805265&r2=1805266&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/oak.txt (original)
+++ sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/oak.txt Thu Aug 17 07:37:40 2017
@@ -20,7 +20,7 @@
 [feature name=oak]
 
 [variables]
-    oak.version=1.5.5
+    oak.version=1.6.1
 
 # The segment node store is used via a configuration
 [artifacts startLevel=10]
@@ -40,7 +40,7 @@
 # and started to avoid restarting that component ( see SLING-4556 )
 [artifacts startLevel=16]
     # TODO replace with 1.0.2 once that's released
-    org.apache.sling/org.apache.sling.jcr.oak.server/1.0.1-SNAPSHOT
+    org.apache.sling/org.apache.sling.jcr.oak.server/1.1.4
 
 [configurations]
   org.apache.felix.jaas.Configuration.factory-LoginModuleImpl
@@ -68,4 +68,4 @@
 [configurations runModes=oak_tar]
   org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService
     name="Default\ NodeStore"
-    repository.home="sling/repository"
\ No newline at end of file
+    repository.home="sling/repository"

Modified: sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/sling.txt
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/sling.txt?rev=1805266&r1=1805265&r2=1805266&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/sling.txt (original)
+++ sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/sling.txt Thu Aug 17 07:37:40 2017
@@ -20,7 +20,7 @@
 [feature name=sling]
 
 [variables]
-    jackrabbit.version=2.12.2
+    jackrabbit.version=2.14.0
 
 [artifacts]
     commons-collections/commons-collections/3.2.2
@@ -48,7 +48,7 @@
     org.apache.sling/org.apache.sling.resourceresolver/1.4.12
     org.apache.sling/org.apache.sling.scripting.api/2.1.8
     org.apache.sling/org.apache.sling.scripting.core/2.0.36
-    org.apache.sling/org.apache.sling.serviceusermapper/1.2.2
+    org.apache.sling/org.apache.sling.serviceusermapper/1.3.4
     org.apache.sling/org.apache.sling.servlets.get/2.1.14
     org.apache.sling/org.apache.sling.servlets.resolver/2.4.2
     javax.mail/mail/1.4.7
@@ -71,7 +71,7 @@
 [artifacts startLevel=15]
     org.apache.sling/org.apache.sling.jcr.jcr-wrapper/2.0.0
     org.apache.sling/org.apache.sling.jcr.api/2.4.0
-    org.apache.sling/org.apache.sling.jcr.base/2.4.0
+    org.apache.sling/org.apache.sling.jcr.base/3.0.4
     org.apache.sling/org.apache.sling.jcr.registration/1.0.2
     org.apache.jackrabbit/jackrabbit-api/${jackrabbit.version}
     org.apache.jackrabbit/jackrabbit-jcr-commons/${jackrabbit.version}
@@ -88,3 +88,23 @@
     org.apache.sling.commons.log.level="info"
     org.apache.sling.commons.log.file.size="'.'yyyy-MM-dd"
     org.apache.sling.commons.log.file.number=I"7"
+
+  org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling
+    whitelist.name="sling"
+    whitelist.bundles=[
+      "org.apache.sling.junit.core",\
+      "org.apache.sling.discovery.commons",\
+      "org.apache.sling.discovery.base",\
+      "org.apache.sling.discovery.oak",\
+      "org.apache.sling.extensions.webconsolesecurityprovider",\
+      "org.apache.sling.i18n",\
+      "org.apache.sling.jcr.base",\
+      "org.apache.sling.jcr.contentloader",\
+      "org.apache.sling.jcr.davex",\
+      "org.apache.sling.jcr.jackrabbit.usermanager",\
+      "org.apache.sling.jcr.oak.server",\
+      "org.apache.sling.jcr.repoinit",\
+      "org.apache.sling.jcr.resource",\
+      "org.apache.sling.jcr.webconsole",\
+      "org.apache.sling.servlets.post"
+    ]