From bc0e848829445e50e0603dc9c07ca928aaf51416 Mon Sep 17 00:00:00 2001
From: "Jan N. Klug" <github@klug.nrw>
Date: Thu, 2 Jun 2022 09:10:28 +0200
Subject: [PATCH 01/14] Raise source level to Java 17 (except for model
 classes)

Signed-off-by: Jan N. Klug <github@klug.nrw>
---
 bundles/pom.xml | 5 +++++
 pom.xml         | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/bundles/pom.xml b/bundles/pom.xml
index 54865d9f2b3..dcfca969248 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -192,6 +192,11 @@
           <exists>model.profile-marker</exists>
         </file>
       </activation>
+      <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.bom</groupId>
diff --git a/pom.xml b/pom.xml
index f9340dbdbac..9e42f55cb9b 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>

From 16dddb1b7be59371e7231a3476d2d902cb0baa59 Mon Sep 17 00:00:00 2001
From: "Jan N. Klug" <github@klug.nrw>
Date: Thu, 2 Jun 2022 21:46:28 +0200
Subject: [PATCH 02/14] remove Nashorn script engine

Signed-off-by: Jan N. Klug <github@klug.nrw>
---
 .../internal/NashornScriptEngineFactory.java  |  86 --------
 itests/itest-include.bndrun                   |   2 +-
 .../defaultscope/ScriptScopeOSGiTest.java     |  83 --------
 .../OH-INF/automation/jsr223/scopeFailure.js  |   5 -
 .../OH-INF/automation/jsr223/scopeWorking.js  | 194 ------------------
 5 files changed, 1 insertion(+), 369 deletions(-)
 delete mode 100644 bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/NashornScriptEngineFactory.java
 delete mode 100644 itests/org.openhab.core.automation.module.script.tests/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ScriptScopeOSGiTest.java
 delete mode 100644 itests/org.openhab.core.automation.module.script.tests/src/main/resources/OH-INF/automation/jsr223/scopeFailure.js
 delete mode 100644 itests/org.openhab.core.automation.module.script.tests/src/main/resources/OH-INF/automation/jsr223/scopeWorking.js

diff --git a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/NashornScriptEngineFactory.java b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/NashornScriptEngineFactory.java
deleted file mode 100644
index 9e1b97bba8c..00000000000
--- a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/NashornScriptEngineFactory.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * Copyright (c) 2010-2022 Contributors to the openHAB project
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package org.openhab.core.automation.module.script.internal;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import javax.script.ScriptEngine;
-import javax.script.ScriptException;
-
-import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.jdt.annotation.Nullable;
-import org.openhab.core.automation.module.script.AbstractScriptEngineFactory;
-import org.openhab.core.automation.module.script.ScriptEngineFactory;
-import org.osgi.service.component.annotations.Component;
-
-/**
- * An implementation of {@link ScriptEngineFactory} with customizations for Nashorn ScriptEngines.
- *
- * @author Simon Merschjohann - Initial contribution
- * @author Scott Rushworth - removed default methods provided by ScriptEngineFactory
- * @author Yannick Schaus - create script engines with the bundle's class loader as "app" class loader
- */
-@NonNullByDefault
-@Component(service = ScriptEngineFactory.class)
-public class NashornScriptEngineFactory extends AbstractScriptEngineFactory {
-
-    private static final String SCRIPT_TYPE = "js";
-
-    @Override
-    public List<String> getScriptTypes() {
-        List<String> scriptTypes = new ArrayList<>();
-
-        for (javax.script.ScriptEngineFactory f : ENGINE_MANAGER.getEngineFactories()) {
-            List<String> extensions = f.getExtensions();
-
-            if (extensions.contains(SCRIPT_TYPE)) {
-                scriptTypes.addAll(extensions);
-                scriptTypes.addAll(f.getMimeTypes());
-            }
-        }
-        return Collections.unmodifiableList(scriptTypes);
-    }
-
-    @Override
-    public void scopeValues(ScriptEngine scriptEngine, Map<String, Object> scopeValues) {
-        Set<String> expressions = new HashSet<>();
-
-        for (Entry<String, Object> entry : scopeValues.entrySet()) {
-            scriptEngine.put(entry.getKey(), entry.getValue());
-            if (entry.getValue() instanceof Class) {
-                expressions.add(String.format("%s = %<s.static;", entry.getKey()));
-            }
-        }
-        String scriptToEval = String.join("\n", expressions);
-        try {
-            scriptEngine.eval(scriptToEval);
-        } catch (ScriptException ex) {
-            logger.error("ScriptException while importing scope: {}", ex.getMessage());
-        }
-    }
-
-    @Override
-    public @Nullable ScriptEngine createScriptEngine(String scriptType) {
-        ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
-        Thread.currentThread().setContextClassLoader(NashornScriptEngineFactory.class.getClassLoader());
-        ScriptEngine scriptEngine = super.createScriptEngine(scriptType);
-        Thread.currentThread().setContextClassLoader(originalClassLoader);
-        return scriptEngine;
-    }
-}
diff --git a/itests/itest-include.bndrun b/itests/itest-include.bndrun
index 73aae8b0ec8..9c98d47450c 100644
--- a/itests/itest-include.bndrun
+++ b/itests/itest-include.bndrun
@@ -15,7 +15,7 @@ Test-Cases: ${classes;CONCRETE;PUBLIC;NAMED;*Test}
 -runsystempackages: sun.reflect
 
 -runfw: org.eclipse.osgi
--runee: JavaSE-11
+-runee: JavaSE-17
 
 # An unused random HTTP port is used during tests to prevent resource conflicts
 # This property is set by the build-helper-maven-plugin in the itests pom.xml
