Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9FD07181B8 for ; Sat, 20 Feb 2016 21:26:14 +0000 (UTC) Received: (qmail 6014 invoked by uid 500); 20 Feb 2016 21:26:14 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 5957 invoked by uid 500); 20 Feb 2016 21:26:14 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 5948 invoked by uid 99); 20 Feb 2016 21:26:14 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Feb 2016 21:26:14 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 22B741801DA for ; Sat, 20 Feb 2016 21:26:14 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.471 X-Spam-Level: * X-Spam-Status: No, score=1.471 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.329] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id Sakz1RJb__BJ for ; Sat, 20 Feb 2016 21:26:12 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with ESMTP id 512CD5FAD6 for ; Sat, 20 Feb 2016 21:26:11 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 8E7FFE019D for ; Sat, 20 Feb 2016 21:26:10 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 8F6B03A0479 for ; Sat, 20 Feb 2016 21:26:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@sling.apache.org From: olli@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160220212610.8F6B03A0479@svn01-us-west.apache.org> 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 --> - 1.3.14 + 1.3.15 1.0.1-SNAPSHOT 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 --> - 1.3.14 + 1.3.15 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 @@ 4.0.4 2.12.0 - 1.3.14 + 1.3.15 1.11 0.1.1.SNAPSHOT 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 @@ mvn:org.apache.jackrabbit/oak-commons/${org.apache.jackrabbit.oak.version} mvn:org.apache.jackrabbit/oak-lucene/${org.apache.jackrabbit.oak.version} mvn:org.apache.jackrabbit/oak-blob/${org.apache.jackrabbit.oak.version} + mvn:org.apache.jackrabbit/oak-segment/${org.apache.jackrabbit.oak.version} scr jackrabbit-sling 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_CURRENT<\/oak.version>/$OAK_VERSION_NEW<\/oak.version>/1" "bundles/jcr/oak-server/pom.xml" sed -i '' "s/$OAK_VERSION_CURRENT<\/oak.version>/$OAK_VERSION_NEW<\/oak.version>/1" "bundles/jcr/it-jackrabbit-oak/pom.xml"