Raise source level to Java 17 (except for model classes)

Signed-off-by: Jan N. Klug <[email protected]>
openhab · Jun 2, 2022 · e55e2c8 · e55e2c8
1 parent 2ae3137
commit e55e2c8
Show file tree

Hide file tree

Showing 23 changed files with 132 additions and 2 deletions.
diff --git a/bundles/org.openhab.core.model.core/pom.xml b/bundles/org.openhab.core.model.core/pom.xml
@@ -14,6 +14,12 @@
 
   <name>openHAB Core :: Bundles :: Model Core</name>
 
+  <properties>
+    <maven.compiler.source>${oh.model.java.version}</maven.compiler.source>
+    <maven.compiler.target>${oh.model.java.version}</maven.compiler.target>
+    <maven.compiler.compilerVersion>${oh.model.java.version}</maven.compiler.compilerVersion>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.openhab.core.bundles</groupId>

diff --git a/bundles/org.openhab.core.model.item.ide/pom.xml b/bundles/org.openhab.core.model.item.ide/pom.xml
@@ -14,6 +14,12 @@
 
   <name>openHAB Core :: Bundles :: Model Item IDE</name>
 
+  <properties>
+    <maven.compiler.source>${oh.model.java.version}</maven.compiler.source>
+    <maven.compiler.target>${oh.model.java.version}</maven.compiler.target>
+    <maven.compiler.compilerVersion>${oh.model.java.version}</maven.compiler.compilerVersion>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.openhab.core.bundles</groupId>

diff --git a/bundles/org.openhab.core.model.item.runtime/pom.xml b/bundles/org.openhab.core.model.item.runtime/pom.xml
@@ -14,6 +14,12 @@
 
   <name>openHAB Core :: Bundles :: Model Items Runtime</name>
 
+  <properties>
+    <maven.compiler.source>${oh.model.java.version}</maven.compiler.source>
+    <maven.compiler.target>${oh.model.java.version}</maven.compiler.target>
+    <maven.compiler.compilerVersion>${oh.model.java.version}</maven.compiler.compilerVersion>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.openhab.core.bundles</groupId>

diff --git a/bundles/org.openhab.core.model.item/pom.xml b/bundles/org.openhab.core.model.item/pom.xml
@@ -14,6 +14,12 @@
 
   <name>openHAB Core :: Bundles :: Model Items</name>
 
+  <properties>
+    <maven.compiler.source>${oh.model.java.version}</maven.compiler.source>
+    <maven.compiler.target>${oh.model.java.version}</maven.compiler.target>
+    <maven.compiler.compilerVersion>${oh.model.java.version}</maven.compiler.compilerVersion>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.openhab.core.bundles</groupId>

diff --git a/bundles/org.openhab.core.model.lazygen/pom.xml b/bundles/org.openhab.core.model.lazygen/pom.xml
@@ -14,4 +14,10 @@
 
   <name>openHAB Core :: Bundles :: Model Lazy Generation</name>
 
+  <properties>
+    <maven.compiler.source>${oh.model.java.version}</maven.compiler.source>
+    <maven.compiler.target>${oh.model.java.version}</maven.compiler.target>
+    <maven.compiler.compilerVersion>${oh.model.java.version}</maven.compiler.compilerVersion>
+  </properties>
+
 </project>
diff --git a/bundles/org.openhab.core.model.lsp/pom.xml b/bundles/org.openhab.core.model.lsp/pom.xml
@@ -14,6 +14,12 @@
 
   <name>openHAB Core :: Bundles :: Language Server</name>
 
+  <properties>
+    <maven.compiler.source>${oh.model.java.version}</maven.compiler.source>
+    <maven.compiler.target>${oh.model.java.version}</maven.compiler.target>
+    <maven.compiler.compilerVersion>${oh.model.java.version}</maven.compiler.compilerVersion>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.openhab.core.bundles</groupId>

diff --git a/bundles/org.openhab.core.model.persistence.ide/pom.xml b/bundles/org.openhab.core.model.persistence.ide/pom.xml
@@ -14,6 +14,12 @@
 
   <name>openHAB Core :: Bundles :: Model Persistence IDE</name>
 
+  <properties>
+    <maven.compiler.source>${oh.model.java.version}</maven.compiler.source>
+    <maven.compiler.target>${oh.model.java.version}</maven.compiler.target>
+    <maven.compiler.compilerVersion>${oh.model.java.version}</maven.compiler.compilerVersion>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.openhab.core.bundles</groupId>

diff --git a/bundles/org.openhab.core.model.persistence.runtime/pom.xml b/bundles/org.openhab.core.model.persistence.runtime/pom.xml
@@ -14,6 +14,12 @@
 
   <name>openHAB Core :: Bundles :: Model Persistence Runtime</name>
 
