From 407c3e6265eff48ab9fd54b18bc2dafc7d45027d Mon Sep 17 00:00:00 2001 From: Holger Friedrich Date: Sat, 16 Mar 2024 22:47:09 +0100 Subject: [PATCH] Allow for compiling with Java 21 * 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 --- pom.xml | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index f9f62e97e87fc..305517eb2bf43 100644 --- a/pom.xml +++ b/pom.xml @@ -63,10 +63,6 @@ UTF-8 UTF-8 - 17 - ${oh.java.version} - ${oh.java.version} - ${oh.java.version} 4.2.0-SNAPSHOT 7.0.0 @@ -327,7 +323,7 @@ Import-Package: \\ org.eclipse.jdt ecj - 3.30.0 + 3.36.0 @@ -637,7 +633,7 @@ Import-Package: \\ - [17.0,18.0) + [17.0,18.0),[21.0,22.0) @@ -822,6 +818,23 @@ Import-Package: \\ + + j17 + + [17.0,18.0);[21.0,22.0) + + + 17 + ${oh.java.version} + + + + j21 + + 21 + ${oh.java.version} + +