From 51a0b361c9e12312035b20bce22a2b8cf2a9076f Mon Sep 17 00:00:00 2001
From: Holger Friedrich <mail@holger-friedrich.de>
Date: Tue, 26 Mar 2024 00:58:54 +0100
Subject: [PATCH] Adapt to Java 21

- Add profiles j17 and j21, automatically activated based on JDK version
  unless specified.
- Upgrade SAT to 0.16.0

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
---
 pom.xml | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4bddab49ef..4779637957 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,11 +63,7 @@
 
     <karaf.version>4.4.5</karaf.version>
 
-    <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>
-
-    <sat.version>0.15.0</sat.version>
+    <sat.version>0.16.0</sat.version>
     <spotless.version>2.38.0</spotless.version>
     <!-- Eclipse Java formatter version 4.26+ does not check test files -->
     <spotless.eclipse.version>4.25</spotless.eclipse.version>
@@ -249,7 +245,7 @@
             <configuration>
               <rules>
                 <requireJavaVersion>
-                  <version>[17.0,18.0)</version>
+                  <version>[17.0,18.0),[21.0,22.0)</version>
                 </requireJavaVersion>
               </rules>
             </configuration>
@@ -319,6 +315,28 @@
         <pax.url.suffix></pax.url.suffix>
       </properties>
     </profile>
+    <profile>
+      <id>j17</id>
+      <activation>
+        <jdk>[17.0,18.0)</jdk>
+      </activation>
+      <properties>
+        <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>
+      </properties>
+    </profile>
+    <profile>
+      <id>j21</id>
+      <activation>
+        <jdk>[21.0,22.0)</jdk>
+      </activation>
+      <properties>
+        <oh.java.version>21</oh.java.version>
+        <maven.compiler.source>${oh.java.version}</maven.compiler.source>
+        <maven.compiler.target>${oh.java.version}</maven.compiler.target>
+      </properties>
+    </profile>
   </profiles>
 
 </project>