+  <properties>
+    <maven.compiler.source>${oh.model.java.version}</maven.compiler.source>
+    <maven.compiler.target>${oh.model.java.version}</maven.compiler.target>
+    <maven.compiler.compilerVersion>${oh.model.java.version}</maven.compiler.compilerVersion>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.openhab.core.bundles</groupId>

diff --git a/bundles/org.openhab.core.model.persistence/pom.xml b/bundles/org.openhab.core.model.persistence/pom.xml
@@ -14,6 +14,12 @@
 
   <name>openHAB Core :: Bundles :: Model Persistence</name>
 
+  <properties>
+    <maven.compiler.source>${oh.model.java.version}</maven.compiler.source>
+    <maven.compiler.target>${oh.model.java.version}</maven.compiler.target>
+    <maven.compiler.compilerVersion>${oh.model.java.version}</maven.compiler.compilerVersion>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.openhab.core.bundles</groupId>

diff --git a/bundles/org.openhab.core.model.rule.ide/pom.xml b/bundles/org.openhab.core.model.rule.ide/pom.xml
@@ -14,6 +14,12 @@
 
   <name>openHAB Core :: Bundles :: Model Rule IDE</name>
 
+  <properties>
+    <maven.compiler.source>${oh.model.java.version}</maven.compiler.source>
+    <maven.compiler.target>${oh.model.java.version}</maven.compiler.target>
+    <maven.compiler.compilerVersion>${oh.model.java.version}</maven.compiler.compilerVersion>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.openhab.core.bundles</groupId>

diff --git a/bundles/org.openhab.core.model.rule.runtime/pom.xml b/bundles/org.openhab.core.model.rule.runtime/pom.xml
@@ -14,6 +14,12 @@
 
   <name>openHAB Core :: Bundles :: Model Rules Runtime</name>
 
+  <properties>
+    <maven.compiler.source>${oh.model.java.version}</maven.compiler.source>
+    <maven.compiler.target>${oh.model.java.version}</maven.compiler.target>
+    <maven.compiler.compilerVersion>${oh.model.java.version}</maven.compiler.compilerVersion>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.openhab.core.bundles</groupId>

diff --git a/bundles/org.openhab.core.model.rule/pom.xml b/bundles/org.openhab.core.model.rule/pom.xml
@@ -14,6 +14,12 @@
 
   <name>openHAB Core :: Bundles :: Model Rules</name>
 
+  <properties>
+    <maven.compiler.source>${oh.model.java.version}</maven.compiler.source>
+    <maven.compiler.target>${oh.model.java.version}</maven.compiler.target>
+    <maven.compiler.compilerVersion>${oh.model.java.version}</maven.compiler.compilerVersion>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.openhab.core.bundles</groupId>

diff --git a/bundles/org.openhab.core.model.script.ide/pom.xml b/bundles/org.openhab.core.model.script.ide/pom.xml
@@ -14,6 +14,12 @@
 
   <name>openHAB Core :: Bundles :: Model Script IDE</name>
 
+  <properties>
+    <maven.compiler.source>${oh.model.java.version}</maven.compiler.source>
+    <maven.compiler.target>${oh.model.java.version}</maven.compiler.target>
+    <maven.compiler.compilerVersion>${oh.model.java.version}</maven.compiler.compilerVersion>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.openhab.core.bundles</groupId>

diff --git a/bundles/org.openhab.core.model.script.runtime/pom.xml b/bundles/org.openhab.core.model.script.runtime/pom.xml
@@ -14,6 +14,12 @@
 
   <name>openHAB Core :: Bundles :: Model Script Runtime</name>
 
+  <properties>
+    <maven.compiler.source>${oh.model.java.version}</maven.compiler.source>
+    <maven.compiler.target>${oh.model.java.version}</maven.compiler.target>
+    <maven.compiler.compilerVersion>${oh.model.java.version}</maven.compiler.compilerVersion>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.openhab.core.bundles</groupId>

diff --git a/bundles/org.openhab.core.model.script/pom.xml b/bundles/org.openhab.core.model.script/pom.xml
@@ -14,6 +14,12 @@
 
   <name>openHAB Core :: Bundles :: Model Script</name>
 
+  <properties>
+    <maven.compiler.source>${oh.model.java.version}</maven.compiler.source>
+    <maven.compiler.target>${oh.model.java.version}</maven.compiler.target>
+    <maven.compiler.compilerVersion>${oh.model.java.version}</maven.compiler.compilerVersion>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.openhab.core.bundles</groupId>

