From c87e127cb48456d336dfa24be5eb2edb092d4180 Mon Sep 17 00:00:00 2001
From: Arne Juul <arnej@vespa.ai>
Date: Sun, 18 Jan 2026 11:30:02 +0000
Subject: [PATCH 1/3] Add Maven profiles to support building with JDK 8-16

- Add 'ancient-jdk' profile (JDK 8-10) that skips test compilation and execution
- Add 'old-jdk' profile (JDK 11-16) with appropriate JVM args for module system
- Update default surefire configuration for JDK 17+ with --add-opens flags and security manager settings
- Upgrade ASM library from 5.2 to 9.9 and split into asm + asm-tree dependencies
- Update test code to use ASM 9.x API (remove Opcodes.ASM4 flag)

This allows the project to be built with older JDK versions while maintaining
compatibility with modern JDK releases (17+).
---
 framework/pom.xml                             | 90 ++++++++++++++++++-
 .../felix/framework/BundleWiringImplTest.java |  4 +-
 2 files changed, 89 insertions(+), 5 deletions(-)

diff --git a/framework/pom.xml b/framework/pom.xml
index 4f214cc6e1..5d59d8f37f 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -45,8 +45,13 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
+          <!-- assumes a new-ish JDK, 17 or newer should work - see profiles at the bottom -->
           <argLine>
             -Djava.security.manager=allow
+            -XX:+EnableDynamicAgentLoading
+            --add-opens java.base/java.net=ALL-UNNAMED
+            --add-opens java.base/jdk.internal.loader=ALL-UNNAMED
+            --add-opens java.base/java.security=ALL-UNNAMED
           </argLine>
         </configuration>
       </plugin>
@@ -119,7 +124,7 @@
             <Export-Package>
                 org.osgi.framework.*;-split-package:=first,
                 org.osgi.resource;-split-package:=first,
-                org.osgi.resource.dto;-split-package:=first,                
+                org.osgi.resource.dto;-split-package:=first,
                 org.osgi.service.packageadmin;-split-package:=first,
                 org.osgi.service.startlevel;-split-package:=first,
                 org.osgi.service.url;-split-package:=first,
@@ -221,8 +226,14 @@
     </dependency>
     <dependency>
         <groupId>org.ow2.asm</groupId>
-        <artifactId>asm-all</artifactId>
-        <version>5.2</version>
+        <artifactId>asm</artifactId>
+        <version>9.9</version>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.ow2.asm</groupId>
+        <artifactId>asm-tree</artifactId>
+        <version>9.9</version>
         <scope>test</scope>
     </dependency>
     <dependency>
@@ -249,4 +260,77 @@
           <version>1.9</version>
       </dependency>
   </dependencies>
+
+  <profiles>
+    <!--
+        if your JDK is ancient, the unit tests won't even compile,
+        and javac won't have the "release" option.
+    -->
+    <profile>
+      <id>ancient-jdk</id>
+      <activation>
+        <jdk>[8,11)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <skipTests>true</skipTests>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>default-testCompile</id>
+                <phase>test-compile</phase>
+                <goals>
+                  <goal>testCompile</goal>
+                </goals>
+                <configuration>
+                  <skip>true</skip>
+                </configuration>
+              </execution>
+            </executions>
+            <configuration>
+              <source>${felix.java.version}</source>
+              <target>${felix.java.version}</target>
+              <release combine.self="override"/>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <!--
+	 if your JDK is old, using -Djava.security.manager=allow
+         will assume "allow" is the name of a security manager class
+      -->
+      <id>old-jdk</id>
+      <activation>
+        <jdk>[11,17)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <argLine>
+                -XX:+EnableDynamicAgentLoading
+                --add-opens java.base/java.net=ALL-UNNAMED
+                --add-opens java.base/jdk.internal.loader=ALL-UNNAMED
+                --add-opens java.base/java.security=ALL-UNNAMED
+              </argLine>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>
diff --git a/framework/src/test/java/org/apache/felix/framework/BundleWiringImplTest.java b/framework/src/test/java/org/apache/felix/framework/BundleWiringImplTest.java
index 6d009036aa..c362243713 100644
--- a/framework/src/test/java/org/apache/felix/framework/BundleWiringImplTest.java
+++ b/framework/src/test/java/org/apache/felix/framework/BundleWiringImplTest.java
@@ -1137,7 +1137,7 @@ public void weave(WovenClass wovenClass)
             reader.accept(classNode, 0);
             classNode.fields.add(new FieldNode(Opcodes.ACC_PUBLIC,
                     "awesomePublicField", "Ljava/lang/String;", null, null));
-            ClassWriter writer = new ClassWriter(reader, Opcodes.ASM4);
+            ClassWriter writer = new ClassWriter(reader, 0);
             classNode.accept(writer);
             wovenClass.setBytes(writer.toByteArray());
         }
@@ -1158,7 +1158,7 @@ public void weave(WovenClass wovenClass)
                     "awesomePublicField", "Ljava/lang/String;", null, null));
             classNode.fields.add(new FieldNode(Opcodes.ACC_PUBLIC,
                     "awesomePublicField", "Ljava/lang/String;", null, null));
-            ClassWriter writer = new ClassWriter(reader, Opcodes.ASM4);
+            ClassWriter writer = new ClassWriter(reader, 0);
             classNode.accept(writer);
             wovenClass.setBytes(writer.toByteArray());
         }

From 2a7e0b85456ca946984f769cfc3dbc0c5b80b45a Mon Sep 17 00:00:00 2001
From: Arne Juul <arnej@vespa.ai>
Date: Sun, 18 Jan 2026 17:46:19 +0000
Subject: [PATCH 2/3] add profile for JDK 25+ as well

Note: tested on the branch "feature/FELIX-6759-Java-25-LTS" with
      openjdk version "25.0.1"
---
 framework/pom.xml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/framework/pom.xml b/framework/pom.xml
index 5d59d8f37f..5282ee29e3 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -331,6 +331,34 @@
         </plugins>
       </build>
     </profile>
+
+    <profile>
+      <!--
+          if your JDK is too new, using -Djava.security.manager=allow
+          is not possible
+      -->
+      <id>newer-jdk</id>
+      <activation>
+        <jdk>[25,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <argLine>
+                -XX:+EnableDynamicAgentLoading
+                --add-opens java.base/java.net=ALL-UNNAMED
+                --add-opens java.base/jdk.internal.loader=ALL-UNNAMED
+                --add-opens java.base/java.security=ALL-UNNAMED
+              </argLine>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
   </profiles>
 
 </project>

From 6bcf511f960807f6dc0334f6a5468cf27ca24cac Mon Sep 17 00:00:00 2001
From: Arne Juul <arnej@vespa.ai>
Date: Mon, 19 Jan 2026 11:28:18 +0000
Subject: [PATCH 3/3] Handle JDK identifying as version 1.8 as well

---
 framework/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/pom.xml b/framework/pom.xml
index 5282ee29e3..e26a325c75 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -269,7 +269,7 @@
     <profile>
       <id>ancient-jdk</id>
       <activation>
-        <jdk>[8,11)</jdk>
+        <jdk>[1,11)</jdk>
       </activation>
       <build>
         <plugins>