Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion .github/workflows/maven-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions framework/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Apache Felix Framework</name>
<name>Apache Felix Framework TODO remove this change</name>
<artifactId>org.apache.felix.framework</artifactId>
<version>7.1.0-SNAPSHOT</version>
<properties>
Expand Down Expand Up @@ -234,7 +234,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.17.0</version>
<version>5.18.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion http/base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.17.0</version>
<version>5.18.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion http/itest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<properties>
<felix.java.version>11</felix.java.version>
<http.servlet.api.version>6.1.0</http.servlet.api.version>
<http.jetty.version>5.1.35-SNAPSHOT</http.jetty.version>
<http.jetty.version>5.1.34</http.jetty.version>
<http.jetty.id>org.apache.felix.http.jetty</http.jetty.id>
<pax.exam.version>4.13.3</pax.exam.version>
<pax.url.aether.version>2.6.14</pax.url.aether.version>
Expand Down
4 changes: 2 additions & 2 deletions http/jetty/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.17.0</version>
<version>5.18.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -597,7 +597,7 @@
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>4.2.1</version>
<version>4.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions http/jetty12/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.17.0</version>
<version>5.18.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -826,7 +826,7 @@
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>4.2.1</version>
<version>4.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions http/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<relativePath>../pom/pom.xml</relativePath>
</parent>

<name>Apache Felix Http Reactor</name>
<name>Apache Felix Http Reactor TODO remove this change</name>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http</artifactId>
<version>7-SNAPSHOT</version>
Expand All @@ -44,7 +44,7 @@
<module>inventoryprinter</module>
<module>itest</module>
<module>wrappers</module>
<module>jetty</module>
<!--<module>jetty</module>-->
<module>jetty12</module>
<module>proxy</module>
<module>samples/whiteboard</module>
Expand Down
2 changes: 1 addition & 1 deletion http/sslfilter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.17.0</version>
<version>5.18.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion http/wrappers/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.17.0</version>
<version>5.18.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion scr/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Apache Felix Declarative Services</name>
<name>Apache Felix Declarative Services TODO remove this change</name>
<description>
Implementation of the Declarative Services specification 1.5
</description>
Expand Down
2 changes: 1 addition & 1 deletion webconsole/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.17.0</version>
<version>5.18.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Loading