diff --git a/itests/org.openhab.core.automation.module.script.tests/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ScriptScopeOSGiTest.java b/itests/org.openhab.core.automation.module.script.tests/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ScriptScopeOSGiTest.java
deleted file mode 100644
index b67af8c1182..00000000000
--- a/itests/org.openhab.core.automation.module.script.tests/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ScriptScopeOSGiTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Copyright (c) 2010-2022 Contributors to the openHAB project
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package org.openhab.core.automation.module.script.internal.defaultscope;
-
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-
-import javax.script.ScriptEngine;
-import javax.script.ScriptException;
-
-import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.openhab.core.automation.module.script.ScriptEngineContainer;
-import org.openhab.core.automation.module.script.ScriptEngineManager;
-import org.openhab.core.test.java.JavaOSGiTest;
-
-/**
- * This tests the script modules if the Nashorn JavaScript engine is available.
- *
- * @author Kai Kreuzer - Initial contribution
- */
-@NonNullByDefault
-public class ScriptScopeOSGiTest extends JavaOSGiTest {
-
-    private static final boolean NASHORN_AVAILABLE = isNashornAvailable();
-
-    private @NonNullByDefault({}) ScriptEngine engine;
-
-    private final String path = "OH-INF/automation/jsr223/";
-    private final String workingFile = "scopeWorking.js";
-    private final String failureFile = "scopeFailure.js";
-
-    /**
-     * Returns if the Nashorn JavaScript engine is available based on the Java specification version property.
-     * Nashorn has been removed from JDK 15 and onwards.
-     *
-     * @return {@code true} if Nashorn is available, {@code false} otherwise
-     */
-    private static boolean isNashornAvailable() {
-        try {
-            String javaVersion = System.getProperty("java.specification.version");
-            return javaVersion == null ? false : Long.parseLong(javaVersion) < 15;
-        } catch (NumberFormatException e) {
-            return false;
-        }
-    }
-
-    @BeforeEach
-    public void init() {
-        assumeTrue(NASHORN_AVAILABLE);
-
-        ScriptEngineManager scriptManager = getService(ScriptEngineManager.class);
-        ScriptEngineContainer container = scriptManager.createScriptEngine("js", "myJSEngine");
-        engine = container.getScriptEngine();
-    }
-
-    @Test
-    public void testScopeDefinesItemTypes() throws ScriptException, IOException {
-        URL url = bundleContext.getBundle().getResource(path + workingFile);
-        engine.eval(new InputStreamReader(url.openStream()));
-    }
-
-    @Test
-    public void testScopeDoesNotDefineFoobar() throws ScriptException, IOException {
-        URL url = bundleContext.getBundle().getResource(path + failureFile);
-        assertThrows(ScriptException.class, () -> engine.eval(new InputStreamReader(url.openStream())));
-    }
-}
diff --git a/itests/org.openhab.core.automation.module.script.tests/src/main/resources/OH-INF/automation/jsr223/scopeFailure.js b/itests/org.openhab.core.automation.module.script.tests/src/main/resources/OH-INF/automation/jsr223/scopeFailure.js
deleted file mode 100644
index 1fe2820b333..00000000000
--- a/itests/org.openhab.core.automation.module.script.tests/src/main/resources/OH-INF/automation/jsr223/scopeFailure.js
+++ /dev/null
@@ -1,5 +0,0 @@
-'use strict';
-
-if(FOOBAR === undefined  && UnDefType.FOOBAR === undefined) {
-    throw "FOOBAR and UnDefType.FOOBAR not defined";
-}
diff --git a/itests/org.openhab.core.automation.module.script.tests/src/main/resources/OH-INF/automation/jsr223/scopeWorking.js b/itests/org.openhab.core.automation.module.script.tests/src/main/resources/OH-INF/automation/jsr223/scopeWorking.js
deleted file mode 100644
index d0cd6ba536c..00000000000
--- a/itests/org.openhab.core.automation.module.script.tests/src/main/resources/OH-INF/automation/jsr223/scopeWorking.js
+++ /dev/null
@@ -1,194 +0,0 @@
-'use strict';
-
-if(State === undefined) {
-    throw "State not defined";
-}
-
-if(Command === undefined) {
-    throw "Command not defined";
-}
-
-if(URLEncoder === undefined) {
-    throw "URLEncoder not defined";
-}
-
-if(File === undefined) {
-    throw "File not defined";
-}
-
-if(Files === undefined) {
-    throw "Files not defined";
-}
-
-if(Path === undefined) {
-    throw "Path not defined";
-}
-
-if(Paths === undefined) {
-    throw "Paths not defined";
-}
-
-//types
-if(IncreaseDecreaseType === undefined) {
-    throw "IncreaseDecreaseType not defined";
-}
-
-if(DECREASE === undefined) {
-    throw "DECREASE not defined";
-}
-
-if(INCREASE === undefined) {
-    throw "INCREASE not defined";
-}
-
-if(OnOffType === undefined) {
-    throw "OnOffType not defined";
-}
-
-if(ON === undefined) {
-    throw "OFF not defined";
-}
-
-if(OpenClosedType === undefined) {
-    throw "OpenClosedType not defined";
-}
-
-if(CLOSED === undefined) {
-    throw "CLOSED not defined";
-}
-
-if(OPEN === undefined) {
-    throw "OPEN not defined";
-}
-
-if(StopMoveType === undefined) {
-    throw "StopMoveType not defined";
-}
-
-if(MOVE === undefined) {
-    throw "MOVE not defined";
-}
-
-if(STOP === undefined) {
-    throw "STOP not defined";
-}
-
-if(UpDownType === undefined) {
-    throw "UpDownType not defined";
-}
-
-if(DOWN === undefined) {
-    throw "DOWN not defined";
-}
-
-if(UP === undefined) {
-    throw "UP not defined";
-}
-
-if(UnDefType === undefined) {
-    throw "UnDefType not defined";
-}
-
-if(NULL === undefined) {
-    throw "NULL not defined";
-}
-
-if(NextPreviousType === undefined) {
-    throw "NextPreviousType not defined";
-}
-
-if(NEXT === undefined) {
-    throw "NEXT not defined";
-}
-
-if(PREVIOUS === undefined) {
-    throw "PREVIOUS not defined";
-}
-
-if(PlayPauseType === undefined) {
-    throw "PlayPauseType not defined";
-}
-
-if(PLAY === undefined) {
-    throw "PLAY not defined";
-}
-
-if(PAUSE === undefined) {
-    throw "PAUSE not defined";
-}
-
-if(RewindFastforwardType === undefined) {
-    throw "RewindFastforwardType not defined";
-}
-
-if(REWIND === undefined) {
-    throw "REWIND not defined";
-}
-
-if(FASTFORWARD === undefined) {
-    throw "FASTFORWARD not defined";
-}
-
-if(QuantityType === undefined) {
-    throw "QuantityType not defined";
-}
-
-if(StringListType === undefined) {
-    throw "StringListType not defined";
-}
-
-if(RawType === undefined) {
-    throw "RawType not defined";
-}
-
-if(DateTimeType === undefined) {
-    throw "DateTimeType not defined";
-}
-
-if(DecimalType === undefined) {
-    throw "DecimalType not defined";
-}
-
-if(DateTimeType === undefined) {
-    throw "DateTimeType not defined";
-}
-
-if(HSBType === undefined) {
-    throw "HSBType not defined";
-}
-
-if(PercentType === undefined) {
-    throw "PercentType not defined";
-}
-
-if(PointType === undefined) {
-    throw "PointType not defined";
-}
-
-if(StringType === undefined) {
-    throw "StringType not defined";
-}
-
-if(items === undefined) {
-    throw "items not defined";
-}
-
-if(ir === undefined) {
-    throw "ir not defined";
-}
-
-if(itemRegistry === undefined) {
-    throw "itemRegistry not defined";
-}
-
-if(things === undefined) {
-    throw "things not defined";
-}
-
-if(events === undefined) {
-    throw "events not defined";
-}
-
-if(rules === undefined) {
-    throw "rules not defined";
-}

From f34dc2c5ee0c9f900a2773c1b8322dae82358c63 Mon Sep 17 00:00:00 2001
From: "Jan N. Klug" <github@klug.nrw>
Date: Fri, 3 Jun 2022 00:29:41 +0200
Subject: [PATCH 03/14] upgrade spotless and add jvm options

See https://github.com/diffplug/spotless/issues/834

Signed-off-by: Jan N. Klug <github@klug.nrw>
---
 .mvn/jvm.config |  1 +
 pom.xml         | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 .mvn/jvm.config

diff --git a/.mvn/jvm.config b/.mvn/jvm.config
new file mode 100644
index 00000000000..e2a50e08349
--- /dev/null
+++ b/.mvn/jvm.config
@@ -0,0 +1 @@
+--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 9e42f55cb9b..c13ac47d70f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,8 @@
     <sat.version>0.13.0</sat.version>
     <slf4j.version>1.7.32</slf4j.version>
     <xtext.version>2.26.0</xtext.version>
-    <spotless.version>2.0.3</spotless.version>
+    <spotless.version>2.22.5</spotless.version>
+    <spotless.eclipse.version>4.21.0</spotless.eclipse.version>
   </properties>
 
   <dependencyManagement>
@@ -538,7 +539,7 @@ Import-Package: \\
             <java>
               <eclipse>
                 <file>openhab_codestyle.xml</file>
-                <version>4.13.0</version>
+                <version>${spotless.eclipse.version}</version>
               </eclipse>
               <removeUnusedImports/>
               <importOrder>
@@ -561,7 +562,7 @@ Import-Package: \\
                   <files>
                     <file>openhab_wst_xml_files.prefs</file>
                   </files>
-                  <version>4.13.0</version>
+                  <version>${spotless.eclipse.version}</version>
                 </eclipseWtp>
                 <trimTrailingWhitespace/>
                 <endWithNewline/>
@@ -576,7 +577,7 @@ Import-Package: \\
                   <files>
                     <file>openhab_wst_feature_file.prefs</file>
                   </files>
-                  <version>4.13.0</version>
+                  <version>4.21.0</version>
                 </eclipseWtp>
                 <trimTrailingWhitespace/>
                 <endWithNewline/>
@@ -591,7 +592,7 @@ Import-Package: \\
                   <files>
                     <file>openhab_wst_pom_file.prefs</file>
                   </files>
-                  <version>4.13.0</version>
+                  <version>${spotless.eclipse.version}</version>
                 </eclipseWtp>
                 <trimTrailingWhitespace/>
                 <endWithNewline/>
@@ -648,7 +649,7 @@ Import-Package: \\
             <configuration>
               <rules>
                 <requireJavaVersion>
-                  <version>[11.0,18.0)</version>
+                  <version>[17.0,18.0)</version>
                 </requireJavaVersion>
               </rules>
             </configuration>

From ff0b3a8bb3d4fb5967c0399e9aa4b711745afb4c Mon Sep 17 00:00:00 2001
From: "Jan N. Klug" <github@klug.nrw>
Date: Fri, 3 Jun 2022 08:21:18 +0200
Subject: [PATCH 04/14] fix

Signed-off-by: Jan N. Klug <github@klug.nrw>
---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index c13ac47d70f..846053f4d3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -294,12 +294,12 @@ Import-Package: \\
             <dependency>
               <groupId>org.codehaus.plexus</groupId>
               <artifactId>plexus-compiler-eclipse</artifactId>
-              <version>2.11.1</version>
+              <version>2.12.0</version>
             </dependency>
             <dependency>
               <groupId>org.eclipse.jdt</groupId>
               <artifactId>ecj</artifactId>
-              <version>3.28.0</version>
+              <version>3.29.0</version>
             </dependency>
           </dependencies>
         </plugin>
