From 7c0d0dabd66b5755c544bf0368ddb362a18ac452 Mon Sep 17 00:00:00 2001 From: Dominik Przybysz Date: Thu, 2 Apr 2026 22:15:23 +0200 Subject: [PATCH 1/3] ARIES-2165: Test spi-fly on bnd 7.x --- .github/workflows/spi-fly.yml | 9 ++------- spi-fly/pom.xml | 8 ++++---- 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 + 7 files changed, 20 insertions(+), 19 deletions(-) diff --git a/.github/workflows/spi-fly.yml b/.github/workflows/spi-fly.yml index aa0d4d87de..f4d9a89105 100644 --- a/.github/workflows/spi-fly.yml +++ b/.github/workflows/spi-fly.yml @@ -30,13 +30,8 @@ jobs: strategy: fail-fast: false matrix: - java: [ 8, 11, 17, 21 ] - os: [ ubuntu-latest ] - include: - - os: windows-latest - java: 17 - - os: windows-latest - java: 21 + java: [ 17, 21, 25 ] + os: [ ubuntu-latest, windows-latest ] name: JDK${{ matrix.java }} ${{ matrix.os }} runs-on: ${{ matrix.os }} steps: diff --git a/spi-fly/pom.xml b/spi-fly/pom.xml index 9b4ef8db58..5835082f54 100644 --- a/spi-fly/pom.xml +++ b/spi-fly/pom.xml @@ -46,15 +46,15 @@ apache.releases.https - 8 + 17 8 - 8 + 17 0.17 9.9.1 3.27.7 - 6.4.1 - 6.4.0 + 7.2.3 + 7.2.3 5.6.0 7.0.5 1.0.0 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 From 8c1d3e19823162723fd9d6ccaa5ae571f8b6a7ba Mon Sep 17 00:00:00 2001 From: Dominik Przybysz Date: Thu, 2 Apr 2026 22:55:15 +0200 Subject: [PATCH 2/3] ARIES-2165: Exclude spi-fly from pmd --- .github/workflows/pmd.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pmd.yml b/.github/workflows/pmd.yml index eed837936d..83903eb7de 100644 --- a/.github/workflows/pmd.yml +++ b/.github/workflows/pmd.yml @@ -44,7 +44,8 @@ jobs: java-version: 8 - name: Run PMD shell: bash - run: mvn -U -e -B -ntp clean install -DskipTests pmd:pmd + # Excluding spi-fly since java 17 is necessary + run: mvn -U -e -B -ntp clean install -DskipTests -pl '!spi-fly/spi-fly-core,!spi-fly/spi-fly-dynamic-bundle,!spi-fly/spi-fly-dynamic-framework-extension,!spi-fly/spi-fly-examples,!spi-fly/spi-fly-itests,!spi-fly/spi-fly-static-bundle,!spi-fly/spi-fly-static-tool,!spi-fly/spi-fly-weaver,!spi-fly/spi-fly-examples/spi-fly-example-client1-bundle,!spi-fly/spi-fly-examples/spi-fly-example-client1-jar,!spi-fly/spi-fly-examples/spi-fly-example-client2-bundle,!spi-fly/spi-fly-examples/spi-fly-example-client3-bundle,!spi-fly/spi-fly-examples/spi-fly-example-client3-fragment,!spi-fly/spi-fly-examples/spi-fly-example-provider1-bundle,!spi-fly/spi-fly-examples/spi-fly-example-provider1-jar,!spi-fly/spi-fly-examples/spi-fly-example-provider2-bundle,!spi-fly/spi-fly-examples/spi-fly-example-provider3-bundle,!spi-fly/spi-fly-examples/spi-fly-example-provider3-fragment,!spi-fly/spi-fly-examples/spi-fly-example-provider-consumer-bundle,!spi-fly/spi-fly-examples/spi-fly-example-resource-client-bundle,!spi-fly/spi-fly-examples/spi-fly-example-resource-provider-bundle,!spi-fly/spi-fly-examples/spi-fly-example-spi-bundle,!spi-fly' pmd:pmd - name: Publish PMD results uses: jwgmeligmeyling/pmd-github-action@322e346bd76a0757c4d54ff9209e245965aa066d with: From 59edb963c34e7539da1b811a16ef1399d514357a Mon Sep 17 00:00:00 2001 From: Dominik Przybysz Date: Tue, 7 Apr 2026 17:40:23 +0200 Subject: [PATCH 3/3] ARIES-2165: Use bnd 6.x but build with resolver 7.x for java 25 --- spi-fly/pom.xml | 3 ++- spi-fly/spi-fly-dynamic-bundle/resolve.bndrun | 1 - spi-fly/spi-fly-dynamic-framework-extension/resolve.bndrun | 1 - spi-fly/spi-fly-itests/test.bndrun | 2 -- spi-fly/spi-fly-static-bundle/resolve.bndrun | 1 - 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/spi-fly/pom.xml b/spi-fly/pom.xml index 5835082f54..6fa8fb399d 100644 --- a/spi-fly/pom.xml +++ b/spi-fly/pom.xml @@ -53,7 +53,8 @@ 0.17 9.9.1 3.27.7 - 7.2.3 + + 6.4.1 7.2.3 5.6.0 7.0.5 diff --git a/spi-fly/spi-fly-dynamic-bundle/resolve.bndrun b/spi-fly/spi-fly-dynamic-bundle/resolve.bndrun index 4756a58637..938bb24c0b 100644 --- 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 index 4756a58637..938bb24c0b 100644 --- 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 index 2c8ac6359a..c945f736ab 100644 --- 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 index 4756a58637..938bb24c0b 100644 --- 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