You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2016/05/23 13:01:18 UTC
svn commit: r1745184 - in /sling/trunk: launchpad/test-bundles/pom.xml
launchpad/test-bundles/src/main/provisioning/bundles.txt
launchpad/testing-war/pom.xml launchpad/testing/pom.xml pom.xml
Author: bdelacretaz
Date: Mon May 23 13:01:18 2016
New Revision: 1745184
URL: http://svn.apache.org/viewvc?rev=1745184&view=rev
Log:
Use the same version of slingstart-maven-plugin everywhere specified - for some reason 1.2.0 was 'leaking' into the full build
Modified:
sling/trunk/launchpad/test-bundles/pom.xml
sling/trunk/launchpad/test-bundles/src/main/provisioning/bundles.txt
sling/trunk/launchpad/testing-war/pom.xml
sling/trunk/launchpad/testing/pom.xml
sling/trunk/pom.xml
Modified: sling/trunk/launchpad/test-bundles/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-bundles/pom.xml?rev=1745184&r1=1745183&r2=1745184&view=diff
==============================================================================
--- sling/trunk/launchpad/test-bundles/pom.xml (original)
+++ sling/trunk/launchpad/test-bundles/pom.xml Mon May 23 13:01:18 2016
@@ -39,7 +39,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>slingstart-maven-plugin</artifactId>
- <version>1.2.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
</plugin>
</plugins>
Modified: sling/trunk/launchpad/test-bundles/src/main/provisioning/bundles.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-bundles/src/main/provisioning/bundles.txt?rev=1745184&r1=1745183&r2=1745184&view=diff
==============================================================================
--- sling/trunk/launchpad/test-bundles/src/main/provisioning/bundles.txt (original)
+++ sling/trunk/launchpad/test-bundles/src/main/provisioning/bundles.txt Mon May 23 13:01:18 2016
@@ -28,6 +28,9 @@
org.apache.sling/org.apache.sling.junit.scriptable/1.0.11-SNAPSHOT
org.apache.sling/org.apache.sling.launchpad.test-fragment/2.0.9-SNAPSHOT
+[artifacts startLevel=2]
+ org.apache.sling/org.apache.sling.provisioning.model/1.4.2
+
[artifacts startLevel=5]
org.apache.sling/org.apache.sling.launchpad.test-services-war/2.0.8/war
org.apache.sling/org.apache.sling.launchpad.test-services/2.0.8
Modified: sling/trunk/launchpad/testing-war/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing-war/pom.xml?rev=1745184&r1=1745183&r2=1745184&view=diff
==============================================================================
--- sling/trunk/launchpad/testing-war/pom.xml (original)
+++ sling/trunk/launchpad/testing-war/pom.xml Mon May 23 13:01:18 2016
@@ -103,7 +103,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>slingstart-maven-plugin</artifactId>
- <version>1.2.0</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<configuration>
<createWebapp>true</createWebapp>
Modified: sling/trunk/launchpad/testing/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/pom.xml?rev=1745184&r1=1745183&r2=1745184&view=diff
==============================================================================
--- sling/trunk/launchpad/testing/pom.xml (original)
+++ sling/trunk/launchpad/testing/pom.xml Mon May 23 13:01:18 2016
@@ -93,7 +93,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>slingstart-maven-plugin</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.2</version>
<extensions>true</extensions>
<executions>
<execution>
Modified: sling/trunk/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/pom.xml?rev=1745184&r1=1745183&r2=1745184&view=diff
==============================================================================
--- sling/trunk/pom.xml (original)
+++ sling/trunk/pom.xml Mon May 23 13:01:18 2016
@@ -188,10 +188,7 @@
<module>bundles/extensions/xss</module>
<module>bundles/extensions/resourcebuilder</module>
<module>bundles/extensions/servlet-helpers</module>
-<!-- TODO re-enable after fixing slingstart plugin dependency issue: build
- works from the repoinit folder but not from the top
<module>bundles/extensions/repoinit</module>
--->
<!-- Testing Support -->
<module>testing</module>