Allow for compiling with Java 21 (#16594)

* 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

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
pull/16603/head
Holger Friedrich 2024-04-01 13:58:56 +02:00 committed by GitHub
parent b4f973608f
commit b3ba1dfb0e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 5 deletions

15
pom.xml
View File

@ -64,9 +64,7 @@
<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>17</oh.java.version>
<maven.compiler.source>${oh.java.version}</maven.compiler.source> <maven.compiler.release>${oh.java.version}</maven.compiler.release>
<maven.compiler.target>${oh.java.version}</maven.compiler.target>
<maven.compiler.compilerVersion>${oh.java.version}</maven.compiler.compilerVersion>
<ohc.version>4.2.0-SNAPSHOT</ohc.version> <ohc.version>4.2.0-SNAPSHOT</ohc.version>
<bnd.version>7.0.0</bnd.version> <bnd.version>7.0.0</bnd.version>
@ -327,7 +325,7 @@ Import-Package: \\
<dependency> <dependency>
<groupId>org.eclipse.jdt</groupId> <groupId>org.eclipse.jdt</groupId>
<artifactId>ecj</artifactId> <artifactId>ecj</artifactId>
<version>3.30.0</version> <version>3.36.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>
@ -637,7 +635,7 @@ Import-Package: \\
<configuration> <configuration>
<rules> <rules>
<requireJavaVersion> <requireJavaVersion>
<version>[17.0,18.0)</version> <version>[17.0,18.0),[21.0,22.0)</version>
</requireJavaVersion> </requireJavaVersion>
</rules> </rules>
</configuration> </configuration>
@ -822,6 +820,13 @@ Import-Package: \\
</pluginManagement> </pluginManagement>
</build> </build>
</profile> </profile>
<profile>
<id>j21</id>
<properties>
<oh.java.version>21</oh.java.version>
<maven.compiler.release>${oh.java.version}</maven.compiler.release>
</properties>
</profile>
</profiles> </profiles>
</project> </project>