use maven.compiler.release instead of source and target

Signed-off-by: Holger Friedrich <[email protected]>
openhab · Mar 26, 2024 · f661b01 · f661b01
1 parent 51a0b36
commit f661b01
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/launch/app/pom.xml b/launch/app/pom.xml
@@ -14,9 +14,6 @@
   <properties>
     <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>
     <bnd.version>7.0.0</bnd.version>
   </properties>
 
@@ -383,6 +380,26 @@
         </pluginManagement>
       </build>
     </profile>
+    <profile>
+      <id>j17</id>
+      <activation>
+        <jdk>[17.0,18.0)</jdk>
+      </activation>
+      <properties>
+        <oh.java.version>17</oh.java.version>
+        <maven.compiler.release>${oh.java.version}</maven.compiler.release>
+      </properties>
+    </profile>
+    <profile>
+      <id>j21</id>
+      <activation>
+        <jdk>[21.0,22.0)</jdk>
+      </activation>
+      <properties>
+        <oh.java.version>21</oh.java.version>
+        <maven.compiler.release>${oh.java.version}</maven.compiler.release>
+      </properties>
+    </profile>
   </profiles>
 
 </project>
diff --git a/pom.xml b/pom.xml
@@ -322,8 +322,7 @@
       </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>
+        <maven.compiler.release>${oh.java.version}</maven.compiler.release>
       </properties>
     </profile>
     <profile>
@@ -333,8 +332,7 @@
       </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>
+        <maven.compiler.release>${oh.java.version}</maven.compiler.release>
       </properties>
     </profile>
   </profiles>