@@ -389,7 +389,7 @@ Import-Package: \\
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.0.0-M5</version>
+          <version>3.0.0-M6</version>
           <configuration>
             <argLine>
               --add-opens java.base/java.net=ALL-UNNAMED
@@ -577,7 +577,7 @@ Import-Package: \\
                   <files>
                     <file>openhab_wst_feature_file.prefs</file>
                   </files>
-                  <version>4.21.0</version>
+                  <version>${spotless.eclipse.version}</version>
                 </eclipseWtp>
                 <trimTrailingWhitespace/>
                 <endWithNewline/>

From 1fe8651d0faf1426cdd589960cf6c3904693c5fc Mon Sep 17 00:00:00 2001
From: "Jan N. Klug" <github@klug.nrw>
Date: Fri, 3 Jun 2022 18:37:20 +0200
Subject: [PATCH 05/14] add suppression for findBugs false positive error

Signed-off-by: Jan N. Klug <github@klug.nrw>
---
 tools/static-code-analysis/spotbugs/suppressions.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/static-code-analysis/spotbugs/suppressions.xml b/tools/static-code-analysis/spotbugs/suppressions.xml
index 975781d2852..8502f7b364a 100644
--- a/tools/static-code-analysis/spotbugs/suppressions.xml
+++ b/tools/static-code-analysis/spotbugs/suppressions.xml
@@ -35,4 +35,8 @@
   <Match>
     <Bug pattern="SLF4J_SIGN_ONLY_FORMAT"/>
   </Match>
+  <Match>
+    <!-- see https://github.com/spotbugs/spotbugs/issues/1992 -->
+    <Bug pattern="SA_LOCAL_SELF_COMPARISON"/>
+  </Match>
 </FindBugsFilter>

From e11195ee2913d04d69419e7265c5da0e754494ab Mon Sep 17 00:00:00 2001
From: "Jan N. Klug" <github@klug.nrw>
Date: Fri, 9 Dec 2022 10:03:54 +0100
Subject: [PATCH 06/14] gha

Signed-off-by: Jan N. Klug <github@klug.nrw>
---
 .github/workflows/ci-build.yml | 6 +++---
 pom.xml                        | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index abfca94ff8b..22ad0b09ee5 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ '11', '17' ]
+        java: [ '17' ]
         maven: [ '3.8.6' ]
         os: [ 'ubuntu-22.04' ]
     name: Build (Java ${{ matrix.java }}, ${{ matrix.os }})
@@ -56,7 +56,7 @@ jobs:
           maven-version: ${{ matrix.maven }}
 
       - name: Register Problem Matchers
-        if: ${{ matrix.java == '11' }}
+        if: ${{ matrix.java == '17' }}
         id: problem_matchers
         run: |
           echo "::add-matcher::.github/openhab-compile-problems.json"
@@ -86,7 +86,7 @@ jobs:
           path: target/summary_report.html
 
       - name: Report SAT Errors as Annotations
-        if: ${{ matrix.java == '11' && always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }}
+        if: ${{ matrix.java == '17' && always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }}
         uses: ghys/checkstyle-github-action@main
         with:
           title: CheckStyle Violations
diff --git a/pom.xml b/pom.xml
index 846053f4d3e..9320c680cb0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,7 @@
     <sat.version>0.13.0</sat.version>
     <slf4j.version>1.7.32</slf4j.version>
     <xtext.version>2.26.0</xtext.version>
-    <spotless.version>2.22.5</spotless.version>
+    <spotless.version>2.28.0</spotless.version>
     <spotless.eclipse.version>4.21.0</spotless.eclipse.version>
   </properties>
 
@@ -294,12 +294,12 @@ Import-Package: \\
             <dependency>
               <groupId>org.codehaus.plexus</groupId>
               <artifactId>plexus-compiler-eclipse</artifactId>
-              <version>2.12.0</version>
+              <version>2.12.1</version>
             </dependency>
             <dependency>
               <groupId>org.eclipse.jdt</groupId>
               <artifactId>ecj</artifactId>
-              <version>3.29.0</version>
+              <version>3.32.0</version>
             </dependency>
           </dependencies>
         </plugin>

From d6601add55ce366949226e6c4b5792b95a4ecb09 Mon Sep 17 00:00:00 2001
From: "Jan N. Klug" <github@klug.nrw>
Date: Fri, 9 Dec 2022 11:03:02 +0100
Subject: [PATCH 07/14] doc

Signed-off-by: Jan N. Klug <github@klug.nrw>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1a81e515bdc..4cd471444e3 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ If you have not worked with Maven yet, just follow the instructions and everythi
 
 What you need before you start:
 
-- Java SE Development Kit 11
+- Java SE Development Kit 17
 - Maven 3 from https://maven.apache.org/download.html
 
 Make sure that the `mvn` command is available on your path

From accf6cb855e9b929f65cf292a8a3393f571246ba Mon Sep 17 00:00:00 2001
From: "Jan N. Klug" <github@klug.nrw>
Date: Fri, 9 Dec 2022 15:01:42 +0100
Subject: [PATCH 08/14] upgrades

Signed-off-by: Jan N. Klug <github@klug.nrw>
---
 bundles/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/pom.xml b/bundles/pom.xml
index dcfca969248..d45736fabdf 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -161,7 +161,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.1.1</version>
+        <version>3.3.0</version>
         <executions>
           <execution>
             <id>unpack-eea</id>

From f9a74abf7658ddd4603561fc39cd0bd93dc2d2b1 Mon Sep 17 00:00:00 2001
From: "Jan N. Klug" <github@klug.nrw>
Date: Fri, 16 Dec 2022 21:16:44 +0100
Subject: [PATCH 09/14] upgrade xtext to 2.29.0

Signed-off-by: Jan N. Klug <github@klug.nrw>
---
 bom/compile-model/pom.xml                     |  2 +-
 bom/compile/pom.xml                           |  2 +-
 bom/runtime/pom.xml                           |  8 ++--
 bundles/pom.xml                               |  5 ---
 .../openhab-core/src/main/feature/feature.xml |  6 +--
 .../openhab-tp/src/main/feature/feature.xml   | 38 +++++++++----------
 pom.xml                                       |  3 +-
 7 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/bom/compile-model/pom.xml b/bom/compile-model/pom.xml
index 1930b4c99db..84796ad3857 100644
--- a/bom/compile-model/pom.xml
+++ b/bom/compile-model/pom.xml
@@ -140,7 +140,7 @@
     <dependency>
       <groupId>org.eclipse.orbit.bundles</groupId>
       <artifactId>io.github.classgraph</artifactId>
-      <version>4.8.138.v20211212-1642 </version>
+      <version>4.8.149.v20220915-0556</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml
index 963818b833d..26479ce8a49 100644
--- a/bom/compile/pom.xml
+++ b/bom/compile/pom.xml
@@ -99,7 +99,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.8.9</version>
+      <version>2.9.1</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
index b88fb86072c..98821991839 100644
--- a/bom/runtime/pom.xml
+++ b/bom/runtime/pom.xml
@@ -440,7 +440,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.8.9</version>
+      <version>2.9.1</version>
       <scope>compile</scope>
     </dependency>
 
@@ -771,7 +771,7 @@
     <dependency>
       <groupId>org.eclipse.orbit.bundles</groupId>
       <artifactId>io.github.classgraph</artifactId>
-      <version>4.8.138.v20211212-1642 </version>
+      <version>4.8.149.v20220915-0556</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -878,11 +878,11 @@
       <version>${xtext.version}</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
+    <!--dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
       <scope>compile</scope>
-    </dependency>
+      </dependency -->
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm</artifactId>
diff --git a/bundles/pom.xml b/bundles/pom.xml
index d45736fabdf..eca213a2826 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -192,11 +192,6 @@
           <exists>model.profile-marker</exists>
         </file>
       </activation>
-      <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.bom</groupId>
diff --git a/features/karaf/openhab-core/src/main/feature/feature.xml b/features/karaf/openhab-core/src/main/feature/feature.xml
index d613ac90ad9..e3e87cf3c5f 100644
--- a/features/karaf/openhab-core/src/main/feature/feature.xml
+++ b/features/karaf/openhab-core/src/main/feature/feature.xml
@@ -28,7 +28,7 @@
 
 		<feature dependency="true">openhab.tp-gson</feature>
 
-		<requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.26.0)(!(version&gt;=2.27.0)))"</requirement>
+		<requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.29.0)(!(version&gt;=2.30.0)))"</requirement>
 		<feature dependency="true">openhab.tp-xtext</feature>
 
 		<requirement>openhab.tp;filter:="(feature=jax-rs-whiteboard)"</requirement>
@@ -349,10 +349,10 @@
 
 	<feature name="openhab-core-model-lsp" version="${project.version}">
 
