svn commit: r1741568 - /sling/trunk/bundles/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/it/U.java

[olli]

Author: olli
Date: Fri Apr 29 08:08:26 2016
New Revision: 1741568

URL: http://svn.apache.org/viewvc?rev=1741568&view=rev
Log:
SLING-5623 Use javax.servlet-api instead of org.apache.felix.http.servlet-api

Modified:
    
sling/trunk/bundles/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/it/U.java

Modified: 
sling/trunk/bundles/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/it/U.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/it/U.java?rev=1741568&r1=1741567&r2=1741568&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/it/U.java
 (original)
+++ 
sling/trunk/bundles/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/it/U.java
 Fri Apr 29 08:08:26 2016
@@ -98,9 +98,9 @@ public class U {
             ),
             provision(
                     CoreOptions.bundle(bundleFile.toURI().toString()),
+                    
mavenBundle().groupId("javax.servlet").artifactId("javax.servlet-api").versionAsInProject(),
                     mavenBundle("org.apache.felix", "org.apache.felix.scr", 
"1.6.2"),
                     mavenBundle("org.apache.felix", 
"org.apache.felix.configadmin", "1.8.8"),
-                    mavenBundle("org.apache.felix", 
"org.apache.felix.http.servlet-api", "1.1.0"),
                     mavenBundle("org.apache.sling", 
"org.apache.sling.commons.osgi", "2.2.0"),
                     mavenBundle("org.apache.sling", 
"org.apache.sling.commons.json", "2.0.10"),
                     mavenBundle("org.apache.sling", 
"org.apache.sling.jcr.jcr-wrapper", "2.0.0"),
@@ -117,8 +117,7 @@ public class U {
                     mavenBundle("commons-collections", "commons-collections", 
"3.2.1"),
                     
mavenBundle().groupId("commons-io").artifactId("commons-io").versionAsInProject(),
                     mavenBundle("commons-fileupload", "commons-fileupload", 
"1.2.2"),
-                    
mavenBundle().groupId("org.apache.commons").artifactId("commons-lang3").versionAsInProject(),
-                    mavenBundle("org.mortbay.jetty", "servlet-api-2.5", 
"6.1.14")
+                    
mavenBundle().groupId("org.apache.commons").artifactId("commons-lang3").versionAsInProject()
             )
         );
     }