Author: rombert
Date: Tue Jul 9 16:01:32 2013
New Revision: 1501355
URL: http://svn.apache.org/r1501355
Log:
SLING-2852 - Sling Launchpad Testing WAR - ClassCircularityError when
executed in a reactor
pom.xml cleanups:
- remove unused maven-jetty-plugin
- remove plugin version overrides ( newer versions are inherited )
- use non-deprecated configuration syntax for the cargo-maven2-plugin
Modified:
sling/trunk/launchpad/testing-war/pom.xml
Modified: sling/trunk/launchpad/testing-war/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/testing-war/pom.xml?rev=1501355&r1=1501354&r2=1501355&view=diff
==============================================================================
--- sling/trunk/launchpad/testing-war/pom.xml (original)
+++ sling/trunk/launchpad/testing-war/pom.xml Tue Jul 9 16:01:32 2013
@@ -95,7 +95,6 @@
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.2</version>
<configuration>
<filesets>
<fileset>
@@ -148,39 +147,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <configuration>
- <contextPath>/${http.base.path}</contextPath>
- <scanIntervalSeconds>
- ${jetty.scan.interval.seconds}
- </scanIntervalSeconds>
-
- <systemProperties>
- <systemProperty>
- <name>test.sling.home</name>
- <value>${jetty.sling.home}</value>
- </systemProperty>
- </systemProperties>
-
- <connectors>
- <connector
implementation="org.mortbay.jetty.nio.SelectChannelConnector">
- <port>${jetty.http.port}</port>
- <maxIdleTime>60000</maxIdleTime>
- </connector>
- </connectors>
-
- <!--
- Use target/... as the webapp source, as we unpack
stuff there from the
- Sling launcher modules
- -->
- <webAppSourceDirectory>
- target/${project.artifactId}-${project.version}
- </webAppSourceDirectory>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-launchpad-plugin</artifactId>
<version>2.1.2</version>
@@ -284,6 +250,13 @@
</test.sling.home>
</systemProperties>
</container>
+ <deployables>
+ <deployable>
+ <properties>
+ <context>/${http.base.path}</context>
+ </properties>
+ </deployable>
+ </deployables>
<configuration>
<home>${project.build.directory}/cargo</home>
<properties>
@@ -294,13 +267,6 @@
<cargo.jvmargs>-Xdebug -Xnoagent
-Xrunjdwp:transport=dt_socket,address=30333,server=y,suspend=y</cargo.jvmargs>
-->
</properties>
- <deployables>
- <deployable>
- <properties>
- <context>/${http.base.path}</context>
- </properties>
- </deployable>
- </deployables>
</configuration>
</configuration>
</plugin>