-		<requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.26.0)(!(version&gt;=2.27.0)))"</requirement>
+		<requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.29.0)(!(version&gt;=2.30.0)))"</requirement>
 		<feature dependency="true">openhab.tp-xtext-ide</feature>
 
-		<requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.12.0)(!(version&gt;=0.13.0)))"</requirement>
+		<requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.19.0)(!(version&gt;=0.20.0)))"</requirement>
 		<feature dependency="true">openhab.tp-lsp4j</feature>
 
 		<feature>openhab-core-model-item-ide</feature>
diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml
index 321174b499b..8cbf628a6d1 100644
--- a/features/karaf/openhab-tp/src/main/feature/feature.xml
+++ b/features/karaf/openhab-tp/src/main/feature/feature.xml
@@ -54,8 +54,8 @@
 	</feature>
 
 	<feature name="openhab.tp-gson" description="Gson" version="${project.version}">
-		<capability>openhab.tp;feature=gson;version=2.8.9</capability>
-		<bundle>mvn:com.google.code.gson/gson/2.8.9</bundle>
+		<capability>openhab.tp;feature=gson;version=2.9.1</capability>
+		<bundle>mvn:com.google.code.gson/gson/2.9.1</bundle>
 	</feature>
 
 	<feature name="openhab.tp-hivemqclient" description="MQTT Client" version="${project.version}">
@@ -200,9 +200,9 @@
 	</feature>
 
 	<feature name="openhab.tp-lsp4j" description="Eclipse LSP4J" version="${project.version}">
-		<capability>openhab.tp;feature=lsp4j;version=0.12.0</capability>
-		<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.12.0</bundle>
-		<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.12.0</bundle>
+		<capability>openhab.tp;feature=lsp4j;version=0.19.0</capability>
+		<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.19.0</bundle>
+		<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.19.0</bundle>
 
 		<feature dependency="true">openhab.tp-gson</feature>
 		<feature dependency="true">openhab.tp-xtext</feature>
@@ -222,24 +222,24 @@
 	</feature>
 
 	<feature name="openhab.tp-xtext" description="Xtext - Language Engineering Made Easy" version="${project.version}">
-		<capability>openhab.tp;feature=xtext;version=2.26.0</capability>
+		<capability>openhab.tp;feature=xtext;version=2.29.0</capability>
 
-		<bundle>mvn:org.eclipse.xtext/org.eclipse.xtext/2.26.0</bundle>
+		<bundle>mvn:org.eclipse.xtext/org.eclipse.xtext/2.29.0</bundle>
 
 		<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.common/2.17.0</bundle>
 		<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore/2.20.0</bundle>
 		<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore.change/2.14.0</bundle>
 		<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore.xmi/2.16.0</bundle>
-		<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.common.types/2.26.0</bundle>
+		<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.common.types/2.29.0</bundle>
 
 		<bundle dependency="true">mvn:javax.annotation/javax.annotation-api/1.2</bundle>
 
-		<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase/2.26.0</bundle>
-		<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.lib/2.26.0</bundle>
-		<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.smap/2.26.0</bundle>
-		<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.util/2.26.0</bundle>
-		<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib/2.26.0</bundle>
-		<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/2.26.0</bundle>
+		<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase/2.29.0</bundle>
+		<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.lib/2.29.0</bundle>
+		<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.smap/2.29.0</bundle>
+		<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.util/2.29.0</bundle>
+		<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib/2.29.0</bundle>
+		<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/2.29.0</bundle>
 
 		<bundle dependency="true">mvn:com.google.guava/failureaccess/1.0.1</bundle>
 		<bundle dependency="true">mvn:com.google.guava/guava/30.1-jre</bundle>
@@ -247,7 +247,7 @@
 
 		<bundle dependency="true">mvn:org.eclipse.orbit.bundles/org.aopalliance/1.0.0.v201105210816</bundle>
 		<bundle dependency="true">mvn:org.eclipse.orbit.bundles/com.google.inject/5.0.1.v20210324-2015</bundle>
-		<bundle dependency="true">mvn:org.eclipse.orbit.bundles/io.github.classgraph/4.8.138.v20211212-1642</bundle>
+		<bundle dependency="true">mvn:org.eclipse.orbit.bundles/io.github.classgraph/4.8.149.v20220915-0556</bundle>
 		<bundle dependency="true">mvn:org.eclipse.orbit.bundles/org.antlr.runtime/3.2.0.v201101311130</bundle>
 
 		<bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.common/3.13.0</bundle>
@@ -256,16 +256,16 @@
 
 		<!-- Add ASM package -->
 		<!-- org.eclipse.xtext.common.types is using Require-Bundle -->
-		<bundle dependency="true" start-level="20">mvn:org.ow2.asm/asm/9.2</bundle>
+		<bundle dependency="true" start-level="20">mvn:org.ow2.asm/asm/9.4</bundle>
 	</feature>
 
 	<feature name="openhab.tp-xtext-ide" description="Xtext - IDE Support" version="${project.version}">
-		<capability>openhab.tp;feature=xtext-ide;version=2.26.0</capability>
+		<capability>openhab.tp;feature=xtext-ide;version=2.29.0</capability>
 		<feature dependency="true">openhab.tp-xtext</feature>
 
 		<!-- Support for the Language Server Protocol -->
-		<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.ide/2.26.0</bundle>
-		<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.ide/2.26.0</bundle>
+		<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.ide/2.29.0</bundle>
+		<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.ide/2.29.0</bundle>
 	</feature>
 
 	<feature name="openhab.tp-swagger-jaxrs" description="JAX-RS Whiteboard Swagger Support" version="${project.version}">
diff --git a/pom.xml b/pom.xml
index 9320c680cb0..247ce6d8fa4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,6 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <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>
@@ -77,7 +76,7 @@
     <karaf.tooling.version>4.3.7</karaf.tooling.version>
     <sat.version>0.13.0</sat.version>
     <slf4j.version>1.7.32</slf4j.version>
-    <xtext.version>2.26.0</xtext.version>
+    <xtext.version>2.29.0</xtext.version>
     <spotless.version>2.28.0</spotless.version>
     <spotless.eclipse.version>4.21.0</spotless.eclipse.version>
   </properties>

From 54258bed4b4c087b1e372c6e642d50e5d3efa493 Mon Sep 17 00:00:00 2001
From: "Jan N. Klug" <github@klug.nrw>
Date: Sat, 17 Dec 2022 14:13:13 +0100
Subject: [PATCH 10/14] adjust JNA

Signed-off-by: Jan N. Klug <github@klug.nrw>
---
 features/karaf/openhab-tp/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/karaf/openhab-tp/pom.xml b/features/karaf/openhab-tp/pom.xml
index 1a2b2dccf8c..0d0202a896a 100644
--- a/features/karaf/openhab-tp/pom.xml
+++ b/features/karaf/openhab-tp/pom.xml
@@ -16,7 +16,7 @@
 
   <properties>
     <jetty.version>9.4.46.v20220331</jetty.version>
-    <jna.version>5.11.0</jna.version>
+    <jna.version>5.12.1</jna.version>
   </properties>
 
   <build>

From d2b07d0650ec30bad47023e65130261b016f8f54 Mon Sep 17 00:00:00 2001
From: "Jan N. Klug" <github@klug.nrw>
Date: Sat, 17 Dec 2022 14:48:18 +0100
Subject: [PATCH 11/14] Revert "Auxiliary commit to revert individual files
 from d33a502ab966f23b8347f8819884e899e8bbbd01"

This reverts commit d27ab935f8375317f95f52539e34aec9405be623.

JVM Config not needed since spotless 2.22.8

Signed-off-by: Jan N. Klug <github@klug.nrw>
---
 .mvn/jvm.config | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 .mvn/jvm.config

diff --git a/.mvn/jvm.config b/.mvn/jvm.config
deleted file mode 100644
index e2a50e08349..00000000000
--- a/.mvn/jvm.config
+++ /dev/null
@@ -1 +0,0 @@
---add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
\ No newline at end of file

From 8f6e17c371f80f3fbac5fc12cfe527b7c4bb6ffb Mon Sep 17 00:00:00 2001
From: "Jan N. Klug" <github@klug.nrw>
Date: Sat, 17 Dec 2022 16:17:37 +0100
Subject: [PATCH 12/14] Downgrade ecj to 3.30.0

Signed-off-by: Jan N. Klug <github@klug.nrw>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 247ce6d8fa4..f3be5379272 100644
--- a/pom.xml
+++ b/pom.xml
@@ -298,7 +298,7 @@ Import-Package: \\
             <dependency>
               <groupId>org.eclipse.jdt</groupId>
               <artifactId>ecj</artifactId>
