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/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
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 @@
org.eclipse.orbit.bundles
io.github.classgraph
- 4.8.138.v20211212-1642
+ 4.8.149.v20220915-0556
compile
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 @@
com.google.code.gson
gson
- 2.8.9
+ 2.9.1
compile
diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
index b88fb86072c..6ecde06f161 100644
--- a/bom/runtime/pom.xml
+++ b/bom/runtime/pom.xml
@@ -440,7 +440,7 @@
com.google.code.gson
gson
- 2.8.9
+ 2.9.1
compile
@@ -771,7 +771,7 @@
org.eclipse.orbit.bundles
io.github.classgraph
- 4.8.138.v20211212-1642
+ 4.8.149.v20220915-0556
compile
@@ -878,11 +878,6 @@
${xtext.version}
compile
-
- log4j
- log4j
- compile
-
org.ow2.asm
asm
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 getScriptTypes() {
- List scriptTypes = new ArrayList<>();
-
- for (javax.script.ScriptEngineFactory f : ENGINE_MANAGER.getEngineFactories()) {
- List 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 scopeValues) {
- Set expressions = new HashSet<>();
-
- for (Entry entry : scopeValues.entrySet()) {
- scriptEngine.put(entry.getKey(), entry.getValue());
- if (entry.getValue() instanceof Class) {
- expressions.add(String.format("%s = %
org.apache.maven.plugins
maven-dependency-plugin
- 3.1.1
+ 3.3.0
unpack-eea
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 @@
openhab.tp-gson
- openhab.tp;filter:="(&(feature=xtext)(version>=2.26.0)(!(version>=2.27.0)))"
+ openhab.tp;filter:="(&(feature=xtext)(version>=2.29.0)(!(version>=2.30.0)))"
openhab.tp-xtext
openhab.tp;filter:="(feature=jax-rs-whiteboard)"
@@ -349,10 +349,10 @@
- openhab.tp;filter:="(&(feature=xtext-ide)(version>=2.26.0)(!(version>=2.27.0)))"
+ openhab.tp;filter:="(&(feature=xtext-ide)(version>=2.29.0)(!(version>=2.30.0)))"
openhab.tp-xtext-ide
- openhab.tp;filter:="(&(feature=lsp4j)(version>=0.12.0)(!(version>=0.13.0)))"
+ openhab.tp;filter:="(&(feature=lsp4j)(version>=0.19.0)(!(version>=0.20.0)))"
openhab.tp-lsp4j
openhab-core-model-item-ide
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 @@
9.4.46.v20220331
- 5.11.0
+ 5.12.1
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 @@
- openhab.tp;feature=gson;version=2.8.9
- mvn:com.google.code.gson/gson/2.8.9
+ openhab.tp;feature=gson;version=2.9.1
+ mvn:com.google.code.gson/gson/2.9.1
@@ -200,9 +200,9 @@
- openhab.tp;feature=lsp4j;version=0.12.0
- mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.12.0
- mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.12.0
+ openhab.tp;feature=lsp4j;version=0.19.0
+ mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.19.0
+ mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.19.0
openhab.tp-gson
openhab.tp-xtext
@@ -222,24 +222,24 @@
- openhab.tp;feature=xtext;version=2.26.0
+ openhab.tp;feature=xtext;version=2.29.0
- mvn:org.eclipse.xtext/org.eclipse.xtext/2.26.0
+ mvn:org.eclipse.xtext/org.eclipse.xtext/2.29.0
mvn:org.eclipse.emf/org.eclipse.emf.common/2.17.0
mvn:org.eclipse.emf/org.eclipse.emf.ecore/2.20.0
mvn:org.eclipse.emf/org.eclipse.emf.ecore.change/2.14.0
mvn:org.eclipse.emf/org.eclipse.emf.ecore.xmi/2.16.0
- mvn:org.eclipse.xtext/org.eclipse.xtext.common.types/2.26.0
+ mvn:org.eclipse.xtext/org.eclipse.xtext.common.types/2.29.0
mvn:javax.annotation/javax.annotation-api/1.2
- mvn:org.eclipse.xtext/org.eclipse.xtext.xbase/2.26.0
- mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.lib/2.26.0
- mvn:org.eclipse.xtext/org.eclipse.xtext.smap/2.26.0
- mvn:org.eclipse.xtext/org.eclipse.xtext.util/2.26.0
- mvn:org.eclipse.xtend/org.eclipse.xtend.lib/2.26.0
- mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/2.26.0
+ mvn:org.eclipse.xtext/org.eclipse.xtext.xbase/2.29.0
+ mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.lib/2.29.0
+ mvn:org.eclipse.xtext/org.eclipse.xtext.smap/2.29.0
+ mvn:org.eclipse.xtext/org.eclipse.xtext.util/2.29.0
+ mvn:org.eclipse.xtend/org.eclipse.xtend.lib/2.29.0
+ mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/2.29.0
mvn:com.google.guava/failureaccess/1.0.1
mvn:com.google.guava/guava/30.1-jre
@@ -247,7 +247,7 @@
mvn:org.eclipse.orbit.bundles/org.aopalliance/1.0.0.v201105210816
mvn:org.eclipse.orbit.bundles/com.google.inject/5.0.1.v20210324-2015
- mvn:org.eclipse.orbit.bundles/io.github.classgraph/4.8.138.v20211212-1642
+ mvn:org.eclipse.orbit.bundles/io.github.classgraph/4.8.149.v20220915-0556
mvn:org.eclipse.orbit.bundles/org.antlr.runtime/3.2.0.v201101311130
mvn:org.eclipse.platform/org.eclipse.equinox.common/3.13.0
@@ -256,16 +256,16 @@
- mvn:org.ow2.asm/asm/9.2
+ mvn:org.ow2.asm/asm/9.4
- openhab.tp;feature=xtext-ide;version=2.26.0
+ openhab.tp;feature=xtext-ide;version=2.29.0
openhab.tp-xtext
- mvn:org.eclipse.xtext/org.eclipse.xtext.ide/2.26.0
- mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.ide/2.26.0
+ mvn:org.eclipse.xtext/org.eclipse.xtext.ide/2.29.0
+ mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.ide/2.29.0
diff --git a/itests/itest-include.bndrun b/itests/itest-include.bndrun
index 73aae8b0ec8..443bb32c621 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
@@ -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.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";
-}
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)'
diff --git a/pom.xml b/pom.xml
index f9340dbdbac..2c515755dbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
UTF-8
UTF-8
- 11
+ 17
${oh.java.version}
${oh.java.version}
${oh.java.version}
@@ -76,8 +76,9 @@
4.3.7
0.13.0
1.7.32
- 2.26.0
- 2.0.3
+ 2.29.0
+ 2.28.0
+ 4.21.0
@@ -292,12 +293,12 @@ Import-Package: \\
org.codehaus.plexus
plexus-compiler-eclipse
- 2.11.1
+ 2.12.1
org.eclipse.jdt
ecj
- 3.28.0
+ 3.30.0
@@ -387,7 +388,7 @@ Import-Package: \\
org.apache.maven.plugins
maven-surefire-plugin
- 3.0.0-M5
+ 3.0.0-M7
--add-opens java.base/java.net=ALL-UNNAMED
@@ -537,7 +538,7 @@ Import-Package: \\
openhab_codestyle.xml
- 4.13.0
+ ${spotless.eclipse.version}
@@ -560,7 +561,7 @@ Import-Package: \\
openhab_wst_xml_files.prefs
- 4.13.0
+ ${spotless.eclipse.version}
@@ -575,7 +576,7 @@ Import-Package: \\
openhab_wst_feature_file.prefs
- 4.13.0
+ ${spotless.eclipse.version}
@@ -590,7 +591,7 @@ Import-Package: \\
openhab_wst_pom_file.prefs
- 4.13.0
+ ${spotless.eclipse.version}
@@ -647,7 +648,7 @@ Import-Package: \\
- [11.0,18.0)
+ [17.0,18.0)
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 @@
+
+
+
+