You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2016/03/13 18:39:52 UTC
svn commit: r1734830 - /sling/trunk/bundles/scripting/sightly/testing/pom.xml
Author: radu
Date: Sun Mar 13 17:39:52 2016
New Revision: 1734830
URL: http://svn.apache.org/viewvc?rev=1734830&view=rev
Log:
trivial: cleaned-up testing pom for Sightly
Modified:
sling/trunk/bundles/scripting/sightly/testing/pom.xml
Modified: sling/trunk/bundles/scripting/sightly/testing/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing/pom.xml?rev=1734830&r1=1734829&r2=1734830&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/testing/pom.xml (original)
+++ sling/trunk/bundles/scripting/sightly/testing/pom.xml Sun Mar 13 17:39:52 2016
@@ -43,8 +43,8 @@
</scm>
<properties>
- <!-- Timeout when checking for Sling readyness before starting tests -->
- <HttpTestBase.readyTimeoutSeconds>62</HttpTestBase.readyTimeoutSeconds>
+ <!-- run modes for integration tests -->
+ <sling.run.modes>oak_tar</sling.run.modes>
<!-- path suffix for HTTP access to Sling -->
<http.base.path/>
@@ -111,7 +111,9 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.19</version>
<!-- Version newer than the one declared in the parent pom -->
<executions>
<execution>
@@ -139,10 +141,7 @@
<io.sightly.tck.serverURL>http://${test.host}:${http.port}</io.sightly.tck.serverURL>
<launchpad.http.server.url>http://${test.host}:${http.port}/</launchpad.http.server.url>
<launchpad.webdav.server.url>http://${test.host}:${http.port}/${webdav.workspace.path}</launchpad.webdav.server.url>
- <HttpTestBase.readyTimeoutSeconds>${HttpTestBase.readyTimeoutSeconds}</HttpTestBase.readyTimeoutSeconds>
-
- <!-- Additional readyness checks, SLING-3235 -->
- <launchpad.ready.1>GET:/index.html:200:.*Welcome to the Sling Launchpad.*</launchpad.ready.1>
+ <launchpad.servlet.context>${http.base.path}</launchpad.servlet.context>
</systemPropertyVariables>
</configuration>
</plugin>
@@ -165,14 +164,11 @@
<server>
<port>${http.port}</port>
<controlPort>${sling.control.port}</controlPort>
- <runmode>oak_tar</runmode>
+ <runmode>${sling.run.modes}</runmode>
<contextPath>${http.base.path}</contextPath>
<debug>${debug.options}</debug>
</server>
</servers>
- <!-- TODO
- <controlHost>${test.host}</controlHost>
- -->
</configuration>
</plugin>
</plugins>
@@ -217,7 +213,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.testing</artifactId>
- <version>2.0.18</version>
+ <version>2.0.22</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>