mirror of
https://github.com/openhab/openhab-addons.git
synced 2025-01-10 07:02:02 +01:00
Remove Java 17 build, switch to 21 (#17910)
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
This commit is contained in:
parent
639a1cb263
commit
9544767641
31
.github/workflows/ci-build.yml
vendored
31
.github/workflows/ci-build.yml
vendored
@ -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,25 +46,17 @@ 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:
|
||||||
maven-version: ${{ matrix.maven }}
|
maven-version: ${{ matrix.maven }}
|
||||||
|
|
||||||
- name: Register Problem Matchers
|
- name: Register Problem Matchers
|
||||||
if: ${{ matrix.java == '17' }}
|
if: ${{ matrix.java == '21' }}
|
||||||
id: problem_matchers
|
id: problem_matchers
|
||||||
run: |
|
run: |
|
||||||
echo "::add-matcher::.github/openhab-compile-problems.json"
|
echo "::add-matcher::.github/openhab-compile-problems.json"
|
||||||
@ -77,7 +69,6 @@ jobs:
|
|||||||
format: 'csv'
|
format: 'csv'
|
||||||
|
|
||||||
- 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:
|
||||||
@ -88,34 +79,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:
|
|
||||||
CHANGED_FILES: ${{ steps.files.outputs.all }}
|
|
||||||
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
|
||||||
|
8
pom.xml
8
pom.xml
@ -63,7 +63,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>
|
||||||
<oh.java.version>17</oh.java.version>
|
<oh.java.version>21</oh.java.version>
|
||||||
<maven.compiler.release>${oh.java.version}</maven.compiler.release>
|
<maven.compiler.release>${oh.java.version}</maven.compiler.release>
|
||||||
|
|
||||||
<ohc.version>5.0.0-SNAPSHOT</ohc.version>
|
<ohc.version>5.0.0-SNAPSHOT</ohc.version>
|
||||||
@ -639,7 +639,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>
|
||||||
@ -825,9 +825,9 @@ Import-Package: \\
|
|||||||
</build>
|
</build>
|
||||||
</profile>
|
</profile>
|
||||||
<profile>
|
<profile>
|
||||||
<id>j21</id>
|
<id>j17</id>
|
||||||
<properties>
|
<properties>
|
||||||
<oh.java.version>21</oh.java.version>
|
<oh.java.version>17</oh.java.version>
|
||||||
<maven.compiler.release>${oh.java.version}</maven.compiler.release>
|
<maven.compiler.release>${oh.java.version}</maven.compiler.release>
|
||||||
</properties>
|
</properties>
|
||||||
</profile>
|
</profile>
|
||||||
|
Loading…
Reference in New Issue
Block a user