Skip to content

ARIES-2165: Build spi-fly on bnd 7.x with dependency to 6.x #815

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

Open
alien11689 wants to merge 3 commits into
base: trunk
Choose a base branch
from
Open

ARIES-2165: Build spi-fly on bnd 7.x with dependency to 6.x #815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c0d0da
ARIES-2165: Test spi-fly on bnd 7.x
alien11689 Apr 2, 2026
8c1d3e1
ARIES-2165: Exclude spi-fly from pmd
alien11689 Apr 2, 2026
59edb96
ARIES-2165: Use bnd 6.x but build with resolver 7.x for java 25
alien11689 Apr 7, 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
3 changes: 2 additions & 1 deletion .github/workflows/pmd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/spi-fly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 4 additions & 3 deletions spi-fly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,16 @@

<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 6.x is supporting java < 17 -->
<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>
Expand Down
1 change: 1 addition & 0 deletions spi-fly/spi-fly-dynamic-framework-extension/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,\
Expand Down
16 changes: 8 additions & 8 deletions spi-fly/spi-fly-itests/test.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
Loading