Skip to content

Commit 730ab97

Browse files
Allow for compiling with Java 21 (#2517)
* Support Java 17 and 21, default compilation to Java 17 class files * Add profile "j21" to compile to Java 21 class files * Bump ecj to 3.36.0 * Upgrade SAT to 0.16.0 Refs: openhab/openhab-distro#1590 Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
1 parent 0449e51 commit 730ab97

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

pom.xml

+11-6
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,14 @@
6363
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6464
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
6565
<oh.java.version>17</oh.java.version>
66-
<maven.compiler.source>${oh.java.version}</maven.compiler.source>
67-
<maven.compiler.target>${oh.java.version}</maven.compiler.target>
68-
<maven.compiler.compilerVersion>${oh.java.version}</maven.compiler.compilerVersion>
66+
<maven.compiler.release>${oh.java.version}</maven.compiler.release>
6967

7068
<bnd.version>7.0.0</bnd.version>
7169
<eea.version>2.3.0</eea.version>
7270
<jackson.version>2.16.0</jackson.version>
7371
<karaf.version>4.4.5</karaf.version>
7472
<ohc.version>4.2.0-SNAPSHOT</ohc.version>
75-
<sat.version>0.15.0</sat.version>
73+
<sat.version>0.16.0</sat.version>
7674
<spotless.version>2.38.0</spotless.version>
7775
<!-- Eclipse Java formatter version 4.26+ does not check test files -->
7876
<spotless.eclipse.version>4.25</spotless.eclipse.version>
@@ -266,7 +264,7 @@ Import-Package: \\
266264
<dependency>
267265
<groupId>org.eclipse.jdt</groupId>
268266
<artifactId>ecj</artifactId>
269-
<version>3.30.0</version>
267+
<version>3.36.0</version>
270268
</dependency>
271269
</dependencies>
272270
</plugin>
@@ -592,7 +590,7 @@ Import-Package: \\
592590
<configuration>
593591
<rules>
594592
<requireJavaVersion>
595-
<version>[17.0,18.0)</version>
593+
<version>[17.0,18.0),[21.0,22.0)</version>
596594
</requireJavaVersion>
597595
</rules>
598596
</configuration>
@@ -715,6 +713,13 @@ Import-Package: \\
715713
</plugins>
716714
</build>
717715
</profile>
716+
<profile>
717+
<id>j21</id>
718+
<properties>
719+
<oh.java.version>21</oh.java.version>
720+
<maven.compiler.release>${oh.java.version}</maven.compiler.release>
721+
</properties>
722+
</profile>
718723
</profiles>
719724

720725
</project>

0 commit comments

Comments
 (0)