You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2015/12/07 19:53:11 UTC
svn commit: r1718442 - in /sling/trunk:
bundles/jcr/it-jackrabbit-oak/pom.xml bundles/jcr/oak-server/pom.xml
contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml
launchpad/builder/src/main/provisioning/oak.txt update_dependencies.sh
Author: olli
Date: Mon Dec 7 18:53:11 2015
New Revision: 1718442
URL: http://svn.apache.org/viewvc?rev=1718442&view=rev
Log:
SLING-5360 Update Oak to 1.3.11
Modified:
sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml
sling/trunk/bundles/jcr/oak-server/pom.xml
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml
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=1718442&r1=1718441&r2=1718442&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml (original)
+++ sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml Mon Dec 7 18:53:11 2015
@@ -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.10</oak.version>
+ <oak.version>1.3.11</oak.version>
<sling.oak.server.version>1.0.1-SNAPSHOT</sling.oak.server.version>
<!-- optionally activate the webconsole -->
Modified: sling/trunk/bundles/jcr/oak-server/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/pom.xml?rev=1718442&r1=1718441&r2=1718442&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/oak-server/pom.xml (original)
+++ sling/trunk/bundles/jcr/oak-server/pom.xml Mon Dec 7 18:53:11 2015
@@ -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.10</oak.version>
+ <oak.version>1.3.11</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=1718442&r1=1718441&r2=1718442&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 Mon Dec 7 18:53:11 2015
@@ -37,7 +37,7 @@
<properties>
<org.apache.jackrabbit.version>2.11.3</org.apache.jackrabbit.version>
- <org.apache.jackrabbit.oak.version>1.3.10</org.apache.jackrabbit.oak.version>
+ <org.apache.jackrabbit.oak.version>1.3.11</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/launchpad/builder/src/main/provisioning/oak.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/oak.txt?rev=1718442&r1=1718441&r2=1718442&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/oak.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/oak.txt Mon Dec 7 18:53:11 2015
@@ -20,7 +20,7 @@
[feature name=oak]
[variables]
- oak.version=1.3.10
+ oak.version=1.3.11
# The segment node store is used via a configuration
[artifacts startLevel=10 runModes=oak]
Modified: sling/trunk/update_dependencies.sh
URL: http://svn.apache.org/viewvc/sling/trunk/update_dependencies.sh?rev=1718442&r1=1718441&r2=1718442&view=diff
==============================================================================
--- sling/trunk/update_dependencies.sh (original)
+++ sling/trunk/update_dependencies.sh Mon Dec 7 18:53:11 2015
@@ -19,8 +19,8 @@
# TODO make GNU compatible
# Oak
-OAK_VERSION_CURRENT=1.3.9
-OAK_VERSION_NEW=1.3.10
+OAK_VERSION_CURRENT=1.3.10
+OAK_VERSION_NEW=1.3.11
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"