Skip to content

Commit 17a84ee

Browse files
Upgrade to Java 21 (#535)
- Allow compilation with Java 21 and 25 - Upgrade plugins previously blocked by Java 11 requirement - Upgrade versions to 1.0.0-SNAPSHOT Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
1 parent 986c835 commit 17a84ee

File tree

10 files changed

+20
-22
lines changed

10 files changed

+20
-22
lines changed

.github/workflows/ci-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
java: [ '11' ]
21+
java: [ '21', '25' ]
2222
os: [ 'ubuntu-24.04' ]
2323
name: Build (Java ${{ matrix.java }}, ${{ matrix.os }})
2424
runs-on: ${{ matrix.os }}
@@ -67,7 +67,7 @@ jobs:
6767
path: build.log
6868

6969
- name: Upload SAT Summary Report
70-
if: ${{ always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }}
70+
if: ${{ always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) && (matrix.java == '21') }}
7171
uses: actions/upload-artifact@v6
7272
with:
7373
name: sat-summary-report

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ on:
1010
workflow_dispatch:
1111
inputs:
1212
release_version:
13-
description: 'Release version (e.g., 0.18.0)'
13+
description: 'Release version (e.g., 1.0.0)'
1414
required: true
1515
type: string
1616
next_snapshot_version:
17-
description: 'Next snapshot version (e.g., 0.19.0-SNAPSHOT)'
17+
description: 'Next snapshot version (e.g., 1.1.0-SNAPSHOT)'
1818
required: true
1919
type: string
2020

@@ -30,10 +30,10 @@ jobs:
3030
token: ${{ secrets.GITHUB_TOKEN }}
3131
fetch-depth: 0
3232

33-
- name: Set up JDK 11
33+
- name: Set up JDK 21
3434
uses: actions/setup-java@v5
3535
with:
36-
java-version: 11
36+
java-version: 21
3737
distribution: 'temurin'
3838
cache: maven
3939
server-id: maven

codestyle/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.openhab.tools.sat</groupId>
99
<artifactId>pom</artifactId>
10-
<version>0.19.0-SNAPSHOT</version>
10+
<version>1.0.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<groupId>org.openhab.tools</groupId>

custom-checks/checkstyle/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.openhab.tools.sat.custom-checks</groupId>
99
<artifactId>pom</artifactId>
10-
<version>0.19.0-SNAPSHOT</version>
10+
<version>1.0.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>checkstyle</artifactId>

custom-checks/findbugs/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.openhab.tools.sat.custom-checks</groupId>
99
<artifactId>pom</artifactId>
10-
<version>0.19.0-SNAPSHOT</version>
10+
<version>1.0.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>findbugs</artifactId>

custom-checks/pmd/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.openhab.tools.sat.custom-checks</groupId>
99
<artifactId>pom</artifactId>
10-
<version>0.19.0-SNAPSHOT</version>
10+
<version>1.0.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>pmd</artifactId>

custom-checks/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.openhab.tools.sat</groupId>
99
<artifactId>pom</artifactId>
10-
<version>0.19.0-SNAPSHOT</version>
10+
<version>1.0.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<groupId>org.openhab.tools.sat.custom-checks</groupId>

pom.xml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>org.openhab.tools.sat</groupId>
77
<artifactId>pom</artifactId>
8-
<version>0.19.0-SNAPSHOT</version>
8+
<version>1.0.0-SNAPSHOT</version>
99
<packaging>pom</packaging>
1010

1111
<name>Static Code Analysis Tool Parent POM</name>
@@ -56,7 +56,7 @@
5656

5757
<properties>
5858
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
59-
<oh.java.version>11</oh.java.version>
59+
<oh.java.version>21</oh.java.version>
6060
<maven.compiler.release>${oh.java.version}</maven.compiler.release>
6161
<maven.eclipse.version>2.10</maven.eclipse.version>
6262
<junit.version>5.11.4</junit.version>
@@ -67,7 +67,7 @@
6767
<pmd.version>7.19.0</pmd.version>
6868
<checkstyle.version>10.26.1</checkstyle.version>
6969
<spotbugs.version>4.9.8</spotbugs.version>
70-
<maven.core.version>3.9.11</maven.core.version>
70+
<maven.core.version>3.9.12</maven.core.version>
7171
<maven.plugin.api.version>3.9.12</maven.plugin.api.version>
7272
<maven.plugin.annotations.version>3.15.2</maven.plugin.annotations.version>
7373
<maven.plugin.plugin.version>3.15.2</maven.plugin.plugin.version>
@@ -399,14 +399,12 @@
399399
<dependency>
400400
<groupId>org.codehaus.plexus</groupId>
401401
<artifactId>plexus-compiler-eclipse</artifactId>
402-
<!-- cannot go beyond 2.12.1 as long as Java11 is in use -->
403-
<version>2.12.1</version>
402+
<version>2.16.1</version>
404403
</dependency>
405404
<dependency>
406405
<groupId>org.eclipse.jdt</groupId>
407406
<artifactId>ecj</artifactId>
408-
<!-- cannot go beyond 3.33.0 as long as Java11 is in use -->
409-
<version>3.33.0</version>
407+
<version>3.43.0</version>
410408
</dependency>
411409
</dependencies>
412410
</plugin>
@@ -432,7 +430,7 @@
432430
<artifactId>maven-javadoc-plugin</artifactId>
433431
<version>3.12.0</version>
434432
<configuration>
435-
<source>11</source>
433+
<source>21</source>
436434
<outputDirectory>${project.build.directory}/javadoc</outputDirectory>
437435
<doclint>all,-missing</doclint>
438436
<failOnError>true</failOnError>
@@ -461,7 +459,7 @@
461459
<version>3.6.3</version>
462460
</requireMavenVersion>
463461
<requireJavaVersion>
464-
<version>[11.0,12.0)</version>
462+
<version>[21.0,22.0),[25.0,26.0)</version>
465463
</requireJavaVersion>
466464
</rules>
467465
</configuration>

sat-extension/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.openhab.tools.sat</groupId>
99
<artifactId>pom</artifactId>
10-
<version>0.19.0-SNAPSHOT</version>
10+
<version>1.0.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>sat-extension</artifactId>

sat-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.openhab.tools.sat</groupId>
99
<artifactId>pom</artifactId>
10-
<version>0.19.0-SNAPSHOT</version>
10+
<version>1.0.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>sat-plugin</artifactId>

0 commit comments

Comments
 (0)