You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2016/07/25 07:37:43 UTC
svn commit: r1753956 - in
/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main:
java/org/apache/sling/testing/paxexam/ resources/templates/
Author: olli
Date: Mon Jul 25 07:37:43 2016
New Revision: 1753956
URL: http://svn.apache.org/viewvc?rev=1753956&view=rev
Log:
remove bundle org.apache.felix.http.servlet-api
Modified:
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingVersionResolver.txt
Modified: sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java?rev=1753956&r1=1753955&r2=1753956&view=diff
==============================================================================
--- sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java (original)
+++ sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java Mon Jul 25 07:37:43 2016
@@ -43,8 +43,7 @@ public class SlingOptions {
public static Option http() {
return composite(
- mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.jetty").version(versionResolver),
- mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.servlet-api").version(versionResolver)
+ mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.jetty").version(versionResolver)
);
}
Modified: sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java?rev=1753956&r1=1753955&r2=1753956&view=diff
==============================================================================
--- sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java (original)
+++ sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java Mon Jul 25 07:37:43 2016
@@ -34,7 +34,6 @@ public class SlingVersionResolver implem
versions.put("org.apache.felix:org.apache.felix.configadmin", "1.8.10");
versions.put("org.apache.felix:org.apache.felix.eventadmin", "1.4.6");
versions.put("org.apache.felix:org.apache.felix.http.jetty", "3.2.0");
- versions.put("org.apache.felix:org.apache.felix.http.servlet-api", "1.1.2");
versions.put("org.apache.felix:org.apache.felix.http.whiteboard", "3.0.0");
versions.put("org.apache.aries:org.apache.aries.util", "1.1.1");
versions.put("org.apache.aries.jmx:org.apache.aries.jmx.api", "1.1.5");
Modified: sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt
URL: http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt?rev=1753956&r1=1753955&r2=1753956&view=diff
==============================================================================
--- sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt (original)
+++ sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt Mon Jul 25 07:37:43 2016
@@ -43,8 +43,7 @@ public class SlingOptions {
public static Option http() {
return composite(
- mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.jetty").version(versionResolver),
- mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.servlet-api").version(versionResolver)
+ mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.jetty").version(versionResolver)
);
}
Modified: sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingVersionResolver.txt
URL: http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingVersionResolver.txt?rev=1753956&r1=1753955&r2=1753956&view=diff
==============================================================================
--- sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingVersionResolver.txt (original)
+++ sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingVersionResolver.txt Mon Jul 25 07:37:43 2016
@@ -34,7 +34,6 @@ public class SlingVersionResolver implem
versions.put("org.apache.felix:org.apache.felix.configadmin", "1.8.10");
versions.put("org.apache.felix:org.apache.felix.eventadmin", "1.4.6");
versions.put("org.apache.felix:org.apache.felix.http.jetty", "3.2.0");
- versions.put("org.apache.felix:org.apache.felix.http.servlet-api", "1.1.2");
versions.put("org.apache.felix:org.apache.felix.http.whiteboard", "3.0.0");
versions.put("org.apache.aries:org.apache.aries.util", "1.1.1");
versions.put("org.apache.aries.jmx:org.apache.aries.jmx.api", "1.1.5");