This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git
The following commit(s) were added to refs/heads/master by this push:
new f9ffaa9 Update dependencies for Java 25 builds
f9ffaa9 is described below
commit f9ffaa9e03764e2ff51c51d47102982a0e280874
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Fri Nov 13 14:40:01 2026 +0100
Update dependencies for Java 25 builds
---
pom.xml | 5 ++---
.../sling/servlets/resolver/it/ServletResolverTestSupport.java | 5 +++++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index f0db8ed..b204a1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,7 +110,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>3.0.0</version>
+ <version>3.0.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- for ServiceUserMapped (SLING-4312) -->
@@ -270,7 +270,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>5.15.2</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -392,7 +391,7 @@
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
- <version>4.7.3.6</version>
+ <version>4.10.5.0</version>
<configuration>
<effort>Max</effort>
<xmlOutput>true</xmlOutput>
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 b04a84b..a3f89c0 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
@@ -41,6 +41,7 @@ import org.osgi.framework.ServiceReference;
import static org.apache.sling.testing.paxexam.SlingOptions.eventadmin;
import static org.apache.sling.testing.paxexam.SlingOptions.scr;
+import static org.apache.sling.testing.paxexam.SlingOptions.versionResolver;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -91,6 +92,10 @@ public class ServletResolverTestSupport extends TestSupport {
jacocoCommand = vmOption(jacocoOpt);
}
+ // SPI Fly 1.3.8 includes ASM support for Java 25 class files.
+ versionResolver.setVersion(
+ "org.apache.aries.spifly",
"org.apache.aries.spifly.dynamic.framework.extension", "1.3.8");
+
final int httpPort = findFreePort();
return options(composite(
when(debugOption != null).useOptions(debugOption),
