Use bnd 6.x but build with resolver 7.x for java 25

alien11689 · alien11689 · commit 5d82dc7c95c0 · 2026-04-07T17:40:23.000+02:00
diff --git a/spi-fly/pom.xml b/spi-fly/pom.xml
@@ -53,7 +53,7 @@
         <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>7.2.3</bnd.version>
+        <bnd.version>6.4.1</bnd.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>
diff --git a/spi-fly/spi-fly-dynamic-bundle/resolve.bndrun b/spi-fly/spi-fly-dynamic-bundle/resolve.bndrun
@@ -11,4 +11,3 @@
 # limitations under the License.
 
 -runfw: org.apache.felix.framework
--runee: JavaSE-17
diff --git a/spi-fly/spi-fly-dynamic-framework-extension/resolve.bndrun b/spi-fly/spi-fly-dynamic-framework-extension/resolve.bndrun
@@ -11,4 +11,3 @@
 # 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
@@ -67,5 +67,3 @@
 	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
@@ -11,4 +11,3 @@
 # limitations under the License.
 
 -runfw: org.apache.felix.framework
--runee: JavaSE-17

Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,3 @@`
`11`	`11`	`# limitations under the License.`
`12`	`12`
`13`	`13`	`-runfw: org.apache.felix.framework`
`14`		`--runee: JavaSE-17`