Author: tomekr
Date: Tue Mar 24 19:08:41 2015
New Revision: 1668959
URL: http://svn.apache.org/r1668959
Log:
SLING-4502 Updated bundle versions
Modified:
sling/trunk/contrib/sling-s3/crank.d/50-sling-startlevel-boot.txt
sling/trunk/contrib/sling-s3/crank.d/55-sling-startlevel-0.txt
sling/trunk/contrib/sling-s3/scripts/bundles.rb
Modified: sling/trunk/contrib/sling-s3/crank.d/50-sling-startlevel-boot.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/sling-s3/crank.d/50-sling-startlevel-boot.txt?rev=1668959&r1=1668958&r2=1668959&view=diff
==============================================================================
--- sling/trunk/contrib/sling-s3/crank.d/50-sling-startlevel-boot.txt (original)
+++ sling/trunk/contrib/sling-s3/crank.d/50-sling-startlevel-boot.txt Tue Mar
24 19:08:41 2015
@@ -5,7 +5,7 @@ bundle mvn:org.apache.sling/org.apache.s
bundle mvn:org.apache.sling/org.apache.sling.commons.logservice/1.0.2
bundle mvn:org.slf4j/jcl-over-slf4j/1.7.6
bundle mvn:org.slf4j/log4j-over-slf4j/1.7.6
-bundle mvn:org.apache.sling/org.apache.sling.settings/1.3.4
+bundle mvn:org.apache.sling/org.apache.sling.settings/1.3.6
bundle mvn:org.apache.sling/org.apache.sling.fragment.xml/1.0.2
bundle mvn:org.apache.sling/org.apache.sling.fragment.transaction/1.0.0
bundle mvn:org.apache.sling/org.apache.sling.javax.activation/0.1.0
Modified: sling/trunk/contrib/sling-s3/crank.d/55-sling-startlevel-0.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/sling-s3/crank.d/55-sling-startlevel-0.txt?rev=1668959&r1=1668958&r2=1668959&view=diff
==============================================================================
--- sling/trunk/contrib/sling-s3/crank.d/55-sling-startlevel-0.txt (original)
+++ sling/trunk/contrib/sling-s3/crank.d/55-sling-startlevel-0.txt Tue Mar 24
19:08:41 2015
@@ -8,29 +8,31 @@ bundle mvn:org.apache.commons/commons-ma
bundle mvn:commons-pool/commons-pool/1.6
bundle
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.concurrent/1.3.4_1
bundle mvn:org.apache.geronimo.bundles/commons-httpclient/3.1_1
+bundle mvn:org.apache.httpcomponents/httpcore-osgi/4.4
+bundle mvn:org.apache.httpcomponents/httpclient-osgi/4.4
bundle mvn:org.apache.sling/org.apache.sling.commons.osgi/2.2.2
bundle mvn:org.apache.sling/org.apache.sling.commons.mime/2.1.8
bundle mvn:org.apache.sling/org.apache.sling.commons.classloader/1.3.2
bundle mvn:org.apache.sling/org.apache.sling.commons.compiler/2.2.0
-bundle mvn:org.apache.sling/org.apache.sling.commons.scheduler/2.4.4
+bundle mvn:org.apache.sling/org.apache.sling.commons.scheduler/2.4.6
bundle mvn:org.apache.sling/org.apache.sling.commons.threads/3.2.0
bundle mvn:org.apache.sling/org.apache.sling.discovery.api/1.0.2
bundle mvn:org.apache.sling/org.apache.sling.discovery.support/1.0.0
bundle mvn:org.apache.sling/org.apache.sling.discovery.impl/1.0.12
-bundle mvn:org.apache.sling/org.apache.sling.event/3.5.0
+bundle mvn:org.apache.sling/org.apache.sling.event/3.5.4
bundle mvn:org.apache.sling/org.apache.sling.event.dea/1.0.0
-bundle mvn:org.apache.sling/org.apache.sling.api/2.8.0
-bundle mvn:org.apache.sling/org.apache.sling.serviceusermapper/1.0.2
-bundle mvn:org.apache.sling/org.apache.sling.resourceresolver/1.1.12
-bundle mvn:org.apache.sling/org.apache.sling.auth.core/1.3.4
-bundle mvn:org.apache.sling/org.apache.sling.engine/2.3.11-SNAPSHOT
+bundle mvn:org.apache.sling/org.apache.sling.api/2.9.0
+bundle mvn:org.apache.sling/org.apache.sling.serviceusermapper/1.2.0
+bundle mvn:org.apache.sling/org.apache.sling.resourceresolver/1.2.3-SNAPSHOT
+bundle mvn:org.apache.sling/org.apache.sling.auth.core/1.3.6
+bundle mvn:org.apache.sling/org.apache.sling.engine/2.4.0
bundle mvn:org.apache.sling/org.apache.sling.auth.form/1.0.7-SNAPSHOT
bundle mvn:org.apache.sling/org.apache.sling.adapter/2.1.5-SNAPSHOT
bundle mvn:org.apache.sling/org.apache.sling.servlets.resolver/2.3.6
bundle mvn:org.apache.sling/org.apache.sling.servlets.get/2.1.11-SNAPSHOT
bundle mvn:org.apache.sling/org.apache.sling.servlets.post/2.3.7-SNAPSHOT
-bundle mvn:org.apache.sling/org.apache.sling.jcr.contentloader/2.1.10
-bundle mvn:org.apache.sling/org.apache.sling.jcr.resource/2.4.4
+bundle mvn:org.apache.sling/org.apache.sling.jcr.contentloader/2.1.11-SNAPSHOT
+bundle mvn:org.apache.sling/org.apache.sling.jcr.resource/2.5.0
bundle mvn:org.apache.sling/org.apache.sling.jcr.classloader/3.2.2
bundle mvn:org.apache.sling/org.apache.sling.bundleresource.impl/2.2.0
bundle mvn:org.apache.sling/org.apache.sling.fsresource/1.1.4
@@ -45,5 +47,5 @@ bundle mvn:org.apache.sling/org.apache.s
bundle mvn:org.apache.sling/org.apache.sling.models.impl/1.1.1-SNAPSHOT
bundle mvn:org.apache.felix/org.apache.felix.http.whiteboard/2.3.2
bundle mvn:org.apache.sling/org.apache.sling.installer.console/1.0.0
-bundle
mvn:org.apache.sling/org.apache.sling.installer.factory.configuration/1.1.0
-bundle mvn:org.apache.sling/org.apache.sling.installer.provider.jcr/3.1.8
+bundle
mvn:org.apache.sling/org.apache.sling.installer.factory.configuration/1.1.2
+bundle mvn:org.apache.sling/org.apache.sling.installer.provider.jcr/3.1.4
Modified: sling/trunk/contrib/sling-s3/scripts/bundles.rb
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/sling-s3/scripts/bundles.rb?rev=1668959&r1=1668958&r2=1668959&view=diff
==============================================================================
--- sling/trunk/contrib/sling-s3/scripts/bundles.rb (original)
+++ sling/trunk/contrib/sling-s3/scripts/bundles.rb Tue Mar 24 19:08:41 2015
@@ -19,7 +19,7 @@ result.child.element_children.each do |s
groupId = bundle.xpath('./groupId').text
version = bundle.xpath('./version').text
runModes = bundle.xpath('./runModes').text
- next if runModes == 'jackrabbit'
+ next if runModes == 'jackrabbit' or runModes == 'oak_mongo'
f.puts "bundle mvn:#{groupId}/#{artifactId}/#{version}"
end
f.close