This is an automated email from the ASF dual-hosted git repository. joerghoh pushed a commit to branch SLING-12591 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git
commit af46a984f43ab1f8ddfc0e3179b8c1ca14e101c7 Author: Joerg Hoh <[email protected]> AuthorDate: Thu Dec 19 20:34:35 2024 +0100 update paxexam --- pom.xml | 4 ++-- .../sling/servlets/resolver/it/ServletResourceIT.java | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 5c65396..478a036 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ <sling.java.version>11</sling.java.version> <project.build.outputTimestamp>2024-12-19T15:10:18Z</project.build.outputTimestamp> <site.jira.version.id>12314292</site.jira.version.id> - <org.ops4j.pax.exam.version>4.13.3</org.ops4j.pax.exam.version> + <org.ops4j.pax.exam.version>4.14.0</org.ops4j.pax.exam.version> <!-- To debug the pax process, override this with -D --> <pax.vm.options>-Xmx512M</pax.vm.options> </properties> @@ -182,7 +182,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.testing.paxexam</artifactId> - <version>3.1.0</version> + <version>4.0.1-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> diff --git a/src/test/java/org/apache/sling/servlets/resolver/it/ServletResourceIT.java b/src/test/java/org/apache/sling/servlets/resolver/it/ServletResourceIT.java index 73d56ad..38279a1 100644 --- a/src/test/java/org/apache/sling/servlets/resolver/it/ServletResourceIT.java +++ b/src/test/java/org/apache/sling/servlets/resolver/it/ServletResourceIT.java @@ -25,11 +25,12 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; -import java.io.FileNotFoundException; +import java.io.IOException; import java.util.Dictionary; import java.util.Hashtable; import java.util.LinkedHashSet; import java.util.Set; +import java.util.jar.JarInputStream; import org.apache.sling.api.resource.LoginException; import org.apache.sling.api.resource.Resource; @@ -48,8 +49,8 @@ import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerClass; -import org.ops4j.pax.tinybundles.core.TinyBundle; -import org.ops4j.pax.tinybundles.core.TinyBundles; +import org.ops4j.pax.tinybundles.TinyBundle; +import org.ops4j.pax.tinybundles.TinyBundles; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -71,11 +72,12 @@ public class ServletResourceIT extends ServletResolverTestSupport { protected Option testBundle() { try { - TinyBundle bundle = TinyBundles.bundle().read(new FileInputStream(System.getProperty("bundle.filename"))); + TinyBundle bundle = TinyBundles.bundle() + .readIn(new JarInputStream(new FileInputStream(System.getProperty("bundle.filename")))); String header = bundle.getHeader("Export-Package"); - bundle.set("Export-Package", header + ",org.apache.sling.servlets.resolver.internal.bundle"); + bundle.setHeader("Export-Package", header + ",org.apache.sling.servlets.resolver.internal.bundle"); return streamBundle(bundle.build()).start(); - } catch (FileNotFoundException e) { + } catch (IOException e) { throw new RuntimeException(e); } }
