Author: tomekr
Date: Fri Jun 12 19:40:35 2015
New Revision: 1685149
URL: http://svn.apache.org/r1685149
Log:
SLING-4502 Aligned bundle versions to the latest launchpad
Modified:
sling/trunk/contrib/sling-s3/crank.d/50-provisioning-boot.txt
sling/trunk/contrib/sling-s3/crank.d/60-provisioning-sling.txt
sling/trunk/contrib/sling-s3/crank.d/70-provisioning-oak.txt
sling/trunk/contrib/sling-s3/scripts/bundles.rb
Modified: sling/trunk/contrib/sling-s3/crank.d/50-provisioning-boot.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/sling-s3/crank.d/50-provisioning-boot.txt?rev=1685149&r1=1685148&r2=1685149&view=diff
==============================================================================
--- sling/trunk/contrib/sling-s3/crank.d/50-provisioning-boot.txt (original)
+++ sling/trunk/contrib/sling-s3/crank.d/50-provisioning-boot.txt Fri Jun 12
19:40:35 2015
@@ -10,8 +10,9 @@ bundle mvn:org.apache.sling/org.apache.s
bundle mvn:org.apache.sling/org.apache.sling.javax.activation/0.1.0
bundle mvn:org.apache.sling/org.apache.sling.fragment.ws/1.0.2
bundle mvn:org.apache.sling/org.apache.sling.launchpad.installer/1.2.2
-bundle mvn:org.apache.sling/org.apache.sling.installer.core/3.6.2
-bundle mvn:org.apache.sling/org.apache.sling.installer.provider.file/1.0.4
-bundle mvn:org.apache.felix/org.apache.felix.configadmin/1.8.2
+bundle mvn:org.apache.sling/org.apache.sling.installer.core/3.6.4
+bundle mvn:org.apache.sling/org.apache.sling.installer.provider.file/1.1.0
+bundle mvn:org.apache.felix/org.apache.felix.configadmin/1.8.4
bundle mvn:org.apache.felix/org.apache.felix.eventadmin/1.4.2
+bundle mvn:org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.0
Modified: sling/trunk/contrib/sling-s3/crank.d/60-provisioning-sling.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/sling-s3/crank.d/60-provisioning-sling.txt?rev=1685149&r1=1685148&r2=1685149&view=diff
==============================================================================
--- sling/trunk/contrib/sling-s3/crank.d/60-provisioning-sling.txt (original)
+++ sling/trunk/contrib/sling-s3/crank.d/60-provisioning-sling.txt Fri Jun 12
19:40:35 2015
@@ -13,6 +13,7 @@ bundle mvn:org.apache.sling/org.apache.s
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.6
bundle mvn:org.apache.sling/org.apache.sling.commons.threads/3.2.0
+bundle
mvn:org.apache.sling/org.apache.sling.commons.fsclassloader/1.0.1-SNAPSHOT
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.1.0
@@ -22,23 +23,28 @@ bundle mvn:org.apache.sling/org.apache.s
bundle mvn:org.apache.sling/org.apache.sling.serviceusermapper/1.2.0
bundle mvn:org.apache.sling/org.apache.sling.resourceresolver/1.2.5-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.engine/2.4.2
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.resolver/2.3.7-SNAPSHOT
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.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
bundle mvn:org.apache.sling/org.apache.sling.launchpad.content/2.0.8
bundle mvn:org.apache.sling/org.apache.sling.scripting.api/2.1.6
bundle mvn:org.apache.sling/org.apache.sling.scripting.core/2.0.28
bundle mvn:org.apache.sling/org.apache.sling.scripting.javascript/2.0.14
-bundle mvn:org.apache.sling/org.apache.sling.scripting.jsp/2.1.4
+bundle mvn:org.apache.sling/org.apache.sling.scripting.jsp/2.1.6
bundle mvn:org.apache.sling/org.apache.sling.scripting.jsp.taglib/2.2.4
+bundle mvn:org.apache.sling/org.apache.sling.i18n/2.4.3-SNAPSHOT
+bundle mvn:javax.mail/mail/1.4.7
+bundle mvn:org.apache.sling/org.apache.sling.xss/1.0.3-SNAPSHOT
+bundle mvn:org.apache.sling/org.apache.sling.scripting.sightly/1.0.3-SNAPSHOT
+bundle
mvn:org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.5-SNAPSHOT
+bundle
mvn:org.apache.sling/org.apache.sling.scripting.sightly.repl/1.0.1-SNAPSHOT
bundle mvn:org.apache.geronimo.bundles/jstl/1.2_1
bundle mvn:org.apache.sling/org.apache.sling.models.api/1.1.1-SNAPSHOT
bundle mvn:org.apache.sling/org.apache.sling.models.impl/1.1.1-SNAPSHOT
@@ -71,7 +77,7 @@ bundle mvn:org.apache.aries.jmx/org.apac
defaults crankstart.bundle.start.level 10
bundle mvn:org.apache.felix/org.apache.felix.scr/1.8.2
-bundle mvn:org.apache.felix/org.apache.felix.metatype/1.0.10
+bundle mvn:org.apache.felix/org.apache.felix.metatype/1.0.12
bundle mvn:org.apache.tika/tika-core/1.2
bundle mvn:org.apache.tika/tika-bundle/1.2
@@ -81,12 +87,12 @@ bundle mvn:org.apache.sling/org.apache.s
bundle mvn:org.apache.sling/org.apache.sling.jcr.api/2.2.0
bundle mvn:org.apache.sling/org.apache.sling.jcr.base/2.2.2
bundle mvn:org.apache.sling/org.apache.sling.jcr.registration/1.0.2
-bundle mvn:org.apache.jackrabbit/jackrabbit-api/2.10.0
-bundle mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/2.10.0
-bundle mvn:org.apache.jackrabbit/jackrabbit-spi/2.10.0
-bundle mvn:org.apache.jackrabbit/jackrabbit-spi-commons/2.10.0
-bundle mvn:org.apache.jackrabbit/jackrabbit-webdav/2.10.0
-bundle mvn:org.apache.jackrabbit/jackrabbit-jcr-rmi/2.10.0
+bundle mvn:org.apache.jackrabbit/jackrabbit-api/2.10.1
+bundle mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/2.10.1
+bundle mvn:org.apache.jackrabbit/jackrabbit-spi/2.10.1
+bundle mvn:org.apache.jackrabbit/jackrabbit-spi-commons/2.10.1
+bundle mvn:org.apache.jackrabbit/jackrabbit-webdav/2.10.1
+bundle mvn:org.apache.jackrabbit/jackrabbit-jcr-rmi/2.10.1
bundle mvn:org.apache.sling/org.apache.sling.jcr.webdav/2.2.2
bundle mvn:org.apache.sling/org.apache.sling.jcr.davex/1.2.2
bundle
mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.3-SNAPSHOT
Modified: sling/trunk/contrib/sling-s3/crank.d/70-provisioning-oak.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/sling-s3/crank.d/70-provisioning-oak.txt?rev=1685149&r1=1685148&r2=1685149&view=diff
==============================================================================
--- sling/trunk/contrib/sling-s3/crank.d/70-provisioning-oak.txt (original)
+++ sling/trunk/contrib/sling-s3/crank.d/70-provisioning-oak.txt Fri Jun 12
19:40:35 2015
@@ -1,4 +1,4 @@
-defaults oak.version 1.2.0
+defaults oak.version 1.2.2
defaults crankstart.bundle.start.level 10
bundle mvn:org.apache.felix/org.apache.felix.jaas/0.0.2
Modified: sling/trunk/contrib/sling-s3/scripts/bundles.rb
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/sling-s3/scripts/bundles.rb?rev=1685149&r1=1685148&r2=1685149&view=diff
==============================================================================
--- sling/trunk/contrib/sling-s3/scripts/bundles.rb (original)
+++ sling/trunk/contrib/sling-s3/scripts/bundles.rb Fri Jun 12 19:40:35 2015
@@ -8,7 +8,7 @@ def parse_bundle_list name
section = nil
open(url).each_line do |line|
next if line.strip.empty?
- next if line =~ /^#/
+ next if line =~ /^\s*#/
if line =~ /^\[([^ ]+) ?(.*)\]$/
name = $1
attributes = {}