diff --git a/bundles/org.openhab.core.model.sitemap.ide/pom.xml b/bundles/org.openhab.core.model.sitemap.ide/pom.xml
@@ -14,6 +14,12 @@
 
   <name>openHAB Core :: Bundles :: Model Sitemap IDE</name>
 
+  <properties>
+    <maven.compiler.source>${oh.model.java.version}</maven.compiler.source>
+    <maven.compiler.target>${oh.model.java.version}</maven.compiler.target>
+    <maven.compiler.compilerVersion>${oh.model.java.version}</maven.compiler.compilerVersion>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.openhab.core.bundles</groupId>

diff --git a/bundles/org.openhab.core.model.sitemap.runtime/pom.xml b/bundles/org.openhab.core.model.sitemap.runtime/pom.xml
@@ -14,6 +14,12 @@
 
   <name>openHAB Core :: Bundles :: Model Sitemap Runtime</name>
 
+  <properties>
+    <maven.compiler.source>${oh.model.java.version}</maven.compiler.source>
+    <maven.compiler.target>${oh.model.java.version}</maven.compiler.target>
+    <maven.compiler.compilerVersion>${oh.model.java.version}</maven.compiler.compilerVersion>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.openhab.core.bundles</groupId>

diff --git a/bundles/org.openhab.core.model.sitemap/pom.xml b/bundles/org.openhab.core.model.sitemap/pom.xml
@@ -14,6 +14,12 @@
 
   <name>openHAB Core :: Bundles :: Model Sitemap</name>
 
+  <properties>
+    <maven.compiler.source>${oh.model.java.version}</maven.compiler.source>
+    <maven.compiler.target>${oh.model.java.version}</maven.compiler.target>
+    <maven.compiler.compilerVersion>${oh.model.java.version}</maven.compiler.compilerVersion>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.openhab.core.bundles</groupId>

diff --git a/bundles/org.openhab.core.model.thing.ide/pom.xml b/bundles/org.openhab.core.model.thing.ide/pom.xml
@@ -14,6 +14,12 @@
 
   <name>openHAB Core :: Bundles :: Model Thing IDE</name>
 
+  <properties>
+    <maven.compiler.source>${oh.model.java.version}</maven.compiler.source>
+    <maven.compiler.target>${oh.model.java.version}</maven.compiler.target>
+    <maven.compiler.compilerVersion>${oh.model.java.version}</maven.compiler.compilerVersion>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.openhab.core.bundles</groupId>

diff --git a/bundles/org.openhab.core.model.thing.runtime/pom.xml b/bundles/org.openhab.core.model.thing.runtime/pom.xml
@@ -14,6 +14,12 @@
 
   <name>openHAB Core :: Bundles :: Model Thing Runtime</name>
 
+  <properties>
+    <maven.compiler.source>${oh.model.java.version}</maven.compiler.source>
+    <maven.compiler.target>${oh.model.java.version}</maven.compiler.target>
+    <maven.compiler.compilerVersion>${oh.model.java.version}</maven.compiler.compilerVersion>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.openhab.core.bundles</groupId>

diff --git a/bundles/org.openhab.core.model.thing/pom.xml b/bundles/org.openhab.core.model.thing/pom.xml
@@ -14,6 +14,12 @@
 
   <name>openHAB Core :: Bundles :: Model Thing</name>
 
+  <properties>
+    <maven.compiler.source>${oh.model.java.version}</maven.compiler.source>
+    <maven.compiler.target>${oh.model.java.version}</maven.compiler.target>
+    <maven.compiler.compilerVersion>${oh.model.java.version}</maven.compiler.compilerVersion>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.openhab.core.bundles</groupId>

diff --git a/pom.xml b/pom.xml
@@ -64,7 +64,8 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <oh.java.version>11</oh.java.version>
+    <oh.java.version>17</oh.java.version>
+    <oh.model.java.version>11</oh.model.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>
@@ -547,7 +548,7 @@ Import-Package: \\
         <plugin>
           <groupId>org.openhab.core.tools</groupId>
           <artifactId>i18n-maven-plugin</artifactId>
-          <version>3.2.0</version>
+          <version>3.3.0-SNAPSHOT</version>
         </plugin>
 
         <plugin>

diff --git a/tools/i18n-plugin/pom.xml b/tools/i18n-plugin/pom.xml
@@ -23,6 +23,9 @@
     <maven.plugin.annotations.version>3.6.0</maven.plugin.annotations.version>
     <maven.plugin.plugin.version>3.6.4</maven.plugin.plugin.version>
     <maven.plugin.compiler.version>3.8.1</maven.plugin.compiler.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>
   </properties>
 
   <dependencies>