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 2020/03/05 07:13:32 UTC
[sling-org-apache-sling-servlets-resolver] 02/02: do not wrap
bundle org.apache.sling.servlet-helpers
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git
commit 7cdc673d52754e672afab858c5f88afb1dfad292
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Mar 5 08:11:51 2020 +0100
do not wrap bundle org.apache.sling.servlet-helpers
---
pom.xml | 6 ------
.../sling/servlets/resolver/it/ServletResolverTestSupport.java | 3 +--
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index ab8f1f2..00377da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -270,12 +270,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-wrap</artifactId>
- <version>2.6.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.paxexam</artifactId>
<version>3.1.0</version>
diff --git a/src/test/java/org/apache/sling/servlets/resolver/it/ServletResolverTestSupport.java b/src/test/java/org/apache/sling/servlets/resolver/it/ServletResolverTestSupport.java
index a090692..b805b47 100644
--- a/src/test/java/org/apache/sling/servlets/resolver/it/ServletResolverTestSupport.java
+++ b/src/test/java/org/apache/sling/servlets/resolver/it/ServletResolverTestSupport.java
@@ -49,7 +49,6 @@ import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.vmOption;
import static org.ops4j.pax.exam.CoreOptions.when;
-import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.newConfiguration;
public class ServletResolverTestSupport extends TestSupport {
@@ -88,7 +87,7 @@ public class ServletResolverTestSupport extends TestSupport {
slingQuickstart(),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.converter").version("1.0.12"), // new Sling API dependency
testBundle("bundle.filename"),
- wrappedBundle(mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.servlet-helpers").versionAsInProject()),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.servlet-helpers").versionAsInProject(),
junitBundles(),
newConfiguration("org.apache.sling.jcr.base.internal.LoginAdminWhitelist")
.put("whitelist.bundles.regexp", "^PAXEXAM.*$")