This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch feature/SLING-13120-java-21-compatibility in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-pipes.git
commit c31729f1c30bbcb2170df32ffe5bc5f89e3771ad Author: Stefan Seifert <[email protected]> AuthorDate: Thu Feb 19 11:55:37 2026 +0100 update paxexam --- pom.xml | 6 ++-- .../apache/sling/pipes/it/PipesTestSupport.java | 37 +++++++++++----------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index c472ee6..94ee5f5 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ <properties> <project.build.outputTimestamp>1660725790</project.build.outputTimestamp> <sling.java.version>11</sling.java.version> - <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> <oak.version>1.68.0</oak.version> <jackrabbit.version>2.22.2</jackrabbit.version> </properties> @@ -375,7 +375,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.testing.paxexam</artifactId> - <version>3.1.0</version> + <version>4.1.2</version> <scope>test</scope> </dependency> <dependency> @@ -399,7 +399,7 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.framework</artifactId> - <version>6.0.3</version> + <version>7.0.5</version> <scope>test</scope> </dependency> <dependency> diff --git a/src/test/java/org/apache/sling/pipes/it/PipesTestSupport.java b/src/test/java/org/apache/sling/pipes/it/PipesTestSupport.java index 0f218b6..f35f6c9 100644 --- a/src/test/java/org/apache/sling/pipes/it/PipesTestSupport.java +++ b/src/test/java/org/apache/sling/pipes/it/PipesTestSupport.java @@ -18,6 +18,22 @@ */ package org.apache.sling.pipes.it; +import static org.apache.sling.testing.paxexam.SlingOptions.slingCaconfig; +import static org.apache.sling.testing.paxexam.SlingOptions.slingCommonsHtml; +import static org.apache.sling.testing.paxexam.SlingOptions.slingDistribution; +import static org.apache.sling.testing.paxexam.SlingOptions.slingEvent; +import static org.apache.sling.testing.paxexam.SlingOptions.slingQuery; +import static org.apache.sling.testing.paxexam.SlingOptions.slingQuickstartOakTar; +import static org.apache.sling.testing.paxexam.SlingOptions.slingResourcePresence; +import static org.apache.sling.testing.paxexam.SlingOptions.slingScriptingHtl; +import static org.apache.sling.testing.paxexam.SlingOptions.versionResolver; +import static org.ops4j.pax.exam.CoreOptions.composite; +import static org.ops4j.pax.exam.CoreOptions.junitBundles; +import static org.ops4j.pax.exam.CoreOptions.mavenBundle; +import static org.ops4j.pax.exam.CoreOptions.options; +import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfiguration; +import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.newConfiguration; + import javax.inject.Inject; import javax.servlet.Servlet; @@ -35,22 +51,6 @@ import org.ops4j.pax.exam.ProbeBuilder; import org.ops4j.pax.exam.TestProbeBuilder; import org.ops4j.pax.exam.util.Filter; -import static org.apache.sling.testing.paxexam.SlingOptions.slingCaconfig; -import static org.apache.sling.testing.paxexam.SlingOptions.slingCommonsHtml; -import static org.apache.sling.testing.paxexam.SlingOptions.slingDistribution; -import static org.apache.sling.testing.paxexam.SlingOptions.slingEvent; -import static org.apache.sling.testing.paxexam.SlingOptions.slingQuery; -import static org.apache.sling.testing.paxexam.SlingOptions.slingQuickstartOakTar; -import static org.apache.sling.testing.paxexam.SlingOptions.slingResourcePresence; -import static org.apache.sling.testing.paxexam.SlingOptions.slingScriptingSightly; -import static org.apache.sling.testing.paxexam.SlingOptions.versionResolver; -import static org.ops4j.pax.exam.CoreOptions.composite; -import static org.ops4j.pax.exam.CoreOptions.junitBundles; -import static org.ops4j.pax.exam.CoreOptions.mavenBundle; -import static org.ops4j.pax.exam.CoreOptions.options; -import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfiguration; -import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.newConfiguration; - public abstract class PipesTestSupport extends TestSupport { protected static final String NN_TEST = "test"; @@ -88,7 +88,8 @@ public abstract class PipesTestSupport extends TestSupport { factoryConfiguration("org.apache.sling.resource.presence.internal.ResourcePresenter") .put("path", "/etc/pipes-it/fruit-list") .asOption(), - mavenBundle().groupId("org.apache.geronimo.bundles").artifactId("commons-httpclient").version(versionResolver), + // TODO: still required? + // mavenBundle().groupId("org.apache.geronimo.bundles").artifactId("commons-httpclient").version(versionResolver), // testing slingResourcePresence(), slingCaconfig(), @@ -121,7 +122,7 @@ public abstract class PipesTestSupport extends TestSupport { slingDistribution(), slingQuery(), slingCommonsHtml(), - slingScriptingSightly() + slingScriptingHtl() ); }
