Remove Java 17 build, switch to 21 (#4483)

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
This commit is contained in:
Holger Friedrich 2024-12-15 20:36:45 +01:00 committed by GitHub
parent 8d837f9823
commit c2d8392668
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 33 deletions

View File

@ -18,7 +18,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
java: [ '17', '21', 'profile-j21' ] java: [ '21' ]
maven: [ '3.9.9' ] maven: [ '3.9.9' ]
os: [ 'ubuntu-24.04' ] os: [ 'ubuntu-24.04' ]
name: Build (Java ${{ matrix.java }}, ${{ matrix.os }}) name: Build (Java ${{ matrix.java }}, ${{ matrix.os }})
@ -46,18 +46,10 @@ jobs:
- name: Set up Java ${{ matrix.java }} - name: Set up Java ${{ matrix.java }}
uses: actions/setup-java@v4 uses: actions/setup-java@v4
if: ${{ matrix.java != 'profile-j21' }}
with: with:
distribution: 'temurin' distribution: 'temurin'
java-version: ${{ matrix.java }} java-version: ${{ matrix.java }}
- name: Set up Java ${{ matrix.java }}
uses: actions/setup-java@v4
if: ${{ matrix.java == 'profile-j21' }}
with:
distribution: 'temurin'
java-version: ${{ 21 }}
- name: Set up Maven ${{ matrix.maven }} - name: Set up Maven ${{ matrix.maven }}
uses: stCarolas/setup-maven@v5 uses: stCarolas/setup-maven@v5
with: with:
@ -70,7 +62,6 @@ jobs:
echo "::add-matcher::.github/openhab-compile-problems.json" echo "::add-matcher::.github/openhab-compile-problems.json"
- name: Build - name: Build
if: ${{ matrix.java != 'profile-j21' }}
id: build id: build
run: './.github/scripts/maven-build' run: './.github/scripts/maven-build'
env: env:
@ -80,33 +71,22 @@ jobs:
-Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.httpconnectionManager.ttlSeconds=25
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
- name: Build
if: ${{ matrix.java == 'profile-j21' }}
id: build-j21
run: './.github/scripts/maven-build clean verify -B -T 1.5C -U -Pj21'
env:
MAVEN_OPTS: >-
-Xmx2g
-Dmaven.wagon.http.retryHandler.count=5
-Dmaven.wagon.httpconnectionManager.ttlSeconds=25
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
- name: Upload Build Log - name: Upload Build Log
if: ${{ always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure') || (steps.build-j21.outcome == 'success') || (steps.build-j21.outcome == 'failure')) }} if: ${{ always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }}
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: build-log-java-${{ matrix.java }}-${{ matrix.os }} name: build-log-java-${{ matrix.java }}-${{ matrix.os }}
path: build.log path: build.log
- name: Upload SAT Summary Report - name: Upload SAT Summary Report
if: ${{ matrix.java == '17' && always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }} if: ${{ always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }}
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: sat-summary-report name: sat-summary-report
path: target/summary_report.html path: target/summary_report.html
- name: Report SAT Errors as Annotations - name: Report SAT Errors as Annotations
if: ${{ matrix.java == '17' && always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }} if: ${{ matrix.java == '21' && always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }}
uses: ghys/checkstyle-github-action@main uses: ghys/checkstyle-github-action@main
with: with:
title: CheckStyle Violations title: CheckStyle Violations

View File

@ -23,7 +23,7 @@ If you have not worked with Maven yet, just follow the instructions and everythi
What you need before you start: What you need before you start:
- Java SE Development Kit 17 - Java SE Development Kit 21
- Maven 3 from https://maven.apache.org/download.html - Maven 3 from https://maven.apache.org/download.html
Make sure that the `mvn` command is available on your path Make sure that the `mvn` command is available on your path

10
pom.xml
View File

@ -64,7 +64,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.release>17</maven.compiler.release> <maven.compiler.release>21</maven.compiler.release>
<bnd.version>7.1.0</bnd.version> <bnd.version>7.1.0</bnd.version>
<commons.net.version>3.7.2</commons.net.version> <commons.net.version>3.7.2</commons.net.version>
@ -669,7 +669,7 @@ Import-Package: \\
<version>3.6.3</version> <version>3.6.3</version>
</requireMavenVersion> </requireMavenVersion>
<requireJavaVersion> <requireJavaVersion>
<version>[17.0,18.0),[21.0,22.0)</version> <version>[21.0,22.0)</version>
</requireJavaVersion> </requireJavaVersion>
</rules> </rules>
</configuration> </configuration>
@ -844,11 +844,5 @@ Import-Package: \\
</pluginManagement> </pluginManagement>
</build> </build>
</profile> </profile>
<profile>
<id>j21</id>
<properties>
<maven.compiler.release>21</maven.compiler.release>
</properties>
</profile>
</profiles> </profiles>
</project> </project>