-              <version>3.32.0</version>
+              <version>3.30.0</version>
             </dependency>
           </dependencies>
         </plugin>

From 02ec96a3c5770e43207872ea44abd6efae2151ed Mon Sep 17 00:00:00 2001
From: "Jan N. Klug" <github@klug.nrw>
Date: Mon, 19 Dec 2022 13:15:26 +0100
Subject: [PATCH 13/14] address review comments and resolve itests

Signed-off-by: Jan N. Klug <github@klug.nrw>
---
 bom/runtime/pom.xml                           |  5 ----
 itests/itest-include.bndrun                   |  1 -
 .../itest.bndrun                              |  4 +--
 .../itest.bndrun                              |  4 +--
 .../itest.bndrun                              |  4 +--
 .../itest.bndrun                              |  4 +--
 .../itest.bndrun                              |  4 +--
 .../itest.bndrun                              |  4 +--
 .../itest.bndrun                              |  4 +--
 .../itest.bndrun                              |  4 +--
 .../itest.bndrun                              |  4 +--
 .../itest.bndrun                              |  4 +--
 .../itest.bndrun                              |  4 +--
 .../itest.bndrun                              |  4 +--
 .../itest.bndrun                              |  4 +--
 .../itest.bndrun                              |  4 +--
 .../itest.bndrun                              |  4 +--
 .../itest.bndrun                              |  6 ++---
 .../itest.bndrun                              | 26 ++++++++++---------
 .../itest.bndrun                              | 26 ++++++++++---------
 .../itest.bndrun                              | 26 ++++++++++---------
 .../itest.bndrun                              | 26 ++++++++++---------
 .../itest.bndrun                              | 26 ++++++++++---------
 .../itest.bndrun                              |  4 +--
 itests/org.openhab.core.tests/itest.bndrun    |  4 +--
 .../org.openhab.core.thing.tests/itest.bndrun |  4 +--
 .../itest.bndrun                              |  4 +--
 .../org.openhab.core.voice.tests/itest.bndrun |  6 ++---
 28 files changed, 114 insertions(+), 110 deletions(-)

diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
index 98821991839..6ecde06f161 100644
--- a/bom/runtime/pom.xml
+++ b/bom/runtime/pom.xml
@@ -878,11 +878,6 @@
       <version>${xtext.version}</version>
       <scope>compile</scope>
     </dependency>
-    <!--dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>compile</scope>
-      </dependency -->
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm</artifactId>
diff --git a/itests/itest-include.bndrun b/itests/itest-include.bndrun
index 9c98d47450c..443bb32c621 100644
--- a/itests/itest-include.bndrun
+++ b/itests/itest-include.bndrun
@@ -36,7 +36,6 @@ Export-Package:
 	bnd.identity;id='junit-jupiter-engine'
 
 -runproperties: \
-	nashorn.args=--no-deprecation-warning,\
 	org.ops4j.pax.logging.DefaultServiceLog.level=WARN
 
 -runvm.java9plus: \
diff --git a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
index 13ff3a6ed06..c1441984103 100644
--- a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
+++ b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
@@ -39,7 +39,6 @@ Fragment-Host: org.openhab.core.auth.oauth2client
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
-	com.google.gson;version='[2.8.9,2.8.10)',\
 	org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
 	org.eclipse.jetty.client;version='[9.4.46,9.4.47)',\
 	org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
@@ -62,4 +61,5 @@ Fragment-Host: org.openhab.core.auth.oauth2client
 	org.openhab.core.auth.oauth2client.tests;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.net;version='[4.0.0,4.0.1)',\
-	org.openhab.core.test;version='[4.0.0,4.0.1)'
+	org.openhab.core.test;version='[4.0.0,4.0.1)',\
+	com.google.gson;version='[2.9.1,2.9.2)'
diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun
index 3a567892ca5..d5cfeccd370 100644
--- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun
@@ -37,7 +37,6 @@ Fragment-Host: org.openhab.core.automation
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
-	com.google.gson;version='[2.8.9,2.8.10)',\
 	org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
 	org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
 	org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
@@ -56,4 +55,5 @@ Fragment-Host: org.openhab.core.automation
 	org.openhab.core.ephemeris;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
-	org.openhab.core.thing;version='[4.0.0,4.0.1)'
+	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
+	com.google.gson;version='[2.9.1,2.9.2)'
diff --git a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
index c66a61bc83c..0642b71dad5 100644
--- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
@@ -37,7 +37,6 @@ Fragment-Host: org.openhab.core.automation
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
-	com.google.gson;version='[2.8.9,2.8.10)',\
 	org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
 	org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
 	org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
@@ -56,4 +55,5 @@ Fragment-Host: org.openhab.core.automation
 	org.openhab.core.ephemeris;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
-	org.openhab.core.thing;version='[4.0.0,4.0.1)'
+	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
+	com.google.gson;version='[2.9.1,2.9.2)'
diff --git a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
index 8e26553c216..08e890ceb21 100644
--- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
@@ -37,7 +37,6 @@ Fragment-Host: org.openhab.core.automation.module.script
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
-	com.google.gson;version='[2.8.9,2.8.10)',\
 	org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
 	org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
 	org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
@@ -58,4 +57,5 @@ Fragment-Host: org.openhab.core.automation.module.script
 	org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
 	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
-	org.openhab.core.transform;version='[4.0.0,4.0.1)'
+	org.openhab.core.transform;version='[4.0.0,4.0.1)',\
+	com.google.gson;version='[2.9.1,2.9.2)'
diff --git a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
index 40c5ed71046..53281b1ac76 100644
--- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
@@ -37,7 +37,6 @@ Fragment-Host: org.openhab.core.automation
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
-	com.google.gson;version='[2.8.9,2.8.10)',\
 	org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
 	org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
 	org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
@@ -56,4 +55,5 @@ Fragment-Host: org.openhab.core.automation
 	org.openhab.core.ephemeris;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
-	org.openhab.core.thing;version='[4.0.0,4.0.1)'
+	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
+	com.google.gson;version='[2.9.1,2.9.2)'
diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun
index 33c8867f90f..c5501b38fa9 100644
--- a/itests/org.openhab.core.automation.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.tests/itest.bndrun
@@ -37,7 +37,6 @@ Fragment-Host: org.openhab.core.automation
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
-	com.google.gson;version='[2.8.9,2.8.10)',\
 	org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
 	org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
 	org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
@@ -56,4 +55,5 @@ Fragment-Host: org.openhab.core.automation
 	org.openhab.core.ephemeris;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
-	org.openhab.core.thing;version='[4.0.0,4.0.1)'
+	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
+	com.google.gson;version='[2.9.1,2.9.2)'
diff --git a/itests/org.openhab.core.binding.xml.tests/itest.bndrun b/itests/org.openhab.core.binding.xml.tests/itest.bndrun
index 3638a6c50d2..dd36440443b 100644
--- a/itests/org.openhab.core.binding.xml.tests/itest.bndrun
+++ b/itests/org.openhab.core.binding.xml.tests/itest.bndrun
@@ -40,7 +40,6 @@ Fragment-Host: org.openhab.core.binding.xml
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	xstream;version='[1.4.19,1.4.20)',\
-	com.google.gson;version='[2.8.9,2.8.10)',\
 	org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
 	org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
 	org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
@@ -58,4 +57,5 @@ Fragment-Host: org.openhab.core.binding.xml
 	org.openhab.core.binding.xml.tests;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.core;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.xml;version='[4.0.0,4.0.1)',\
-	org.openhab.core.test;version='[4.0.0,4.0.1)'
+	org.openhab.core.test;version='[4.0.0,4.0.1)',\
+	com.google.gson;version='[2.9.1,2.9.2)'
diff --git a/itests/org.openhab.core.config.core.tests/itest.bndrun b/itests/org.openhab.core.config.core.tests/itest.bndrun
index c68de918ded..2bb1b54a4cc 100644
--- a/itests/org.openhab.core.config.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.core.tests/itest.bndrun
@@ -41,7 +41,6 @@ Fragment-Host: org.openhab.core.config.core
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	org.mockito.junit-jupiter;version='[4.1.0,4.1.1)',\
-	com.google.gson;version='[2.8.9,2.8.10)',\
 	org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
 	org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
 	org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
@@ -56,4 +55,5 @@ Fragment-Host: org.openhab.core.config.core
 	org.openhab.core;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.core;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.core.tests;version='[4.0.0,4.0.1)',\
-	org.openhab.core.test;version='[4.0.0,4.0.1)'
+	org.openhab.core.test;version='[4.0.0,4.0.1)',\
+	com.google.gson;version='[2.9.1,2.9.2)'
diff --git a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
index 9b29beb0ea7..4a048818589 100644
--- a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
@@ -39,7 +39,6 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
 	net.bytebuddy.byte-buddy-agent;version='[1.12.1,1.12.2)',\
 	org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
 	org.objenesis;version='[3.2.0,3.2.1)',\
