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 2017/11/07 10:19:51 UTC
[sling-org-apache-sling-testing-paxexam] 11/48: remove bundle
org.apache.felix.http.servlet-api
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.paxexam-0.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git
commit 1bad247c973646776f49cdb8c054edbaa1a41c1f
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Jul 25 07:37:43 2016 +0000
remove bundle org.apache.felix.http.servlet-api
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1753956 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java | 3 +--
.../java/org/apache/sling/testing/paxexam/SlingVersionResolver.java | 1 -
src/main/resources/templates/SlingOptions.txt | 3 +--
src/main/resources/templates/SlingVersionResolver.txt | 1 -
4 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
index 972966b..fe03ca7 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -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)
);
}
diff --git a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
index fdc350b..4b2da3b 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -34,7 +34,6 @@ public class SlingVersionResolver implements VersionResolver {
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");
diff --git a/src/main/resources/templates/SlingOptions.txt b/src/main/resources/templates/SlingOptions.txt
index 6acb9dc..5da283b 100644
--- a/src/main/resources/templates/SlingOptions.txt
+++ b/src/main/resources/templates/SlingOptions.txt
@@ -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)
);
}
diff --git a/src/main/resources/templates/SlingVersionResolver.txt b/src/main/resources/templates/SlingVersionResolver.txt
index 0b586a3..7732b80 100644
--- a/src/main/resources/templates/SlingVersionResolver.txt
+++ b/src/main/resources/templates/SlingVersionResolver.txt
@@ -34,7 +34,6 @@ public class SlingVersionResolver implements VersionResolver {
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");
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.