From d1ee484eb55033853dbd3a98c5c6919de07315eb Mon Sep 17 00:00:00 2001
From: Stefan Bischof <stbischof@bipolis.org>
Date: Fri, 3 Apr 2026 10:45:45 +0200
Subject: [PATCH] spi-fly 8-25

Require-Capability: osgi.ee  JavaSE version=1.8
Signed-off-by: Stefan Bischof <stbischof@bipolis.org>
---
 spi-fly/pom.xml                                |  6 +++---
 spi-fly/spi-fly-dynamic-bundle/resolve.bndrun  |  1 +
 .../pom.xml                                    |  1 +
 .../resolve.bndrun                             |  1 +
 spi-fly/spi-fly-itests/test.bndrun             | 18 ++++++++++--------
 spi-fly/spi-fly-static-bundle/resolve.bndrun   |  1 +
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/spi-fly/pom.xml b/spi-fly/pom.xml
index 9b4ef8db58..36c11b6ff4 100644
--- a/spi-fly/pom.xml
+++ b/spi-fly/pom.xml
@@ -46,15 +46,15 @@
 
     <properties>
         <project.scm.id>apache.releases.https</project.scm.id>
-        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
-        <java.source.version>8</java.source.version>
+        <java.source.version>17</java.source.version>
 
         <apache-rat-plugin.version>0.17</apache-rat-plugin.version>
         <asm.version>9.9.1</asm.version>
         <assertj.version>3.27.7</assertj.version>
         <bnd.version>6.4.1</bnd.version>
-        <bnd-maven-plugins.version>6.4.0</bnd-maven-plugins.version>
+        <bnd-maven-plugins.version>7.2.3</bnd-maven-plugins.version>
         <easymock.version>5.6.0</easymock.version>
         <felix.framework.version>7.0.5</felix.framework.version>
         <felix.log.extension.version>1.0.0</felix.log.extension.version>
diff --git a/spi-fly/spi-fly-dynamic-bundle/resolve.bndrun b/spi-fly/spi-fly-dynamic-bundle/resolve.bndrun
index 938bb24c0b..4756a58637 100644
--- a/spi-fly/spi-fly-dynamic-bundle/resolve.bndrun
+++ b/spi-fly/spi-fly-dynamic-bundle/resolve.bndrun
@@ -11,3 +11,4 @@
 # limitations under the License.
 
 -runfw: org.apache.felix.framework
+-runee: JavaSE-17
diff --git a/spi-fly/spi-fly-dynamic-framework-extension/pom.xml b/spi-fly/spi-fly-dynamic-framework-extension/pom.xml
index 3ab4c2f46e..5040509301 100644
--- a/spi-fly/spi-fly-dynamic-framework-extension/pom.xml
+++ b/spi-fly/spi-fly-dynamic-framework-extension/pom.xml
@@ -131,6 +131,7 @@
                         aQute.bnd.version.maven,\
                         aQute.lib.collections,\
                         aQute.lib.date,\
+                        aQute.lib.hex,\
                         aQute.lib.io,\
                         aQute.lib.stringrover,\
                         aQute.lib.strings,\
diff --git a/spi-fly/spi-fly-dynamic-framework-extension/resolve.bndrun b/spi-fly/spi-fly-dynamic-framework-extension/resolve.bndrun
index 938bb24c0b..4756a58637 100644
--- a/spi-fly/spi-fly-dynamic-framework-extension/resolve.bndrun
+++ b/spi-fly/spi-fly-dynamic-framework-extension/resolve.bndrun
@@ -11,3 +11,4 @@
 # limitations under the License.
 
 -runfw: org.apache.felix.framework
+-runee: JavaSE-17
diff --git a/spi-fly/spi-fly-itests/test.bndrun b/spi-fly/spi-fly-itests/test.bndrun
index 14bd1f2485..2c8ac6359a 100644
--- a/spi-fly/spi-fly-itests/test.bndrun
+++ b/spi-fly/spi-fly-itests/test.bndrun
@@ -51,14 +51,14 @@
     bnd.identity;id='junit-platform-launcher'
 
 -runbundles: \
-	assertj-core;version='[3.27.3,3.27.4)',\
-	junit-jupiter-api;version='[5.12.2,5.12.3)',\
-	junit-jupiter-engine;version='[5.12.2,5.12.3)',\
-	junit-jupiter-params;version='[5.12.2,5.12.3)',\
-	junit-platform-commons;version='[1.12.2,1.12.3)',\
-	junit-platform-engine;version='[1.12.2,1.12.3)',\
-	junit-platform-launcher;version='[1.12.2,1.12.3)',\
-	net.bytebuddy.byte-buddy;version='[1.15.11,1.15.12)',\
+	assertj-core;version='[3.27.7,3.27.8)',\
+	junit-jupiter-api;version='[5.14.3,5.14.4)',\
+	junit-jupiter-engine;version='[5.14.3,5.14.4)',\
+	junit-jupiter-params;version='[5.14.3,5.14.4)',\
+	junit-platform-commons;version='[1.14.3,1.14.4)',\
+	junit-platform-engine;version='[1.14.3,1.14.4)',\
+	junit-platform-launcher;version='[1.14.3,1.14.4)',\
+	net.bytebuddy.byte-buddy;version='[1.18.3,1.18.4)',\
 	org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.8,1.3.9)',\
 	org.apache.aries.spifly.examples.spi.bundle;version='[1.0.6,1.0.7)',\
 	org.apache.aries.spifly.itests;version='[1.3.8,1.3.9)',\
@@ -67,3 +67,5 @@
 	org.osgi.test.assertj.framework;version='[1.3.0,1.3.1)',\
 	org.osgi.test.common;version='[1.3.0,1.3.1)',\
 	org.osgi.test.junit5;version='[1.3.0,1.3.1)'
+
+-runee: JavaSE-17
diff --git a/spi-fly/spi-fly-static-bundle/resolve.bndrun b/spi-fly/spi-fly-static-bundle/resolve.bndrun
index 938bb24c0b..4756a58637 100644
--- a/spi-fly/spi-fly-static-bundle/resolve.bndrun
+++ b/spi-fly/spi-fly-static-bundle/resolve.bndrun
@@ -11,3 +11,4 @@
 # limitations under the License.
 
 -runfw: org.apache.felix.framework
+-runee: JavaSE-17