Skip to content

OAK-12022: upgrade Pax Exam and Sling test support #3267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mbaedke merged 2 commits into from
Nov 6, 2026
Merged

OAK-12022: upgrade Pax Exam and Sling test support #3267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82da30f
OAK-12022: oak-store-composite: Update pax-exam test dependency to 4.…
mbaedke Nov 5, 2026
83aa7e7
OAK-12022: support Java 25 in Pax Exam tests
rishabhdaim Nov 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion oak-it-osgi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,6 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.paxexam</artifactId>
<version>4.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
16 changes: 7 additions & 9 deletions oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,19 +93,17 @@ public Option[] configuration() throws IOException, URISyntaxException {
}

/**
* Provides Apache Aries SPI Fly 1.3.x for SLF4J 2.x service-loader mediation in OSGi.
* SPI Fly 1.2.x (bundled by sling.testing.paxexam 3.1.0) embeds ASM 5.x and cannot
* weave Java 11+ bytecode. Version 1.3.7 uses external ASM 9.x and supports modern class files.
* Provides service-loader mediation with ASM support for Java 25 class files.
*/
static Option spyflyOptions() {
return composite(
mavenBundle("org.apache.aries", "org.apache.aries.util", "1.1.3"),
mavenBundle("org.ow2.asm", "asm", "9.7.1"),
mavenBundle("org.ow2.asm", "asm-tree", "9.7.1"),
mavenBundle("org.ow2.asm", "asm-analysis", "9.7.1"),
mavenBundle("org.ow2.asm", "asm-commons", "9.7.1"),
mavenBundle("org.ow2.asm", "asm-util", "9.7.1"),
mavenBundle("org.apache.aries.spifly", "org.apache.aries.spifly.dynamic.bundle", "1.3.7")
mavenBundle("org.ow2.asm", "asm", "9.10.1"),
mavenBundle("org.ow2.asm", "asm-tree", "9.10.1"),
mavenBundle("org.ow2.asm", "asm-analysis", "9.10.1"),
mavenBundle("org.ow2.asm", "asm-commons", "9.10.1"),
mavenBundle("org.ow2.asm", "asm-util", "9.10.1"),
mavenBundle("org.apache.aries.spifly", "org.apache.aries.spifly.dynamic.bundle", "1.3.8")
);
}

Expand Down
2 changes: 1 addition & 1 deletion oak-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,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>
Expand Down
5 changes: 0 additions & 5 deletions oak-store-composite/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@
<name>Oak Composite Store</name>
<packaging>bundle</packaging>

<properties>
<!-- see https://issues.apache.org/jira/browse/OAK-12022 -->
<pax-exam.version>4.13.1</pax-exam.version>
</properties>

<build>
<plugins>
<plugin>
Expand Down
4 changes: 3 additions & 1 deletion ...-composite/src/test/java/org/apache/jackrabbit/oak/composite/it/CompositeTestSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ public abstract class CompositeTestSupport extends TestSupport {

@Override
protected ModifiableCompositeOption baseConfiguration() {
SlingOptions.versionResolver.setVersion("org.apache.aries.spifly",
"org.apache.aries.spifly.dynamic.framework.extension", "1.3.8");
String bundlePath = System.getProperty("bundle.filename");
if (bundlePath == null) {
throw new IllegalArgumentException("This IT has to be called with system property 'bundle.filename' set to the path of this bundle jar");
Expand Down Expand Up @@ -107,7 +109,7 @@ public static Option jackrabbit() {
protected static Option logging(String level) {
return composite(
mavenBundle("org.ops4j.pax.logging", "pax-logging-api", "1.11.13"),
SlingOptions.spyfly(),
SlingOptions.spifly(),
mavenBundle("org.slf4j", "slf4j-api", "2.0.12"),
mavenBundle("org.slf4j", "slf4j-simple", "2.0.12"),
systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value(level),
Expand Down
Loading