Author: bdelacretaz
Date: Mon Jul 1 16:25:34 2013
New Revision: 1498549
URL: http://svn.apache.org/r1498549
Log:
SLING-2938 - do not start Felix HTTP service in integration tests
Modified:
sling/whiteboard/bdelacretaz/adapter-methods/extensions-adapter/src/test/java/org/apache/sling/adapter/internal/AdapterMethodManagerIT.java
Modified:
sling/whiteboard/bdelacretaz/adapter-methods/extensions-adapter/src/test/java/org/apache/sling/adapter/internal/AdapterMethodManagerIT.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/bdelacretaz/adapter-methods/extensions-adapter/src/test/java/org/apache/sling/adapter/internal/AdapterMethodManagerIT.java?rev=1498549&r1=1498548&r2=1498549&view=diff
==============================================================================
---
sling/whiteboard/bdelacretaz/adapter-methods/extensions-adapter/src/test/java/org/apache/sling/adapter/internal/AdapterMethodManagerIT.java
(original)
+++
sling/whiteboard/bdelacretaz/adapter-methods/extensions-adapter/src/test/java/org/apache/sling/adapter/internal/AdapterMethodManagerIT.java
Mon Jul 1 16:25:34 2013
@@ -130,10 +130,10 @@ public class AdapterMethodManagerIT {
mavenBundle("org.apache.felix",
"org.apache.felix.scr", "1.6.0"),
mavenBundle("org.apache.felix",
"org.apache.felix.configadmin", "1.2.8"),
mavenBundle("org.apache.felix",
"org.apache.felix.metatype", "1.0.2"),
- mavenBundle("org.apache.felix",
"org.apache.felix.http.jetty", "2.2.0"),
mavenBundle("commons-io", "commons-io", "1.4"),
mavenBundle("commons-lang", "commons-lang", "2.5"),
mavenBundle("javax.jcr", "jcr", "2.0"),
+ mavenBundle("javax.servlet", "javax.servlet-api",
"3.0.1"),
// TODO use newer API bundle when released
mavenBundle("org.apache.sling",
"org.apache.sling.api", "2.4.3-SNAPSHOT"),
