diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml index febb6fe2ff..cdc1145054 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-ea] steps: - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} @@ -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/framework/pom.xml b/framework/pom.xml index 4f214cc6e1..9e6db65c04 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 @@ -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/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 diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml index 517c87e902..4a11aad5bc 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 @@ -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 7fb3195cf9..5ab613f196 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 @@ -826,7 +826,7 @@ org.awaitility awaitility - 4.2.1 + 4.3.0 test diff --git a/http/pom.xml b/http/pom.xml index 39f83277a7..6c6a856a67 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 @@ -44,7 +44,7 @@ inventoryprinter itest wrappers - jetty + jetty12 proxy samples/whiteboard 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/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 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