From f819bc2dbdf7b352eddc35bc2381ee6db0bab86d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20R=C3=BCtter?= Date: Mon, 14 Jul 2025 16:33:12 +0200 Subject: [PATCH 1/7] FELIX-6759-Java-25-LTS - Try-out building framework and HTTP subprojects against java 25 to see what will break --- .github/workflows/maven-ci.yml | 2 +- framework/pom.xml | 2 +- http/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml index febb6fe2ff..c246082eba 100644 --- a/.github/workflows/maven-ci.yml +++ b/.github/workflows/maven-ci.yml @@ -31,7 +31,7 @@ jobs: strategy: fail-fast: false matrix: - java: [17,21,23] + java: [17,21,23,25] steps: - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} diff --git a/framework/pom.xml b/framework/pom.xml index 4f214cc6e1..106b99c21f 100644 --- a/framework/pom.xml +++ b/framework/pom.xml @@ -25,7 +25,7 @@ 4.0.0 bundle - Apache Felix Framework + Apache Felix Framework TODO remove this change org.apache.felix.framework 7.1.0-SNAPSHOT diff --git a/http/pom.xml b/http/pom.xml index 39f83277a7..150c619294 100644 --- a/http/pom.xml +++ b/http/pom.xml @@ -26,7 +26,7 @@ ../pom/pom.xml - Apache Felix Http Reactor + Apache Felix Http Reactor TODO remove this change org.apache.felix org.apache.felix.http 7-SNAPSHOT From b40faf7ad10878b5378448c7883ef30c7600c2e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20R=C3=BCtter?= Date: Mon, 14 Jul 2025 16:35:48 +0200 Subject: [PATCH 2/7] FELIX-6759-Java-25-LTS - Use 25-ea (Early access) --- .github/workflows/maven-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml index c246082eba..adb1b638f9 100644 --- a/.github/workflows/maven-ci.yml +++ b/.github/workflows/maven-ci.yml @@ -31,7 +31,7 @@ jobs: strategy: fail-fast: false matrix: - java: [17,21,23,25] + java: [17,21,23,25-ea] steps: - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} From 43302ea2c591eb90b92639e77188a32274555dc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20R=C3=BCtter?= Date: Mon, 14 Jul 2025 16:41:23 +0200 Subject: [PATCH 3/7] FELIX-6759-Java-25-LTS - Update mockito-core to a version that has jdk 25 support via byte-buddy --- framework/pom.xml | 2 +- http/base/pom.xml | 2 +- http/jetty/pom.xml | 2 +- http/jetty12/pom.xml | 2 +- http/sslfilter/pom.xml | 2 +- http/wrappers/pom.xml | 2 +- webconsole/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/framework/pom.xml b/framework/pom.xml index 106b99c21f..9e6db65c04 100644 --- a/framework/pom.xml +++ b/framework/pom.xml @@ -234,7 +234,7 @@ org.mockito mockito-core - 5.17.0 + 5.18.0 test diff --git a/http/base/pom.xml b/http/base/pom.xml index ff70022597..64a42f707f 100644 --- a/http/base/pom.xml +++ b/http/base/pom.xml @@ -155,7 +155,7 @@ org.mockito mockito-core - 5.17.0 + 5.18.0 test diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml index 517c87e902..91995e89fb 100644 --- a/http/jetty/pom.xml +++ b/http/jetty/pom.xml @@ -526,7 +526,7 @@ org.mockito mockito-core - 5.17.0 + 5.18.0 test diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml index 7fb3195cf9..353000a39c 100644 --- a/http/jetty12/pom.xml +++ b/http/jetty12/pom.xml @@ -755,7 +755,7 @@ org.mockito mockito-core - 5.17.0 + 5.18.0 test diff --git a/http/sslfilter/pom.xml b/http/sslfilter/pom.xml index c38d16e97d..e7901f0c51 100644 --- a/http/sslfilter/pom.xml +++ b/http/sslfilter/pom.xml @@ -132,7 +132,7 @@ org.mockito mockito-core - 5.17.0 + 5.18.0 test diff --git a/http/wrappers/pom.xml b/http/wrappers/pom.xml index 131f392049..70f133e42c 100644 --- a/http/wrappers/pom.xml +++ b/http/wrappers/pom.xml @@ -109,7 +109,7 @@ org.mockito mockito-core - 5.17.0 + 5.18.0 test diff --git a/webconsole/pom.xml b/webconsole/pom.xml index 0cc719bd63..68266e84a3 100644 --- a/webconsole/pom.xml +++ b/webconsole/pom.xml @@ -318,7 +318,7 @@ org.mockito mockito-core - 5.17.0 + 5.18.0 test From 71cf3567d682908946d43c1f90a7f3fd06d22445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20R=C3=BCtter?= Date: Mon, 14 Jul 2025 16:44:22 +0200 Subject: [PATCH 4/7] FELIX-6759-Java-25-LTS - Update awaitility --- http/jetty/pom.xml | 2 +- http/jetty12/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml index 91995e89fb..4a11aad5bc 100644 --- a/http/jetty/pom.xml +++ b/http/jetty/pom.xml @@ -597,7 +597,7 @@ org.awaitility awaitility - 4.2.1 + 4.3.0 test diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml index 353000a39c..5ab613f196 100644 --- a/http/jetty12/pom.xml +++ b/http/jetty12/pom.xml @@ -826,7 +826,7 @@ org.awaitility awaitility - 4.2.1 + 4.3.0 test From 4dfa16292c8d3a312db2a8f4f2614fba809c4cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20R=C3=BCtter?= Date: Mon, 14 Jul 2025 16:48:04 +0200 Subject: [PATCH 5/7] FELIX-6759-Java-25-LTS - Disable jetty bundle --- http/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/http/pom.xml b/http/pom.xml index 150c619294..6c6a856a67 100644 --- a/http/pom.xml +++ b/http/pom.xml @@ -44,7 +44,7 @@ inventoryprinter itest wrappers - jetty + jetty12 proxy samples/whiteboard From d88a64cf0dadde65c6f14b1cb2941f36d421f87d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20R=C3=BCtter?= Date: Mon, 14 Jul 2025 16:50:02 +0200 Subject: [PATCH 6/7] FELIX-6759-Java-25-LTS - Don't rely on snapshot build for jetty --- http/itest/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/http/itest/pom.xml b/http/itest/pom.xml index df93733d2e..288407aa3d 100644 --- a/http/itest/pom.xml +++ b/http/itest/pom.xml @@ -33,7 +33,7 @@ 11 6.1.0 - 5.1.35-SNAPSHOT + 5.1.34 org.apache.felix.http.jetty 4.13.3 2.6.14 From a15676bb3794c7ba95d73ad60111f98934ea0c65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20R=C3=BCtter?= Date: Tue, 15 Jul 2025 09:18:10 +0200 Subject: [PATCH 7/7] FELIX-6759-Java-25-LTS - continue-on-error: true to allow building other modules after a failed one - Change SCR to trigger CI --- .github/workflows/maven-ci.yml | 3 +++ scr/pom.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml index adb1b638f9..cdc1145054 100644 --- a/.github/workflows/maven-ci.yml +++ b/.github/workflows/maven-ci.yml @@ -69,12 +69,14 @@ jobs: - name: Felix SCR if: steps.changes.outputs.scr == 'true' run: mvn -B -V -Dstyle.color=always --file scr/pom.xml clean verify + continue-on-error: true - name: Felix Log if: steps.changes.outputs.log == 'true' run: mvn -B -V -Dstyle.color=always --file log/pom.xml clean verify - name: Felix HTTP if: steps.changes.outputs.http == 'true' run: mvn -B -V -Dstyle.color=always "-Dit.test=!MissingWebsocketDependenciesIT" --file http/pom.xml clean install verify + continue-on-error: true - name: Felix Maven bundle plugin if: steps.changes.outputs.maven-bundle-plugin == 'true' run: mvn -B -V -Dstyle.color=always --file tools/maven-bundle-plugin/pom.xml clean install verify @@ -87,6 +89,7 @@ jobs: - name: Felix Framework if: steps.changes.outputs.framework == 'true' run: mvn -B -V -Dstyle.color=always --file framework/pom.xml clean verify + continue-on-error: true - name: OSGi-TCK Framework if: steps.changes.outputs.framework == 'true' run: mvn -B -V -Dstyle.color=always --file framework.tck/pom.xml clean verify diff --git a/scr/pom.xml b/scr/pom.xml index a96be0e2ea..f2e8dae3da 100644 --- a/scr/pom.xml +++ b/scr/pom.xml @@ -25,7 +25,7 @@ 4.0.0 bundle - Apache Felix Declarative Services + Apache Felix Declarative Services TODO remove this change Implementation of the Declarative Services specification 1.5