-	com.google.gson;version='[2.8.9,2.8.10)',\
 	org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
 	org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
 	org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
@@ -62,4 +61,5 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
 	org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.transport.mdns;version='[4.0.0,4.0.1)',\
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
-	org.openhab.core.thing;version='[4.0.0,4.0.1)'
+	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
+	com.google.gson;version='[2.9.1,2.9.2)'
diff --git a/itests/org.openhab.core.config.discovery.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.tests/itest.bndrun
index 6e92f80d40d..ffeee45ee31 100644
--- a/itests/org.openhab.core.config.discovery.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.tests/itest.bndrun
@@ -43,7 +43,6 @@ Fragment-Host: org.openhab.core.config.discovery
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	xstream;version='[1.4.19,1.4.20)',\
-	com.google.gson;version='[2.8.9,2.8.10)',\
 	org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
 	org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
 	org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
@@ -65,4 +64,5 @@ Fragment-Host: org.openhab.core.config.discovery
 	org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
 	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
-	org.openhab.core.thing.xml;version='[4.0.0,4.0.1)'
+	org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
+	com.google.gson;version='[2.9.1,2.9.2)'
diff --git a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun
index c9bef4028fa..a1312541761 100644
--- a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun
@@ -40,7 +40,6 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
-	com.google.gson;version='[2.8.9,2.8.10)',\
 	org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
 	org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
 	org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
@@ -62,4 +61,5 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
 	org.openhab.core.config.discovery.usbserial.linuxsysfs.tests;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
-	org.openhab.core.thing;version='[4.0.0,4.0.1)'
+	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
+	com.google.gson;version='[2.9.1,2.9.2)'
diff --git a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
index 0e575507e24..1767a82c1f6 100644
--- a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
@@ -49,7 +49,6 @@ Provide-Capability: \
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
-	com.google.gson;version='[2.8.9,2.8.10)',\
 	org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
 	org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
 	org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
@@ -70,4 +69,5 @@ Provide-Capability: \
 	org.openhab.core.config.discovery.usbserial.tests;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
-	org.openhab.core.thing;version='[4.0.0,4.0.1)'
+	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
+	com.google.gson;version='[2.9.1,2.9.2)'
diff --git a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
index 11ed6307438..0e1d8a106d3 100644
--- a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
@@ -35,7 +35,6 @@ Fragment-Host: org.openhab.core.config.dispatch
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
-	com.google.gson;version='[2.8.9,2.8.10)',\
 	org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
 	org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
 	org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
@@ -52,4 +51,5 @@ Fragment-Host: org.openhab.core.config.dispatch
 	org.openhab.core;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.dispatch;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.dispatch.tests;version='[4.0.0,4.0.1)',\
-	org.openhab.core.test;version='[4.0.0,4.0.1)'
+	org.openhab.core.test;version='[4.0.0,4.0.1)',\
+	com.google.gson;version='[2.9.1,2.9.2)'
diff --git a/itests/org.openhab.core.config.xml.tests/itest.bndrun b/itests/org.openhab.core.config.xml.tests/itest.bndrun
index 0263f9ac420..4cb4302e67d 100644
--- a/itests/org.openhab.core.config.xml.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.xml.tests/itest.bndrun
@@ -36,7 +36,6 @@ Fragment-Host: org.openhab.core.config.xml
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	xstream;version='[1.4.19,1.4.20)',\
-	com.google.gson;version='[2.8.9,2.8.10)',\
 	org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
 	org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
 	org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
@@ -52,4 +51,5 @@ Fragment-Host: org.openhab.core.config.xml
 	org.openhab.core.config.core;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.xml;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.xml.tests;version='[4.0.0,4.0.1)',\
-	org.openhab.core.test;version='[4.0.0,4.0.1)'
+	org.openhab.core.test;version='[4.0.0,4.0.1)',\
+	com.google.gson;version='[2.9.1,2.9.2)'
diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun
index 8bf9dfcf3cd..254909589fc 100644
--- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun
+++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun
@@ -44,7 +44,6 @@ feature.openhab-config: \
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	xstream;version='[1.4.19,1.4.20)',\
-	com.google.gson;version='[2.8.9,2.8.10)',\
 	org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
 	org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
 	org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
@@ -61,4 +60,5 @@ feature.openhab-config: \
 	org.openhab.core.config.xml;version='[4.0.0,4.0.1)',\
 	org.openhab.core.ephemeris;version='[4.0.0,4.0.1)',\
 	org.openhab.core.ephemeris.tests;version='[4.0.0,4.0.1)',\
-	org.openhab.core.test;version='[4.0.0,4.0.1)'
+	org.openhab.core.test;version='[4.0.0,4.0.1)',\
+	com.google.gson;version='[2.9.1,2.9.2)'
diff --git a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
index 5a699a2b45a..2420f73471f 100644
--- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
@@ -68,8 +68,6 @@ Fragment-Host: org.openhab.core.io.rest.core
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
-	com.google.gson;version='[2.8.9,2.8.10)',\
-	org.objectweb.asm;version='[9.2.0,9.2.1)',\
 	org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
 	org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\
 	org.apache.xbean.finder;version='[4.21.0,4.21.1)',\
@@ -101,4 +99,6 @@ Fragment-Host: org.openhab.core.io.rest.core
 	org.openhab.core.semantics;version='[4.0.0,4.0.1)',\
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
 	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
-	org.openhab.core.transform;version='[4.0.0,4.0.1)'
+	org.openhab.core.transform;version='[4.0.0,4.0.1)',\
+	com.google.gson;version='[2.9.1,2.9.2)',\
+	org.objectweb.asm;version='[9.4.0,9.4.1)'
diff --git a/itests/org.openhab.core.model.core.tests/itest.bndrun b/itests/org.openhab.core.model.core.tests/itest.bndrun
index ee83a7ca0ee..2341e223794 100644
--- a/itests/org.openhab.core.model.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.core.tests/itest.bndrun
@@ -27,7 +27,6 @@ Fragment-Host: org.openhab.core.model.core
 	org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
 	com.google.guava;version='[30.1.0,30.1.1)',\
-	org.eclipse.equinox.common;version='[3.13.0,3.13.1)',\
 	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
@@ -49,18 +48,8 @@ Fragment-Host: org.openhab.core.model.core
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
-	com.google.gson;version='[2.8.9,2.8.10)',\
 	com.google.inject;version='[5.0.1,5.0.2)',\
-	org.eclipse.xtend.lib;version='[2.26.0,2.26.1)',\
-	org.eclipse.xtend.lib.macro;version='[2.26.0,2.26.1)',\
-	org.eclipse.xtext;version='[2.26.0,2.26.1)',\
-	org.eclipse.xtext.util;version='[2.26.0,2.26.1)',\
-	org.eclipse.xtext.xbase.lib;version='[2.26.0,2.26.1)',\
-	io.github.classgraph;version='[4.8.138,4.8.139)',\
 	jollyday;version='[0.5.10,0.5.11)',\
-	org.eclipse.xtext.common.types;version='[2.26.0,2.26.1)',\
-	org.eclipse.xtext.xbase;version='[2.26.0,2.26.1)',\
-	org.objectweb.asm;version='[9.2.0,9.2.1)',\
 	org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
 	org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
 	org.threeten.extra;version='[1.5.0,1.5.1)',\
@@ -110,4 +99,17 @@ Fragment-Host: org.openhab.core.model.core
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
 	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
 	org.openhab.core.transform;version='[4.0.0,4.0.1)',\
-	org.openhab.core.voice;version='[4.0.0,4.0.1)'
+	org.openhab.core.voice;version='[4.0.0,4.0.1)',\
+	com.google.gson;version='[2.9.1,2.9.2)',\
+	io.github.classgraph;version='[4.8.149,4.8.150)',\
+	org.apache.log4j;version='[1.2.19,1.2.20)',\
+	org.eclipse.equinox.common;version='[3.16.200,3.16.201)',\
+	org.eclipse.xtend.lib;version='[2.29.0,2.29.1)',\
+	org.eclipse.xtend.lib.macro;version='[2.29.0,2.29.1)',\
+	org.eclipse.xtext;version='[2.29.0,2.29.1)',\
+	org.eclipse.xtext.common.types;version='[2.29.0,2.29.1)',\
+	org.eclipse.xtext.util;version='[2.29.0,2.29.1)',\
+	org.eclipse.xtext.xbase;version='[2.29.0,2.29.1)',\
+	org.eclipse.xtext.xbase.lib;version='[2.29.0,2.29.1)',\
+	org.objectweb.asm;version='[9.4.0,9.4.1)',\
+	org.openhab.core.model.sitemap.runtime;version='[4.0.0,4.0.1)'
diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun
index 3aeea1f4fc6..ae1db375ad2 100644
--- a/itests/org.openhab.core.model.item.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.item.tests/itest.bndrun
@@ -31,7 +31,6 @@ Fragment-Host: org.openhab.core.model.item
 	org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
 	com.google.guava;version='[30.1.0,30.1.1)',\
