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-testing-paxexam.git
commit cce840b0a62321ef2e0951617b9ecf91a3ded3ce Author: Oliver Lietz <[email protected]> AuthorDate: Sat Apr 4 09:33:08 2026 +0200 SLING-12574 Update options and versions remove backing Option and legacy bundles --- .../apache/sling/testing/paxexam/SlingOptions.java | 24 ---------------------- .../testing/paxexam/SlingVersionResolver.java | 5 ----- .../apache/sling/testing/paxexam/TestSupport.java | 2 -- .../paxexam/it/SlingOptionsTestSupport.java | 2 -- 4 files changed, 33 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 c167e98..7065a4e 100644 --- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java +++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java @@ -26,7 +26,6 @@ import static org.ops4j.pax.exam.CoreOptions.bootClasspathLibrary; import static org.ops4j.pax.exam.CoreOptions.composite; import static org.ops4j.pax.exam.CoreOptions.mavenBundle; import static org.ops4j.pax.exam.CoreOptions.systemProperty; -import static org.ops4j.pax.exam.CoreOptions.vmOption; import static org.ops4j.pax.exam.CoreOptions.wrappedBundle; import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.newConfiguration; @@ -61,25 +60,6 @@ public final class SlingOptions { ); } - public static ModifiableCompositeOption backing() { - final int version = SlingVersionResolver.getJavaVersion(); - if (version >= 11) { - return composite( - mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.annotation-api-1.3").version(versionResolver), - mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.activation-api-1.1").version(versionResolver), - mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.stax-api-1.2").version(versionResolver), - mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.jaxb-api-2.3").version(versionResolver), - mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.jaxb-impl").version(versionResolver) - ); - } else if (version >= 9) { - return composite( - vmOption("--add-modules=java.se.ee") - ); - } else { - return composite(); - } - } - public static ModifiableCompositeOption config() { return composite( mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.configadmin").version(versionResolver) @@ -275,11 +255,7 @@ public final class SlingOptions { mavenBundle().groupId("org.apache.groovy").artifactId("groovy").version(versionResolver), mavenBundle().groupId("org.apache.groovy").artifactId("groovy-json").version(versionResolver).noStart(), // fragment mavenBundle().groupId("org.apache.groovy").artifactId("groovy-xml").version(versionResolver).noStart(), // fragment - mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.jaxb-impl").version(versionResolver), mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.tagsoup").version(versionResolver), - mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.activation-api-1.1").version(versionResolver), - mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.jaxb-api-2.3").version(versionResolver), - mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.stax-api-1.2").version(versionResolver), mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpcore-osgi").version(versionResolver), mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").version(versionResolver), hamcrest() 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 3fb0512..f323109 100644 --- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java +++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java @@ -90,11 +90,6 @@ public class SlingVersionResolver implements VersionResolver { versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.ognl", "3.2.1_1"); versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.tagsoup", "1.2.1_1"); versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.thymeleaf", "3.0.15.RELEASE_1"); - versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-1.1", "2.9.0"); - versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-2.0.1", "2.0.1_1"); - versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.annotation-api-1.3", "1.3_3"); - versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.3", "2.3_3"); - versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.2", "1.2_1"); versions.put("org.apache.sling:org.apache.sling.commons.crypto", "1.2.0"); versions.put("org.apache.sling:org.apache.sling.commons.metrics", "1.2.14"); versions.put("org.apache.sling:org.apache.sling.commons.scheduler", "2.7.14"); diff --git a/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java b/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java index 5ad5363..45b1337 100644 --- a/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java +++ b/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java @@ -37,7 +37,6 @@ import org.ops4j.pax.exam.util.PathUtils; import org.ops4j.pax.tinybundles.TinyBundle; import org.osgi.service.cm.ConfigurationAdmin; -import static org.apache.sling.testing.paxexam.SlingOptions.backing; import static org.apache.sling.testing.paxexam.SlingOptions.paxTinybundles; import static org.apache.sling.testing.paxexam.SlingOptions.spifly; import static org.ops4j.pax.exam.CoreOptions.bundle; @@ -110,7 +109,6 @@ public abstract class TestSupport { systemProperty(WORKING_DIRECTORY_PROPERTY_KEY).value(workingDirectory()), CoreOptions.workingDirectory(workingDirectory()), paxTinybundles(), - backing(), spifly(), jacoco() ); diff --git a/src/test/java/org/apache/sling/testing/paxexam/it/SlingOptionsTestSupport.java b/src/test/java/org/apache/sling/testing/paxexam/it/SlingOptionsTestSupport.java index 774eff4..2a84e82 100644 --- a/src/test/java/org/apache/sling/testing/paxexam/it/SlingOptionsTestSupport.java +++ b/src/test/java/org/apache/sling/testing/paxexam/it/SlingOptionsTestSupport.java @@ -25,7 +25,6 @@ import org.ops4j.pax.exam.CoreOptions; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.util.PathUtils; -import static org.apache.sling.testing.paxexam.SlingOptions.backing; import static org.apache.sling.testing.paxexam.SlingOptions.spifly; import static org.ops4j.pax.exam.CoreOptions.bundle; import static org.ops4j.pax.exam.CoreOptions.composite; @@ -50,7 +49,6 @@ public abstract class SlingOptionsTestSupport { allowSnapshotsExceptRelease(), CoreOptions.workingDirectory(workingDirectory()), testBundle("bundle.filename"), - backing(), spifly() ); }
