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
The following commit(s) were added to refs/heads/master by this push:
new 7587561 SLING-12574 Update options and versions
7587561 is described below
commit 7587561715311e4191186021ba0cd85853594477
Author: Oliver Lietz <[email protected]>
AuthorDate: Fri Apr 3 22:27:01 2026 +0200
SLING-12574 Update options and versions
---
.../apache/sling/testing/paxexam/SlingOptions.java | 14 ++--
.../testing/paxexam/SlingVersionResolver.java | 90 +++++++++++-----------
2 files changed, 54 insertions(+), 50 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 c11c0da..c167e98 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -113,7 +113,7 @@ public final class SlingOptions {
return composite(
greenmail,
mavenBundle().groupId("jakarta.mail").artifactId("jakarta.mail-api").version(versionResolver),
-
mavenBundle().groupId("org.eclipse.angus").artifactId("jakarta.mail").version(versionResolver),
+
mavenBundle().groupId("org.eclipse.angus").artifactId("angus-mail").version(versionResolver),
mavenBundle().groupId("jakarta.activation").artifactId("jakarta.activation-api").version(versionResolver),
junit(),
// add GreenMail to boot classpath *also* to allow setting
ssl.SocketFactory.provider to GreenMail's DummySSLSocketFactory
@@ -141,7 +141,10 @@ public final class SlingOptions {
return composite(
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.jetty12").version(versionResolver),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.servlet-api").version(versionResolver),
- config()
+
mavenBundle().groupId("commons-fileupload").artifactId("commons-fileupload").version(versionResolver),
+
mavenBundle().groupId("commons-io").artifactId("commons-io").version(versionResolver),
+ config(),
+ paxLoggingApi()
);
}
@@ -240,7 +243,8 @@ public final class SlingOptions {
mavenBundle().groupId("org.ops4j.base").artifactId("ops4j-base-lang").version(versionResolver),
mavenBundle().groupId("org.ops4j.base").artifactId("ops4j-base-util-property").version(versionResolver),
mavenBundle().groupId("org.ops4j.pax.swissbox").artifactId("pax-swissbox-property").version(versionResolver),
- config()
+ config(),
+ paxLoggingApi()
);
}
@@ -269,8 +273,8 @@ public final class SlingOptions {
mavenBundle().groupId("io.rest-assured").artifactId("xml-path").version(versionResolver),
mavenBundle().groupId("org.apache.commons").artifactId("commons-lang3").version(versionResolver),
mavenBundle().groupId("org.apache.groovy").artifactId("groovy").version(versionResolver),
-
mavenBundle().groupId("org.apache.groovy").artifactId("groovy-json").version(versionResolver),
-
mavenBundle().groupId("org.apache.groovy").artifactId("groovy-xml").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),
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 51b5952..3fb0512 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -42,47 +42,47 @@ public class SlingVersionResolver implements
VersionResolver {
public SlingVersionResolver() {
versions.put("biz.aQute.bnd:biz.aQute.bndlib", "6.4.1");
versions.put("biz.aQute.bnd:biz.aQute.bnd.util", "6.4.1");
- versions.put("ch.qos.logback:logback-classic", "1.5.12");
- versions.put("ch.qos.logback:logback-core", "1.5.12");
- versions.put("commons-fileupload:commons-fileupload", "1.5");
- versions.put("commons-io:commons-io", "2.18.0");
- versions.put("com.fasterxml.jackson.core:jackson-annotations",
"2.18.2");
- versions.put("com.fasterxml.jackson.core:jackson-core", "2.18.2");
- versions.put("com.fasterxml.jackson.core:jackson-databind", "2.18.2");
- versions.put("com.icegreen:greenmail", "2.1.2");
+ versions.put("ch.qos.logback:logback-classic", "1.5.32");
+ versions.put("ch.qos.logback:logback-core", "1.5.32");
+ versions.put("commons-fileupload:commons-fileupload", "1.6.0");
+ versions.put("commons-io:commons-io", "2.21.0");
+ versions.put("com.fasterxml.jackson.core:jackson-annotations", "2.21");
+ versions.put("com.fasterxml.jackson.core:jackson-core", "2.21.2");
+ versions.put("com.fasterxml.jackson.core:jackson-databind", "2.21.2");
+ versions.put("com.icegreen:greenmail", "2.1.8");
versions.put("io.dropwizard.metrics:metrics-core", "3.2.6");
- versions.put("io.rest-assured:json-path", "5.5.0");
- versions.put("io.rest-assured:rest-assured", "5.5.0");
- versions.put("io.rest-assured:rest-assured-common", "5.5.0");
- versions.put("io.rest-assured:xml-path", "5.5.0");
- versions.put("jakarta.activation:jakarta.activation-api", "2.1.3");
- versions.put("jakarta.mail:jakarta.mail-api", "2.1.3");
+ versions.put("io.rest-assured:json-path", "6.0.0");
+ versions.put("io.rest-assured:rest-assured", "6.0.0");
+ versions.put("io.rest-assured:rest-assured-common", "6.0.0");
+ versions.put("io.rest-assured:xml-path", "6.0.0");
+ versions.put("jakarta.activation:jakarta.activation-api", "2.2.0-M1");
+ versions.put("jakarta.mail:jakarta.mail-api", "2.2.0-M1");
versions.put("org.apache.aries:org.apache.aries.util", "1.1.3");
versions.put("org.apache.aries.jmx:org.apache.aries.jmx.api", "1.1.5");
versions.put("org.apache.aries.jmx:org.apache.aries.jmx.core",
"1.1.8");
versions.put("org.apache.aries.jmx:org.apache.aries.jmx.whiteboard",
"1.2.0");
versions.put("org.apache.aries.spifly:org.apache.aries.spifly.dynamic.framework.extension",
"1.3.7");
- versions.put("org.apache.commons:commons-lang3", "3.17.0");
+ versions.put("org.apache.commons:commons-lang3", "3.20.0");
versions.put("org.apache.httpcomponents:httpclient-osgi", "4.5.14");
versions.put("org.apache.httpcomponents:httpcore-osgi", "4.4.16");
versions.put("org.apache.felix:org.apache.felix.configadmin",
"1.9.26");
versions.put("org.apache.felix:org.apache.felix.eventadmin", "1.6.4");
versions.put("org.apache.felix:org.apache.felix.healthcheck.api",
"2.0.4");
- versions.put("org.apache.felix:org.apache.felix.healthcheck.core",
"2.0.14");
-
versions.put("org.apache.felix:org.apache.felix.healthcheck.generalchecks",
"3.0.4");
-
versions.put("org.apache.felix:org.apache.felix.healthcheck.webconsoleplugin",
"2.0.2");
- versions.put("org.apache.felix:org.apache.felix.http.jetty12",
"1.0.19");
- versions.put("org.apache.felix:org.apache.felix.http.servlet-api",
"3.0.0");
+ versions.put("org.apache.felix:org.apache.felix.healthcheck.core",
"2.3.0");
+
versions.put("org.apache.felix:org.apache.felix.healthcheck.generalchecks",
"3.0.8");
+
versions.put("org.apache.felix:org.apache.felix.healthcheck.webconsoleplugin",
"2.2.0");
+ versions.put("org.apache.felix:org.apache.felix.http.jetty12",
"1.1.8");
+ versions.put("org.apache.felix:org.apache.felix.http.servlet-api",
"6.1.0");
versions.put("org.apache.felix:org.apache.felix.http.whiteboard",
"4.0.0");
versions.put("org.apache.felix:org.apache.felix.inventory", "2.0.0");
versions.put("org.apache.felix:org.apache.felix.metatype", "1.2.4");
- versions.put("org.apache.felix:org.apache.felix.scr", "2.2.12");
- versions.put("org.apache.felix:org.apache.felix.webconsole", "5.0.8");
+ versions.put("org.apache.felix:org.apache.felix.scr", "2.2.14");
+ versions.put("org.apache.felix:org.apache.felix.webconsole", "5.0.18");
versions.put("org.apache.felix:org.apache.felix.webconsole.plugins.ds",
"2.3.0");
versions.put("org.apache.geronimo.specs:geronimo-jta_1.1_spec",
"1.1.1");
- versions.put("org.apache.groovy:groovy", "4.0.24");
- versions.put("org.apache.groovy:groovy-json", "4.0.24");
- versions.put("org.apache.groovy:groovy-xml", "4.0.24");
+ versions.put("org.apache.groovy:groovy", "5.0.5");
+ versions.put("org.apache.groovy:groovy-json", "5.0.5");
+ versions.put("org.apache.groovy:groovy-xml", "5.0.5");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.hamcrest",
"1.3_1");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.jasypt",
"1.9.3_1");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl",
"2.2.11_1");
@@ -95,37 +95,37 @@ public class SlingVersionResolver implements
VersionResolver {
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.1.0");
- versions.put("org.apache.sling:org.apache.sling.commons.metrics",
"1.2.12");
- versions.put("org.apache.sling:org.apache.sling.commons.scheduler",
"2.7.12");
- versions.put("org.apache.sling:org.apache.sling.commons.threads",
"3.2.22");
- versions.put("org.attoparser:attoparser", "2.0.6.RELEASE");
- versions.put("org.awaitility:awaitility", "4.2.2");
- versions.put("org.eclipse.angus:jakarta.mail", "2.0.3");
+ 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");
+ versions.put("org.apache.sling:org.apache.sling.commons.threads",
"3.3.0");
+ versions.put("org.attoparser:attoparser", "2.0.7.RELEASE");
+ versions.put("org.awaitility:awaitility", "4.3.0");
+ versions.put("org.eclipse.angus:angus-mail", "2.1.0-M1");
versions.put("org.hamcrest:hamcrest", "2.2");
- versions.put("org.javassist:javassist", "3.29.2-GA");
+ versions.put("org.javassist:javassist", "3.30.2-GA");
versions.put("org.ops4j.base:ops4j-base-lang", "1.5.1");
versions.put("org.ops4j.base:ops4j-base-store", "1.5.1");
versions.put("org.ops4j.base:ops4j-base-util-property", "1.5.1");
- versions.put("org.ops4j.pax.logging:pax-logging-api", "2.2.7");
- versions.put("org.ops4j.pax.logging:pax-logging-log4j2", "2.2.7");
- versions.put("org.ops4j.pax.logging:pax-logging-logback", "2.2.7");
+ versions.put("org.ops4j.pax.logging:pax-logging-api", "2.3.2");
+ versions.put("org.ops4j.pax.logging:pax-logging-log4j2", "2.3.2");
+ versions.put("org.ops4j.pax.logging:pax-logging-logback", "2.3.2");
versions.put("org.ops4j.pax.swissbox:pax-swissbox-bnd", "1.9.0");
versions.put("org.ops4j.pax.swissbox:pax-swissbox-property", "1.9.0");
- versions.put("org.ops4j.pax.url:pax-url-classpath", "2.6.14");
- versions.put("org.ops4j.pax.url:pax-url-commons", "2.6.14");
- versions.put("org.ops4j.pax.url:pax-url-wrap", "2.6.14");
- versions.put("org.ops4j.pax.tinybundles:tinybundles", "4.0.0");
+ versions.put("org.ops4j.pax.url:pax-url-classpath", "3.0.2");
+ versions.put("org.ops4j.pax.url:pax-url-commons", "3.0.2");
+ versions.put("org.ops4j.pax.url:pax-url-wrap", "3.0.2");
+ versions.put("org.ops4j.pax.tinybundles:tinybundles", "4.0.1");
versions.put("org.osgi:org.osgi.service.component", "1.5.1");
versions.put("org.osgi:org.osgi.service.repository", "1.1.0");
versions.put("org.osgi:org.osgi.util.function", "1.2.0");
versions.put("org.osgi:org.osgi.util.promise", "1.3.0");
- versions.put("org.owasp.encoder:encoder", "1.3.1");
+ versions.put("org.owasp.encoder:encoder", "1.4.0");
versions.put("org.rnorth.duct-tape:duct-tape", "1.0.8");
- versions.put("org.slf4j:slf4j-api", "2.0.16");
- versions.put("org.slf4j:slf4j-simple", "2.0.16");
- versions.put("org.slf4j:jcl-over-slf4j", "2.0.16");
- versions.put("org.testcontainers:testcontainers", "1.20.4");
+ versions.put("org.slf4j:slf4j-api", "2.0.17");
+ versions.put("org.slf4j:slf4j-simple", "2.0.17");
+ versions.put("org.slf4j:jcl-over-slf4j", "2.0.17");
+ versions.put("org.testcontainers:testcontainers", "2.0.4");
versions.put("org.unbescape:unbescape", "1.1.6.RELEASE");
}