-	org.eclipse.equinox.common;version='[3.13.0,3.13.1)',\
 	org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
 	org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
 	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
@@ -50,17 +49,7 @@ Fragment-Host: org.openhab.core.model.item
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
-	com.google.gson;version='[2.8.9,2.8.10)',\
 	com.google.inject;version='[5.0.1,5.0.2)',\
-	io.github.classgraph;version='[4.8.138,4.8.139)',\
-	org.eclipse.xtend.lib;version='[2.26.0,2.26.1)',\
-	org.eclipse.xtend.lib.macro;version='[2.26.0,2.26.1)',\
-	org.eclipse.xtext;version='[2.26.0,2.26.1)',\
-	org.eclipse.xtext.common.types;version='[2.26.0,2.26.1)',\
-	org.eclipse.xtext.util;version='[2.26.0,2.26.1)',\
-	org.eclipse.xtext.xbase;version='[2.26.0,2.26.1)',\
-	org.eclipse.xtext.xbase.lib;version='[2.26.0,2.26.1)',\
-	org.objectweb.asm;version='[9.2.0,9.2.1)',\
 	org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\
 	org.apache.xbean.finder;version='[4.21.0,4.21.1)',\
 	org.eclipse.jetty.client;version='[9.4.46,9.4.47)',\
@@ -108,4 +97,17 @@ Fragment-Host: org.openhab.core.model.item
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
 	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
 	org.openhab.core.transform;version='[4.0.0,4.0.1)',\
-	org.openhab.core.voice;version='[4.0.0,4.0.1)'
+	org.openhab.core.voice;version='[4.0.0,4.0.1)',\
+	com.google.gson;version='[2.9.1,2.9.2)',\
+	io.github.classgraph;version='[4.8.149,4.8.150)',\
+	org.apache.log4j;version='[1.2.19,1.2.20)',\
+	org.eclipse.equinox.common;version='[3.16.200,3.16.201)',\
+	org.eclipse.xtend.lib;version='[2.29.0,2.29.1)',\
+	org.eclipse.xtend.lib.macro;version='[2.29.0,2.29.1)',\
+	org.eclipse.xtext;version='[2.29.0,2.29.1)',\
+	org.eclipse.xtext.common.types;version='[2.29.0,2.29.1)',\
+	org.eclipse.xtext.util;version='[2.29.0,2.29.1)',\
+	org.eclipse.xtext.xbase;version='[2.29.0,2.29.1)',\
+	org.eclipse.xtext.xbase.lib;version='[2.29.0,2.29.1)',\
+	org.objectweb.asm;version='[9.4.0,9.4.1)',\
+	org.openhab.core.model.sitemap.runtime;version='[4.0.0,4.0.1)'
diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun
index 79f96323bbc..2c029dba3a0 100644
--- a/itests/org.openhab.core.model.rule.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun
@@ -32,7 +32,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
 	com.google.guava;version='[30.1.0,30.1.1)',\
-	org.eclipse.equinox.common;version='[3.13.0,3.13.1)',\
 	org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
 	org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
 	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
@@ -51,17 +50,7 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
-	com.google.gson;version='[2.8.9,2.8.10)',\
 	com.google.inject;version='[5.0.1,5.0.2)',\
-	io.github.classgraph;version='[4.8.138,4.8.139)',\
-	org.eclipse.xtend.lib;version='[2.26.0,2.26.1)',\
-	org.eclipse.xtend.lib.macro;version='[2.26.0,2.26.1)',\
-	org.eclipse.xtext;version='[2.26.0,2.26.1)',\
-	org.eclipse.xtext.common.types;version='[2.26.0,2.26.1)',\
-	org.eclipse.xtext.util;version='[2.26.0,2.26.1)',\
-	org.eclipse.xtext.xbase;version='[2.26.0,2.26.1)',\
-	org.eclipse.xtext.xbase.lib;version='[2.26.0,2.26.1)',\
-	org.objectweb.asm;version='[9.2.0,9.2.1)',\
 	org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\
 	org.apache.xbean.finder;version='[4.21.0,4.21.1)',\
 	org.eclipse.jetty.client;version='[9.4.46,9.4.47)',\
@@ -109,5 +98,18 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
 	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
 	org.openhab.core.transform;version='[4.0.0,4.0.1)',\
-	org.openhab.core.voice;version='[4.0.0,4.0.1)'
+	org.openhab.core.voice;version='[4.0.0,4.0.1)',\
+	com.google.gson;version='[2.9.1,2.9.2)',\
+	io.github.classgraph;version='[4.8.149,4.8.150)',\
+	org.apache.log4j;version='[1.2.19,1.2.20)',\
+	org.eclipse.equinox.common;version='[3.16.200,3.16.201)',\
+	org.eclipse.xtend.lib;version='[2.29.0,2.29.1)',\
+	org.eclipse.xtend.lib.macro;version='[2.29.0,2.29.1)',\
+	org.eclipse.xtext;version='[2.29.0,2.29.1)',\
+	org.eclipse.xtext.common.types;version='[2.29.0,2.29.1)',\
+	org.eclipse.xtext.util;version='[2.29.0,2.29.1)',\
+	org.eclipse.xtext.xbase;version='[2.29.0,2.29.1)',\
+	org.eclipse.xtext.xbase.lib;version='[2.29.0,2.29.1)',\
+	org.objectweb.asm;version='[9.4.0,9.4.1)',\
+	org.openhab.core.model.sitemap.runtime;version='[4.0.0,4.0.1)'
 -runblacklist: bnd.identity;id='jakarta.activation-api'
diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun
index ef3d1cd158b..b72cce6855c 100644
--- a/itests/org.openhab.core.model.script.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.script.tests/itest.bndrun
@@ -34,7 +34,6 @@ Fragment-Host: org.openhab.core.model.script
 	org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
 	com.google.guava;version='[30.1.0,30.1.1)',\
-	org.eclipse.equinox.common;version='[3.13.0,3.13.1)',\
 	org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
 	org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
 	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
@@ -52,17 +51,7 @@ Fragment-Host: org.openhab.core.model.script
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
-	com.google.gson;version='[2.8.9,2.8.10)',\
 	com.google.inject;version='[5.0.1,5.0.2)',\
-	io.github.classgraph;version='[4.8.138,4.8.139)',\
-	org.eclipse.xtend.lib;version='[2.26.0,2.26.1)',\
-	org.eclipse.xtend.lib.macro;version='[2.26.0,2.26.1)',\
-	org.eclipse.xtext;version='[2.26.0,2.26.1)',\
-	org.eclipse.xtext.common.types;version='[2.26.0,2.26.1)',\
-	org.eclipse.xtext.util;version='[2.26.0,2.26.1)',\
-	org.eclipse.xtext.xbase;version='[2.26.0,2.26.1)',\
-	org.eclipse.xtext.xbase.lib;version='[2.26.0,2.26.1)',\
-	org.objectweb.asm;version='[9.2.0,9.2.1)',\
 	org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
 	org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\
 	org.apache.xbean.finder;version='[4.21.0,4.21.1)',\
@@ -110,4 +99,17 @@ Fragment-Host: org.openhab.core.model.script
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
 	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
 	org.openhab.core.transform;version='[4.0.0,4.0.1)',\
-	org.openhab.core.voice;version='[4.0.0,4.0.1)'
+	org.openhab.core.voice;version='[4.0.0,4.0.1)',\
+	com.google.gson;version='[2.9.1,2.9.2)',\
+	io.github.classgraph;version='[4.8.149,4.8.150)',\
+	org.apache.log4j;version='[1.2.19,1.2.20)',\
+	org.eclipse.equinox.common;version='[3.16.200,3.16.201)',\
+	org.eclipse.xtend.lib;version='[2.29.0,2.29.1)',\
+	org.eclipse.xtend.lib.macro;version='[2.29.0,2.29.1)',\
+	org.eclipse.xtext;version='[2.29.0,2.29.1)',\
+	org.eclipse.xtext.common.types;version='[2.29.0,2.29.1)',\
+	org.eclipse.xtext.util;version='[2.29.0,2.29.1)',\
+	org.eclipse.xtext.xbase;version='[2.29.0,2.29.1)',\
+	org.eclipse.xtext.xbase.lib;version='[2.29.0,2.29.1)',\
+	org.objectweb.asm;version='[9.4.0,9.4.1)',\
+	org.openhab.core.model.sitemap.runtime;version='[4.0.0,4.0.1)'
diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun
index 2682970122b..dafa9097001 100644
--- a/itests/org.openhab.core.model.thing.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun
@@ -33,7 +33,6 @@ Fragment-Host: org.openhab.core.model.thing
 	org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
 	com.google.guava;version='[30.1.0,30.1.1)',\
