From 62d9c03f77fc4903390a05d8cb79f8dd08cf3e99 Mon Sep 17 00:00:00 2001
From: Holger Friedrich <mail@holger-friedrich.de>
Date: Mon, 1 Apr 2024 13:58:56 +0200
Subject: [PATCH] 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>
---
 pom.xml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index f9f62e97e87fc..271e82aec9d4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,9 +64,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <oh.java.version>17</oh.java.version>
-    <maven.compiler.source>${oh.java.version}</maven.compiler.source>
-    <maven.compiler.target>${oh.java.version}</maven.compiler.target>
-    <maven.compiler.compilerVersion>${oh.java.version}</maven.compiler.compilerVersion>
+    <maven.compiler.release>${oh.java.version}</maven.compiler.release>
 
     <ohc.version>4.2.0-SNAPSHOT</ohc.version>
     <bnd.version>7.0.0</bnd.version>
@@ -327,7 +325,7 @@ Import-Package: \\
             <dependency>
               <groupId>org.eclipse.jdt</groupId>
               <artifactId>ecj</artifactId>
-              <version>3.30.0</version>
+              <version>3.36.0</version>
             </dependency>
           </dependencies>
         </plugin>
@@ -637,7 +635,7 @@ Import-Package: \\
             <configuration>
               <rules>
                 <requireJavaVersion>
-                  <version>[17.0,18.0)</version>
+                  <version>[17.0,18.0),[21.0,22.0)</version>
                 </requireJavaVersion>
               </rules>
             </configuration>
@@ -822,6 +820,13 @@ Import-Package: \\
         </pluginManagement>
       </build>
     </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>
 
 </project>