You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2015/04/09 17:38:05 UTC
svn commit: r1672400 - /sling/trunk/launchpad/testing/pom.xml
Author: cziegeler
Date: Thu Apr 9 15:38:05 2015
New Revision: 1672400
URL: http://svn.apache.org/r1672400
Log:
SLING-4598 : Migrate launchpad testing to provisioning model
Modified:
sling/trunk/launchpad/testing/pom.xml
Modified: sling/trunk/launchpad/testing/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/pom.xml?rev=1672400&r1=1672399&r2=1672400&view=diff
==============================================================================
--- sling/trunk/launchpad/testing/pom.xml (original)
+++ sling/trunk/launchpad/testing/pom.xml Thu Apr 9 15:38:05 2015
@@ -77,8 +77,8 @@
<resources.bundles.path>${project.build.directory}/launchpad-bundles/resources/bundles</resources.bundles.path>
- <slf4j.version>1.5.11</slf4j.version>
- <logback.version>0.9.20</logback.version>
+ <slf4j.version>1.7.6</slf4j.version>
+ <logback.version>1.1.2</logback.version>
</properties>
<build>
@@ -192,12 +192,14 @@
<systemPropertyVariables>
<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 and SLING-4261 -->
+ -->
+ <!-- Additional readyness checks, SLING-3235 and SLING-4261
<launchpad.ready.1>GET:/system/console/status-Configurations/configuration-status-20131115-101714.txt:200:config.comment.*setup the JSP engine for running tests</launchpad.ready.1>
<launchpad.ready.2>GET:/.EXPORTED_PACKAGES.txt?package=org.apache.sling.api:200:PACKAGE FOUND.*org.apache.sling.api</launchpad.ready.2>
<launchpad.ready.3>GET:/system/sling/junit/org.apache.sling.launchpad.testservices.serversidetests.WriteableResourcesTest.json:200:WriteableResourcesTest</launchpad.ready.3>
+ -->
</systemPropertyVariables>
</configuration>
</plugin>
@@ -214,9 +216,15 @@
</execution>
</executions>
<configuration>
- <httpPort>${http.port}</httpPort>
+ <servers>
+ <server>
+ <port>${http.port}</port>
+ </server>
+ </servers>
+ <!-- TODO
<controlHost>${test.host}</controlHost>
<controlPort>${sling.control.port}</controlPort>
+ -->
</configuration>
</plugin>
</plugins>