-	org.eclipse.equinox.common;version='[3.13.0,3.13.1)',\
 	org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
 	org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
 	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
@@ -59,17 +58,7 @@ Fragment-Host: org.openhab.core.model.thing
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	xstream;version='[1.4.19,1.4.20)',\
-	com.google.gson;version='[2.8.9,2.8.10)',\
 	com.google.inject;version='[5.0.1,5.0.2)',\
-	io.github.classgraph;version='[4.8.138,4.8.139)',\
-	org.eclipse.xtend.lib;version='[2.26.0,2.26.1)',\
-	org.eclipse.xtend.lib.macro;version='[2.26.0,2.26.1)',\
-	org.eclipse.xtext;version='[2.26.0,2.26.1)',\
-	org.eclipse.xtext.common.types;version='[2.26.0,2.26.1)',\
-	org.eclipse.xtext.util;version='[2.26.0,2.26.1)',\
-	org.eclipse.xtext.xbase;version='[2.26.0,2.26.1)',\
-	org.eclipse.xtext.xbase.lib;version='[2.26.0,2.26.1)',\
-	org.objectweb.asm;version='[9.2.0,9.2.1)',\
 	org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\
 	org.apache.xbean.finder;version='[4.21.0,4.21.1)',\
 	org.eclipse.jetty.client;version='[9.4.46,9.4.47)',\
@@ -121,4 +110,17 @@ Fragment-Host: org.openhab.core.model.thing
 	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
 	org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
 	org.openhab.core.transform;version='[4.0.0,4.0.1)',\
-	org.openhab.core.voice;version='[4.0.0,4.0.1)'
+	org.openhab.core.voice;version='[4.0.0,4.0.1)',\
+	com.google.gson;version='[2.9.1,2.9.2)',\
+	io.github.classgraph;version='[4.8.149,4.8.150)',\
+	org.apache.log4j;version='[1.2.19,1.2.20)',\
+	org.eclipse.equinox.common;version='[3.16.200,3.16.201)',\
+	org.eclipse.xtend.lib;version='[2.29.0,2.29.1)',\
+	org.eclipse.xtend.lib.macro;version='[2.29.0,2.29.1)',\
+	org.eclipse.xtext;version='[2.29.0,2.29.1)',\
+	org.eclipse.xtext.common.types;version='[2.29.0,2.29.1)',\
+	org.eclipse.xtext.util;version='[2.29.0,2.29.1)',\
+	org.eclipse.xtext.xbase;version='[2.29.0,2.29.1)',\
+	org.eclipse.xtext.xbase.lib;version='[2.29.0,2.29.1)',\
+	org.objectweb.asm;version='[9.4.0,9.4.1)',\
+	org.openhab.core.model.sitemap.runtime;version='[4.0.0,4.0.1)'
diff --git a/itests/org.openhab.core.storage.json.tests/itest.bndrun b/itests/org.openhab.core.storage.json.tests/itest.bndrun
index ce8406ee2b6..1f2f9cf11d9 100644
--- a/itests/org.openhab.core.storage.json.tests/itest.bndrun
+++ b/itests/org.openhab.core.storage.json.tests/itest.bndrun
@@ -35,7 +35,6 @@ Fragment-Host: org.openhab.core.storage.json
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
-	com.google.gson;version='[2.8.9,2.8.10)',\
 	org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
 	org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
 	org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
@@ -53,4 +52,5 @@ Fragment-Host: org.openhab.core.storage.json
 	org.openhab.core.storage.json;version='[4.0.0,4.0.1)',\
 	org.openhab.core.storage.json.tests;version='[4.0.0,4.0.1)',\
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
-	org.openhab.core.thing;version='[4.0.0,4.0.1)'
\ No newline at end of file
+	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
+	com.google.gson;version='[2.9.1,2.9.2)'
\ No newline at end of file
diff --git a/itests/org.openhab.core.tests/itest.bndrun b/itests/org.openhab.core.tests/itest.bndrun
index 2cc665d94d2..e2cf02b0969 100644
--- a/itests/org.openhab.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.tests/itest.bndrun
@@ -40,7 +40,6 @@ Fragment-Host: org.openhab.core
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
-	com.google.gson;version='[2.8.9,2.8.10)',\
 	org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
 	org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
 	org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
@@ -54,4 +53,5 @@ Fragment-Host: org.openhab.core
 	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	org.openhab.core;version='[4.0.0,4.0.1)',\
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
-	org.openhab.core.tests;version='[4.0.0,4.0.1)'
+	org.openhab.core.tests;version='[4.0.0,4.0.1)',\
+	com.google.gson;version='[2.9.1,2.9.2)'
diff --git a/itests/org.openhab.core.thing.tests/itest.bndrun b/itests/org.openhab.core.thing.tests/itest.bndrun
index 0a3c8878ded..b899b7ee63d 100644
--- a/itests/org.openhab.core.thing.tests/itest.bndrun
+++ b/itests/org.openhab.core.thing.tests/itest.bndrun
@@ -47,7 +47,6 @@ Fragment-Host: org.openhab.core.thing
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	xstream;version='[1.4.19,1.4.20)',\
-	com.google.gson;version='[2.8.9,2.8.10)',\
 	org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
 	org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
 	org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
@@ -67,4 +66,5 @@ Fragment-Host: org.openhab.core.thing
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
 	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
 	org.openhab.core.thing.tests;version='[4.0.0,4.0.1)',\
-	org.openhab.core.thing.xml;version='[4.0.0,4.0.1)'
+	org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
+	com.google.gson;version='[2.9.1,2.9.2)'
diff --git a/itests/org.openhab.core.thing.xml.tests/itest.bndrun b/itests/org.openhab.core.thing.xml.tests/itest.bndrun
index a93bd542cf7..ef4e1a05ba1 100644
--- a/itests/org.openhab.core.thing.xml.tests/itest.bndrun
+++ b/itests/org.openhab.core.thing.xml.tests/itest.bndrun
@@ -38,7 +38,6 @@ Fragment-Host: org.openhab.core.thing.xml
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	xstream;version='[1.4.19,1.4.20)',\
-	com.google.gson;version='[2.8.9,2.8.10)',\
 	org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
 	org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
 	org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
@@ -58,4 +57,5 @@ Fragment-Host: org.openhab.core.thing.xml
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
 	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
 	org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
-	org.openhab.core.thing.xml.tests;version='[4.0.0,4.0.1)'
+	org.openhab.core.thing.xml.tests;version='[4.0.0,4.0.1)',\
+	com.google.gson;version='[2.9.1,2.9.2)'
diff --git a/itests/org.openhab.core.voice.tests/itest.bndrun b/itests/org.openhab.core.voice.tests/itest.bndrun
index 4725095934a..c5d6aec2848 100644
--- a/itests/org.openhab.core.voice.tests/itest.bndrun
+++ b/itests/org.openhab.core.voice.tests/itest.bndrun
@@ -42,8 +42,6 @@ Fragment-Host: org.openhab.core.voice
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
-	com.google.gson;version='[2.8.9,2.8.10)',\
-	org.objectweb.asm;version='[9.2.0,9.2.1)',\
 	org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
 	org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\
 	org.apache.xbean.finder;version='[4.21.0,4.21.1)',\
@@ -71,4 +69,6 @@ Fragment-Host: org.openhab.core.voice
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
 	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
 	org.openhab.core.voice;version='[4.0.0,4.0.1)',\
-	org.openhab.core.voice.tests;version='[4.0.0,4.0.1)'
+	org.openhab.core.voice.tests;version='[4.0.0,4.0.1)',\
+	com.google.gson;version='[2.9.1,2.9.2)',\
+	org.objectweb.asm;version='[9.4.0,9.4.1)'

From 7e467de467a9f5b64370854b3efb889370ef352c Mon Sep 17 00:00:00 2001
From: "Jan N. Klug" <github@klug.nrw>
Date: Mon, 19 Dec 2022 17:13:02 +0100
Subject: [PATCH 14/14] address review comment

Signed-off-by: Jan N. Klug <github@klug.nrw>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f3be5379272..2c515755dbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -388,7 +388,7 @@ Import-Package: \\
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.0.0-M6</version>
+          <version>3.0.0-M7</version>
           <configuration>
             <argLine>
               --add-opens java.base/java.net=ALL-UNNAMED