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 2013/05/01 13:19:54 UTC
svn commit: r1477948 - in /sling/trunk/testing/samples/integration-tests:
pom.xml
src/test/java/org/apache/sling/testing/samples/integrationtests/http/OsgiConsoleTest.java
Author: rombert
Date: Wed May 1 11:19:53 2013
New Revision: 1477948
URL: http://svn.apache.org/r1477948
Log:
SLING-2849 : Sample integration tests fail on Java 7
Use the 7-SNAPSHOT version of the launchpad for integration tests since
it supports Java 7. Also removed the /system/console/shell check from
OsgiConsoleTest since it doesn't seem to be included in the launchpad
anymore.
Modified:
sling/trunk/testing/samples/integration-tests/pom.xml
sling/trunk/testing/samples/integration-tests/src/test/java/org/apache/sling/testing/samples/integrationtests/http/OsgiConsoleTest.java
Modified: sling/trunk/testing/samples/integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/samples/integration-tests/pom.xml?rev=1477948&r1=1477947&r2=1477948&view=diff
==============================================================================
--- sling/trunk/testing/samples/integration-tests/pom.xml (original)
+++ sling/trunk/testing/samples/integration-tests/pom.xml Wed May 1 11:19:53 2013
@@ -305,7 +305,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad</artifactId>
<classifier>standalone</classifier>
- <version>6</version>
+ <version>7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: sling/trunk/testing/samples/integration-tests/src/test/java/org/apache/sling/testing/samples/integrationtests/http/OsgiConsoleTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/samples/integration-tests/src/test/java/org/apache/sling/testing/samples/integrationtests/http/OsgiConsoleTest.java?rev=1477948&r1=1477947&r2=1477948&view=diff
==============================================================================
--- sling/trunk/testing/samples/integration-tests/src/test/java/org/apache/sling/testing/samples/integrationtests/http/OsgiConsoleTest.java (original)
+++ sling/trunk/testing/samples/integration-tests/src/test/java/org/apache/sling/testing/samples/integrationtests/http/OsgiConsoleTest.java Wed May 1 11:19:53 2013
@@ -35,8 +35,7 @@ public class OsgiConsoleTest extends Sli
"licenses",
"logs",
"memoryusage",
- "services",
- "shell"
+ "services"
};
for(String subpath : subpaths) {