diff --git a/bundles/org.openhab.core.model.core/pom.xml b/bundles/org.openhab.core.model.core/pom.xml
index 1a2534d6cc9..23c876f2b6d 100644
--- 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
index 928b35f4bdd..a06f1885ec7 100644
--- 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
index 7f0f540e532..2c6ae054ddb 100644
--- 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
index 8a630542e7f..ac7eea0836f 100644
--- 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
index 07a1f777f9f..1522b7a0d7b 100644
--- 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
index 627139702b0..a7eae9e92ba 100644
--- 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
index 817b5f03398..2eb1f9d5faa 100644
--- 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
index e81ac29ded3..03b05522c9b 100644
--- 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
index f56b892d5eb..c49b270a3f5 100644
--- 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
index baf3264b71d..a48fcb15368 100644
--- 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
index 3b2d7e50cbf..882fdcd0510 100644
--- 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
index 8088eae6c5c..6b295d8c9af 100644
--- 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
index 79e7f8f8d55..fae73eb3fd9 100644
--- 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
index ef8cb4f2573..5f7bfedc525 100644
--- 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
index 1a7d956faed..4fcce3ed49c 100644
--- 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
index f6f9aae8164..5a71508965e 100644
--- 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
index 5cc24f1e79e..ff24992b1f0 100644
--- 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
index 1aafb41274f..a30fbb6e3c5 100644
--- 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
index a4ee8a370d9..5c4f9e743ef 100644
--- 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
index d2e81a22143..3d22d7cd81d 100644
--- 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
index e6a19a04f89..1ab541e2a47 100644
--- 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
index 58dffbf005b..cd975996f69 100644
--- 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
index 0afe5627ec7..708916de27a 100644
--- 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>