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 39abdbc4e5763b38229211325855133a3945c00e Author: Oliver Lietz <[email protected]> AuthorDate: Mon Jul 25 14:34:08 2016 +0000 revert r1753956 (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@1754021 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, 6 insertions(+), 2 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 3d6c1cc..77018de 100644 --- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java +++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java @@ -43,7 +43,8 @@ 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.jetty").version(versionResolver), + mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.servlet-api").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 2ea7ec2..503790c 100644 --- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java +++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java @@ -34,6 +34,7 @@ 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.2"); + 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 05bda2f..4e129de 100644 --- a/src/main/resources/templates/SlingOptions.txt +++ b/src/main/resources/templates/SlingOptions.txt @@ -43,7 +43,8 @@ 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.jetty").version(versionResolver), + mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.servlet-api").version(versionResolver) ); } diff --git a/src/main/resources/templates/SlingVersionResolver.txt b/src/main/resources/templates/SlingVersionResolver.txt index 5576b02..cce7721 100644 --- a/src/main/resources/templates/SlingVersionResolver.txt +++ b/src/main/resources/templates/SlingVersionResolver.txt @@ -34,6 +34,7 @@ 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.2"); + 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 "[email protected]" <[email protected]>.
