sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o...@apache.org
Subject svn commit: r1731473 - in /sling/trunk: ./ bundles/jcr/it-jackrabbit-oak/ bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/ bundles/jcr/oak-server/ contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/ contrib...
Date Sat, 20 Feb 2016 21:26:10 GMT
Author: olli
Date: Sat Feb 20 21:26:10 2016
New Revision: 1731473

URL: http://svn.apache.org/viewvc?rev=1731473&view=rev
Log:
SLING-5520 Update Oak to 1.4 (1.3.15)

update to Oak 1.3.15, add new dependency oak-segment

Modified:
    sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml
    sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
    sling/trunk/bundles/jcr/oak-server/pom.xml
    sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml
    sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
    sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/OakSlingIT.java
    sling/trunk/launchpad/builder/src/main/provisioning/oak.txt
    sling/trunk/update_dependencies.sh

Modified: sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml?rev=1731473&r1=1731472&r2=1731473&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml (original)
+++ sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml Sat Feb 20 21:26:10 2016
@@ -52,7 +52,7 @@
             WARNING make sure oak.version and sling.oak.server.version 
             are in sync with bundles/jcr/oak-server
         -->
-        <oak.version>1.3.14</oak.version>
+        <oak.version>1.3.15</oak.version>
         <sling.oak.server.version>1.0.1-SNAPSHOT</sling.oak.server.version>
         
         <!-- optionally activate the webconsole -->

Modified: sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java?rev=1731473&r1=1731472&r2=1731473&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
(original)
+++ sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
Sat Feb 20 21:26:10 2016
@@ -67,6 +67,7 @@ public class OakRepositoryIT extends Com
 
         opt.add(mavenBundle("org.apache.jackrabbit", "oak-lucene", oakVersion));
         opt.add(mavenBundle("org.apache.jackrabbit", "oak-blob", oakVersion));
+        opt.add(mavenBundle("org.apache.jackrabbit", "oak-segment", oakVersion));
         opt.add(mavenBundle("org.apache.felix", "org.apache.felix.jaas", "0.0.2"));
 
         return opt.toArray(new Option[]{});

Modified: sling/trunk/bundles/jcr/oak-server/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/pom.xml?rev=1731473&r1=1731472&r2=1731473&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/oak-server/pom.xml (original)
+++ sling/trunk/bundles/jcr/oak-server/pom.xml Sat Feb 20 21:26:10 2016
@@ -47,7 +47,7 @@
             WARNING make sure oak.version and sling.oak.server.version 
             are in sync with bundles/jcr/it-jackrabbit-oak
         -->
-        <oak.version>1.3.14</oak.version>
+        <oak.version>1.3.15</oak.version>
     </properties>
 
     <build>

Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml?rev=1731473&r1=1731472&r2=1731473&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml
(original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml
Sat Feb 20 21:26:10 2016
@@ -38,7 +38,7 @@
   <properties>
     <org.apache.karaf.version>4.0.4</org.apache.karaf.version>
     <org.apache.jackrabbit.version>2.12.0</org.apache.jackrabbit.version>
-    <org.apache.jackrabbit.oak.version>1.3.14</org.apache.jackrabbit.oak.version>
+    <org.apache.jackrabbit.oak.version>1.3.15</org.apache.jackrabbit.oak.version>
     <org.apache.tika.version>1.11</org.apache.tika.version>
     <feature.version>0.1.1.SNAPSHOT</feature.version>
   </properties>

Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml?rev=1731473&r1=1731472&r2=1731473&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
(original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
Sat Feb 20 21:26:10 2016
@@ -388,6 +388,7 @@
     <bundle>mvn:org.apache.jackrabbit/oak-commons/${org.apache.jackrabbit.oak.version}</bundle>
     <bundle>mvn:org.apache.jackrabbit/oak-lucene/${org.apache.jackrabbit.oak.version}</bundle>
     <bundle>mvn:org.apache.jackrabbit/oak-blob/${org.apache.jackrabbit.oak.version}</bundle>
+    <bundle>mvn:org.apache.jackrabbit/oak-segment/${org.apache.jackrabbit.oak.version}</bundle>
     <!-- dependencies -->
     <feature>scr</feature>
     <feature version="${feature.version}">jackrabbit-sling</feature>

Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/OakSlingIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/OakSlingIT.java?rev=1731473&r1=1731472&r2=1731473&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/OakSlingIT.java
(original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/OakSlingIT.java
Sat Feb 20 21:26:10 2016
@@ -72,6 +72,13 @@ public class OakSlingIT extends KarafTes
     }
 
     @Test
+    public void testOrgApacheJackrabbitOakSegment() {
+        final Bundle bundle = findBundle("org.apache.jackrabbit.oak-segment");
+        assertNotNull(bundle);
+        assertEquals(Bundle.ACTIVE, bundle.getState());
+    }
+
+    @Test
     public void testComGoogleGuava() {
         final Bundle bundle = findBundle("com.google.guava");
         assertNotNull(bundle);

Modified: sling/trunk/launchpad/builder/src/main/provisioning/oak.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/oak.txt?rev=1731473&r1=1731472&r2=1731473&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/oak.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/oak.txt Sat Feb 20 21:26:10 2016
@@ -20,7 +20,7 @@
 [feature name=oak]
 
 [variables]
-    oak.version=1.3.14
+    oak.version=1.3.15
 
 # The segment node store is used via a configuration
 [artifacts startLevel=10]
@@ -31,6 +31,7 @@
     org.apache.jackrabbit/oak-commons/${oak.version}
     org.apache.jackrabbit/oak-lucene/${oak.version}
     org.apache.jackrabbit/oak-blob/${oak.version}
+    org.apache.jackrabbit/oak-segment/${oak.version}
 
 [artifacts startLevel=15 runModes=oak_mongo]
     org.mongodb/mongo-java-driver/2.13.3

Modified: sling/trunk/update_dependencies.sh
URL: http://svn.apache.org/viewvc/sling/trunk/update_dependencies.sh?rev=1731473&r1=1731472&r2=1731473&view=diff
==============================================================================
--- sling/trunk/update_dependencies.sh (original)
+++ sling/trunk/update_dependencies.sh Sat Feb 20 21:26:10 2016
@@ -19,8 +19,8 @@
 # TODO make GNU compatible
 
 # Oak
-OAK_VERSION_CURRENT=1.3.10
-OAK_VERSION_NEW=1.3.11
+OAK_VERSION_CURRENT=1.3.14
+OAK_VERSION_NEW=1.3.15
 
 sed -i '' "s/<oak.version>$OAK_VERSION_CURRENT<\/oak.version>/<oak.version>$OAK_VERSION_NEW<\/oak.version>/1"
"bundles/jcr/oak-server/pom.xml"
 sed -i '' "s/<oak.version>$OAK_VERSION_CURRENT<\/oak.version>/<oak.version>$OAK_VERSION_NEW<\/oak.version>/1"
"bundles/jcr/it-jackrabbit-oak/pom.xml"



Mime
View raw message