sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o...@apache.org
Subject svn commit: r1752322 - in /sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning: oak.txt repoinit.txt sling.txt
Date Tue, 12 Jul 2016 17:35:23 GMT
Author: olli
Date: Tue Jul 12 17:35:23 2016
New Revision: 1752322

URL: http://svn.apache.org/viewvc?rev=1752322&view=rev
Log:
SLING-5836 RepoInit ITs fail - 5 bundles stuck in installed state

align artifacts and versions

Modified:
    sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/oak.txt
    sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/repoinit.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=1752322&r1=1752321&r2=1752322&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 Tue Jul 12 17:35:23
2016
@@ -20,7 +20,7 @@
 [feature name=oak]
 
 [variables]
-    oak.version=1.5.3
+    oak.version=1.5.5
 
 # The segment node store is used via a configuration
 [artifacts startLevel=10]
@@ -42,7 +42,7 @@
 # start the Oak server instance after all components have been configured
 # and started to avoid restarting that component ( see SLING-4556 )
 [artifacts startLevel=16]
-    org.apache.sling/org.apache.sling.jcr.oak.server/1.0.0
+    org.apache.sling/org.apache.sling.jcr.oak.server/1.0.1-SNAPSHOT
 
 [configurations]
   org.apache.felix.jaas.Configuration.factory-GuestLoginModule

Modified: sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/repoinit.txt
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/repoinit.txt?rev=1752322&r1=1752321&r2=1752322&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/repoinit.txt (original)
+++ sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/repoinit.txt Tue Jul
12 17:35:23 2016
@@ -26,9 +26,6 @@
 [artifacts]
   org.apache.sling/org.apache.sling.junit.core/1.0.14
   org.apache.sling/org.apache.sling.testing.tools/1.0.10
-  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.oak.server/1.0.1-SNAPSHOT
     
 [settings]
   org.apache.sling.commons.log.julenabled=true

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=1752322&r1=1752321&r2=1752322&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 Tue Jul 12
17:35:23 2016
@@ -20,7 +20,7 @@
 [feature name=sling]
 
 [variables]
-    jackrabbit.version=2.12.1
+    jackrabbit.version=2.12.2
 
 [artifacts]
     commons-collections/commons-collections/3.2.2
@@ -87,8 +87,8 @@
 
 [artifacts startLevel=15]
     org.apache.sling/org.apache.sling.jcr.jcr-wrapper/2.0.0
-    org.apache.sling/org.apache.sling.jcr.api/2.3.0
-    org.apache.sling/org.apache.sling.jcr.base/2.3.2
+    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.registration/1.0.2
     org.apache.jackrabbit/jackrabbit-api/${jackrabbit.version}
     org.apache.jackrabbit/jackrabbit-jcr-commons/${jackrabbit.version}



Mime
View raw message