You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2015/10/16 16:32:24 UTC
svn commit: r1709016 - in /sling/trunk:
bundles/scripting/sightly/testing/src/main/provisioning/
contrib/crankstart/launcher/src/test/resources/
contrib/extensions/bgservlets/testing/src/main/provisioning/
contrib/launchpad/debian/ contrib/launchpad/te...
Author: rombert
Date: Fri Oct 16 14:32:23 2015
New Revision: 1709016
URL: http://svn.apache.org/viewvc?rev=1709016&view=rev
Log:
SLING-5144: Update local launchpad references to 8 or 9-SNAPSHOT
Modified:
sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt
sling/trunk/contrib/crankstart/launcher/src/test/resources/sling-launchpad.txt
sling/trunk/contrib/extensions/bgservlets/testing/src/main/provisioning/test-model.txt
sling/trunk/contrib/launchpad/debian/pom.xml
sling/trunk/contrib/launchpad/testing/src/main/provisioning/model.txt
sling/trunk/contrib/nosql/launchpad/pom.xml
sling/trunk/testing/samples/integration-tests/pom.xml
Modified: sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt?rev=1709016&r1=1709015&r2=1709016&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt (original)
+++ sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt Fri Oct 16 14:32:23 2015
@@ -19,7 +19,7 @@
[feature name=sling]
# Dependencies
[artifacts]
- org.apache.sling/org.apache.sling.launchpad/8-SNAPSHOT/slingstart
+ org.apache.sling/org.apache.sling.launchpad/8/slingstart
org.apache.sling/org.apache.sling.scripting.sightly/1.0.7-SNAPSHOT
org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.11-SNAPSHOT
org.apache.sling/org.apache.sling.scripting.sightly.models.provider/1.0.1-SNAPSHOT
Modified: sling/trunk/contrib/crankstart/launcher/src/test/resources/sling-launchpad.txt
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/crankstart/launcher/src/test/resources/sling-launchpad.txt?rev=1709016&r1=1709015&r2=1709016&view=diff
==============================================================================
--- sling/trunk/contrib/crankstart/launcher/src/test/resources/sling-launchpad.txt (original)
+++ sling/trunk/contrib/crankstart/launcher/src/test/resources/sling-launchpad.txt Fri Oct 16 14:32:23 2015
@@ -40,7 +40,7 @@
org.apache.sling/org.apache.sling.launchpad.api/1.1.0
# The launchpad itself
- org.apache.sling/org.apache.sling.launchpad/8-SNAPSHOT/txt/slingfeature
+ org.apache.sling/org.apache.sling.launchpad/8/txt/slingfeature
# Sling integration tests support
# TODO problem with the test-service bundles with 2 run modes
Modified: sling/trunk/contrib/extensions/bgservlets/testing/src/main/provisioning/test-model.txt
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/bgservlets/testing/src/main/provisioning/test-model.txt?rev=1709016&r1=1709015&r2=1709016&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/bgservlets/testing/src/main/provisioning/test-model.txt (original)
+++ sling/trunk/contrib/extensions/bgservlets/testing/src/main/provisioning/test-model.txt Fri Oct 16 14:32:23 2015
@@ -19,7 +19,7 @@
[feature name=launchpad-testing]
# Dependencies
[artifacts]
- org.apache.sling/org.apache.sling.launchpad/8-SNAPSHOT/slingstart
+ org.apache.sling/org.apache.sling.launchpad/8/slingstart
org.apache.sling/org.apache.sling.bgservlets/1.0.1-SNAPSHOT
# additional configuration for testing
Modified: sling/trunk/contrib/launchpad/debian/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/debian/pom.xml?rev=1709016&r1=1709015&r2=1709016&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/debian/pom.xml (original)
+++ sling/trunk/contrib/launchpad/debian/pom.xml Fri Oct 16 14:32:23 2015
@@ -30,7 +30,7 @@ under the License.
</parent>
<artifactId>sling-server</artifactId>
<packaging>jar</packaging>
- <version>8-SNAPSHOT</version>
+ <version>9-SNAPSHOT</version>
<name>Apache Sling Launchpad Debian Package Builder</name>
<description>
Simple packaged installation for sling launchpad standalone jar
@@ -46,7 +46,7 @@ under the License.
jdeb plugin version for debian package
-->
<jdeb.version>1.4</jdeb.version>
- <launchpad.version>8-SNAPSHOT</launchpad.version>
+ <launchpad.version>9-SNAPSHOT</launchpad.version>
<slingInstallDir>/opt/sling</slingInstallDir>
<slingConfigDir>/etc/sling</slingConfigDir>
</properties>
Modified: sling/trunk/contrib/launchpad/testing/src/main/provisioning/model.txt
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/testing/src/main/provisioning/model.txt?rev=1709016&r1=1709015&r2=1709016&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/testing/src/main/provisioning/model.txt (original)
+++ sling/trunk/contrib/launchpad/testing/src/main/provisioning/model.txt Fri Oct 16 14:32:23 2015
@@ -19,7 +19,7 @@
[feature name=launchpad-testing]
# Dependencies
[artifacts]
- org.apache.sling/org.apache.sling.launchpad/8-SNAPSHOT/slingstart
+ org.apache.sling/org.apache.sling.launchpad/8/slingstart
org.apache.sling/org.apache.sling.launchpad.test-bundles/0.0.1-SNAPSHOT/slingfeature
# Auth
Modified: sling/trunk/contrib/nosql/launchpad/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/nosql/launchpad/pom.xml?rev=1709016&r1=1709015&r2=1709016&view=diff
==============================================================================
--- sling/trunk/contrib/nosql/launchpad/pom.xml (original)
+++ sling/trunk/contrib/nosql/launchpad/pom.xml Fri Oct 16 14:32:23 2015
@@ -51,7 +51,7 @@
<artifactId>org.apache.sling.launchpad</artifactId>
<type>slingfeature</type>
<classifier>slingfeature</classifier>
- <version>8-SNAPSHOT</version>
+ <version>8</version>
<scope>provided</scope>
</dependency>
Modified: sling/trunk/testing/samples/integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/samples/integration-tests/pom.xml?rev=1709016&r1=1709015&r2=1709016&view=diff
==============================================================================
--- sling/trunk/testing/samples/integration-tests/pom.xml (original)
+++ sling/trunk/testing/samples/integration-tests/pom.xml Fri Oct 16 14:32:23 2015
@@ -336,7 +336,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad</artifactId>
- <version>8-SNAPSHOT</version>
+ <version>8</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>