From 3de5384d47dbb8575b16b4d94d3b98baaba8ed23 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Sat, 19 Feb 2022 19:50:49 +0100 Subject: [PATCH] Upgrade Xtext/Xtend to 2.26.0, LSP4J to 0.12.0 Signed-off-by: Wouter Born --- bom/compile-model/pom.xml | 28 +++++++- bom/compile/pom.xml | 2 +- bom/runtime/pom.xml | 26 ++++++-- bundles/org.openhab.core.model.item/bnd.bnd | 2 +- bundles/org.openhab.core.model.item/pom.xml | 6 +- .../bnd.bnd | 6 +- .../pom.xml | 6 +- bundles/org.openhab.core.model.rule/bnd.bnd | 4 +- bundles/org.openhab.core.model.rule/pom.xml | 6 +- bundles/org.openhab.core.model.script/bnd.bnd | 4 +- bundles/org.openhab.core.model.script/pom.xml | 6 +- .../org.openhab.core.model.sitemap/bnd.bnd | 2 +- .../org.openhab.core.model.sitemap/pom.xml | 6 +- bundles/org.openhab.core.model.thing/bnd.bnd | 4 +- bundles/org.openhab.core.model.thing/pom.xml | 6 +- .../openhab-core/src/main/feature/feature.xml | 6 +- .../openhab-tp/src/main/feature/feature.xml | 42 ++++++------ .../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 | 64 +++++++++---------- .../itest.bndrun | 23 ++++--- .../itest.bndrun | 26 ++++---- .../itest.bndrun | 23 ++++--- .../itest.bndrun | 25 ++++---- .../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 +- pom.xml | 2 +- 44 files changed, 227 insertions(+), 186 deletions(-) diff --git a/bom/compile-model/pom.xml b/bom/compile-model/pom.xml index dfd16e9e61b..58959690529 100644 --- a/bom/compile-model/pom.xml +++ b/bom/compile-model/pom.xml @@ -83,6 +83,12 @@ org.eclipse.emf org.eclipse.emf.mwe2.launch + + + com.google.inject + guice + + @@ -102,7 +108,7 @@ - + org.eclipse.xtext org.eclipse.xtext.xbase @@ -130,6 +136,22 @@ compile + + + org.eclipse.orbit.bundles + io.github.classgraph + 4.8.138.v20211212-1642 + compile + + + + + org.eclipse.orbit.bundles + com.google.inject + 5.0.1.v20210324-2015 + compile + + org.eclipse.xtext @@ -141,6 +163,10 @@ org.eclipse.platform org.eclipse.osgi + + com.google.inject + guice + diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml index 7471d7802ba..891c96c1bbd 100644 --- a/bom/compile/pom.xml +++ b/bom/compile/pom.xml @@ -87,7 +87,7 @@ com.google.code.gson gson - 2.8.6 + 2.8.9 compile diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml index 87184749a6d..9e29ea45e95 100644 --- a/bom/runtime/pom.xml +++ b/bom/runtime/pom.xml @@ -427,7 +427,7 @@ com.google.code.gson gson - 2.8.6 + 2.8.9 compile @@ -751,14 +751,20 @@ org.eclipse.orbit.bundles - org.antlr.runtime - 3.2.0.v201101311130 + com.google.inject + 5.0.1.v20210324-2015 compile org.eclipse.orbit.bundles io.github.classgraph - 4.8.35.v20190528-1517 + 4.8.138.v20211212-1642 + compile + + + org.eclipse.orbit.bundles + org.antlr.runtime + 3.2.0.v201101311130 compile @@ -798,6 +804,12 @@ org.eclipse.xtext ${xtext.version} compile + + + com.google.inject + guice + + org.eclipse.xtext @@ -828,6 +840,12 @@ org.eclipse.xtext.util ${xtext.version} compile + + + com.google.inject + guice + + org.eclipse.xtext diff --git a/bundles/org.openhab.core.model.item/bnd.bnd b/bundles/org.openhab.core.model.item/bnd.bnd index 7b8bc937ea4..8c79e0cc7ff 100644 --- a/bundles/org.openhab.core.model.item/bnd.bnd +++ b/bundles/org.openhab.core.model.item/bnd.bnd @@ -44,4 +44,4 @@ Require-Bundle: com.ibm.icu;resolution:=optional,\ org.eclipse.xtext.common.types,\ org.eclipse.xtext.generator;resolution:=optional,\ org.eclipse.xtext.util,\ - org.eclipse.xtext.xbase.lib;bundle-version="2.23.0" + org.eclipse.xtext.xbase.lib;bundle-version="2.26.0" diff --git a/bundles/org.openhab.core.model.item/pom.xml b/bundles/org.openhab.core.model.item/pom.xml index 4663820d496..8a630542e7f 100644 --- a/bundles/org.openhab.core.model.item/pom.xml +++ b/bundles/org.openhab.core.model.item/pom.xml @@ -45,7 +45,7 @@ org.codehaus.mojo exec-maven-plugin - 1.4.0 + 3.0.0 java compile @@ -62,12 +62,12 @@ org.slf4j slf4j-api - 1.7.2 + 1.7.36 org.slf4j slf4j-simple - 1.6.4 + 1.7.36 org.antlr diff --git a/bundles/org.openhab.core.model.persistence/bnd.bnd b/bundles/org.openhab.core.model.persistence/bnd.bnd index 154a5c50e7d..caef2b8c1c8 100644 --- a/bundles/org.openhab.core.model.persistence/bnd.bnd +++ b/bundles/org.openhab.core.model.persistence/bnd.bnd @@ -41,6 +41,6 @@ Require-Bundle: org.antlr.runtime,\ org.eclipse.xtext.common.types,\ org.eclipse.xtext.generator;resolution:=optional,\ org.eclipse.xtext.util,\ - org.eclipse.xtext.xbase.lib;bundle-version="2.23.0",\ - org.eclipse.xtext.xbase;bundle-version="2.23.0";resolution:=optional;visibility:=reexport,\ - org.eclipse.xtext;bundle-version="2.23.0";visibility:=reexport + org.eclipse.xtext.xbase.lib;bundle-version="2.26.0",\ + org.eclipse.xtext.xbase;bundle-version="2.26.0";resolution:=optional;visibility:=reexport,\ + org.eclipse.xtext;bundle-version="2.26.0";visibility:=reexport diff --git a/bundles/org.openhab.core.model.persistence/pom.xml b/bundles/org.openhab.core.model.persistence/pom.xml index dad2926711b..f56b892d5eb 100644 --- a/bundles/org.openhab.core.model.persistence/pom.xml +++ b/bundles/org.openhab.core.model.persistence/pom.xml @@ -50,7 +50,7 @@ org.codehaus.mojo exec-maven-plugin - 1.4.0 + 3.0.0 java compile @@ -67,12 +67,12 @@ org.slf4j slf4j-api - 1.7.2 + 1.7.36 org.slf4j slf4j-simple - 1.6.4 + 1.7.36 org.antlr diff --git a/bundles/org.openhab.core.model.rule/bnd.bnd b/bundles/org.openhab.core.model.rule/bnd.bnd index 7d16b1ed4a9..c973a0821a2 100644 --- a/bundles/org.openhab.core.model.rule/bnd.bnd +++ b/bundles/org.openhab.core.model.rule/bnd.bnd @@ -50,6 +50,6 @@ Require-Bundle: org.antlr.runtime,\ org.eclipse.xtext.generator;resolution:=optional,\ org.eclipse.xtext.util,\ org.eclipse.xtext.xbase,\ - org.eclipse.xtext.xbase.lib;bundle-version="2.23.0",\ + org.eclipse.xtext.xbase.lib;bundle-version="2.26.0",\ org.eclipse.xtext;visibility:=reexport,\ - org.objectweb.asm;bundle-version="[8.0.0,9.0.0)";resolution:=optional + org.objectweb.asm;bundle-version="[9.0.0,10.0.0)";resolution:=optional diff --git a/bundles/org.openhab.core.model.rule/pom.xml b/bundles/org.openhab.core.model.rule/pom.xml index 0de06a96380..8088eae6c5c 100644 --- a/bundles/org.openhab.core.model.rule/pom.xml +++ b/bundles/org.openhab.core.model.rule/pom.xml @@ -45,7 +45,7 @@ org.codehaus.mojo exec-maven-plugin - 1.4.0 + 3.0.0 java compile @@ -62,12 +62,12 @@ org.slf4j slf4j-api - 1.7.2 + 1.7.36 org.slf4j slf4j-simple - 1.6.4 + 1.7.36 org.antlr diff --git a/bundles/org.openhab.core.model.script/bnd.bnd b/bundles/org.openhab.core.model.script/bnd.bnd index 1761b565a6c..1428cf25700 100644 --- a/bundles/org.openhab.core.model.script/bnd.bnd +++ b/bundles/org.openhab.core.model.script/bnd.bnd @@ -62,8 +62,8 @@ Require-Bundle: org.antlr.runtime,\ org.eclipse.xtext.common.types,\ org.eclipse.xtext.generator;resolution:=optional,\ org.eclipse.xtext.util,\ - org.eclipse.xtext.xbase.lib;bundle-version="2.23.0",\ + org.eclipse.xtext.xbase.lib;bundle-version="2.26.0",\ org.eclipse.xtext.xbase;visibility:=reexport,\ org.eclipse.xtext;visibility:=reexport,\ - org.objectweb.asm;resolution:=optional + org.objectweb.asm;bundle-version="[9.0.0,10.0.0)";resolution:=optional -includeresource: resources diff --git a/bundles/org.openhab.core.model.script/pom.xml b/bundles/org.openhab.core.model.script/pom.xml index ee581795543..1a7d956faed 100644 --- a/bundles/org.openhab.core.model.script/pom.xml +++ b/bundles/org.openhab.core.model.script/pom.xml @@ -76,7 +76,7 @@ org.codehaus.mojo exec-maven-plugin - 1.4.0 + 3.0.0 java compile @@ -93,12 +93,12 @@ org.slf4j slf4j-api - 1.7.2 + 1.7.36 org.slf4j slf4j-simple - 1.6.4 + 1.7.36 org.antlr diff --git a/bundles/org.openhab.core.model.sitemap/bnd.bnd b/bundles/org.openhab.core.model.sitemap/bnd.bnd index 345214d6650..c2f383fbccb 100644 --- a/bundles/org.openhab.core.model.sitemap/bnd.bnd +++ b/bundles/org.openhab.core.model.sitemap/bnd.bnd @@ -28,4 +28,4 @@ Require-Bundle: org.antlr.runtime,\ org.eclipse.xtext,\ org.eclipse.xtext.generator;resolution:=optional,\ org.eclipse.xtext.util,\ - org.eclipse.xtext.xbase.lib;bundle-version="2.23.0" + org.eclipse.xtext.xbase.lib;bundle-version="2.26.0" diff --git a/bundles/org.openhab.core.model.sitemap/pom.xml b/bundles/org.openhab.core.model.sitemap/pom.xml index aa990d30827..1aafb41274f 100644 --- a/bundles/org.openhab.core.model.sitemap/pom.xml +++ b/bundles/org.openhab.core.model.sitemap/pom.xml @@ -45,7 +45,7 @@ org.codehaus.mojo exec-maven-plugin - 1.4.0 + 3.0.0 java compile @@ -62,12 +62,12 @@ org.slf4j slf4j-api - 1.7.2 + 1.7.36 org.slf4j slf4j-simple - 1.6.4 + 1.7.36 org.antlr diff --git a/bundles/org.openhab.core.model.thing/bnd.bnd b/bundles/org.openhab.core.model.thing/bnd.bnd index 65b3da05ce4..9705a3d6e5a 100644 --- a/bundles/org.openhab.core.model.thing/bnd.bnd +++ b/bundles/org.openhab.core.model.thing/bnd.bnd @@ -45,7 +45,7 @@ Require-Bundle: org.antlr.runtime,\ org.eclipse.xtext.common.types,\ org.eclipse.xtext.generator;resolution:=optional,\ org.eclipse.xtext.util,\ - org.eclipse.xtext.xbase.lib;bundle-version="2.23.0",\ + org.eclipse.xtext.xbase.lib;bundle-version="2.26.0",\ org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport,\ org.eclipse.xtext;visibility:=reexport,\ - org.objectweb.asm;bundle-version="[8.0.0,9.0.0)";resolution:=optional + org.objectweb.asm;bundle-version="[9.0.0,10.0.0)";resolution:=optional diff --git a/bundles/org.openhab.core.model.thing/pom.xml b/bundles/org.openhab.core.model.thing/pom.xml index 678da047d9a..e6a19a04f89 100644 --- a/bundles/org.openhab.core.model.thing/pom.xml +++ b/bundles/org.openhab.core.model.thing/pom.xml @@ -68,7 +68,7 @@ org.codehaus.mojo exec-maven-plugin - 1.4.0 + 3.0.0 java compile @@ -85,12 +85,12 @@ org.slf4j slf4j-api - 1.7.2 + 1.7.36 org.slf4j slf4j-simple - 1.6.4 + 1.7.36 org.antlr diff --git a/features/karaf/openhab-core/src/main/feature/feature.xml b/features/karaf/openhab-core/src/main/feature/feature.xml index f57e080dda8..727a8dae8e1 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.25.0)(!(version>=2.26.0)))" + openhab.tp;filter:="(&(feature=xtext)(version>=2.26.0)(!(version>=2.27.0)))" openhab.tp-xtext openhab.tp;filter:="(feature=jax-rs-whiteboard)" @@ -335,10 +335,10 @@ - openhab.tp;filter:="(&(feature=xtext-ide)(version>=2.25.0)(!(version>=2.26.0)))" + openhab.tp;filter:="(&(feature=xtext-ide)(version>=2.26.0)(!(version>=2.27.0)))" openhab.tp-xtext-ide - openhab.tp;filter:="(&(feature=lsp4j)(version>=0.10.0)(!(version>=0.11.0)))" + openhab.tp;filter:="(&(feature=lsp4j)(version>=0.12.0)(!(version>=0.13.0)))" openhab.tp-lsp4j openhab-core-model-item-ide diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml index 158a154f291..f026b7787ed 100644 --- a/features/karaf/openhab-tp/src/main/feature/feature.xml +++ b/features/karaf/openhab-tp/src/main/feature/feature.xml @@ -53,8 +53,8 @@ - openhab.tp;feature=gson;version=2.8.6 - mvn:com.google.code.gson/gson/2.8.6 + openhab.tp;feature=gson;version=2.8.9 + mvn:com.google.code.gson/gson/2.8.9 @@ -193,10 +193,9 @@ - openhab.tp;feature=lsp4j;version=0.10.0 - mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.10.0 - mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.10.0 - mvn:com.google.guava/guava/27.1-jre + 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-gson openhab.tp-xtext @@ -216,31 +215,32 @@ - openhab.tp;feature=xtext;version=2.25.0 + openhab.tp;feature=xtext;version=2.26.0.RC1 - mvn:org.eclipse.xtext/org.eclipse.xtext/2.25.0 + mvn:org.eclipse.xtext/org.eclipse.xtext/2.26.0.RC1 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.25.0 + mvn:org.eclipse.xtext/org.eclipse.xtext.common.types/2.26.0.RC1 mvn:javax.annotation/javax.annotation-api/1.2 - mvn:org.eclipse.xtext/org.eclipse.xtext.xbase/2.25.0 - mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.lib/2.25.0 - mvn:org.eclipse.xtext/org.eclipse.xtext.smap/2.25.0 - mvn:org.eclipse.xtext/org.eclipse.xtext.util/2.25.0 - mvn:org.eclipse.xtend/org.eclipse.xtend.lib/2.25.0 - mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/2.25.0 + mvn:org.eclipse.xtext/org.eclipse.xtext.xbase/2.26.0.RC1 + mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.lib/2.26.0.RC1 + mvn:org.eclipse.xtext/org.eclipse.xtext.smap/2.26.0.RC1 + mvn:org.eclipse.xtext/org.eclipse.xtext.util/2.26.0.RC1 + mvn:org.eclipse.xtend/org.eclipse.xtend.lib/2.26.0.RC1 + mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/2.26.0.RC1 mvn:com.google.guava/failureaccess/1.0.1 mvn:com.google.guava/guava/30.1-jre mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/1_2 - mvn:org.eclipse.orbit.bundles/com.google.inject/3.0.0.v201312141243 - mvn:org.eclipse.orbit.bundles/io.github.classgraph/4.8.35.v20190528-1517 + 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/org.antlr.runtime/3.2.0.v201101311130 mvn:org.eclipse.platform/org.eclipse.equinox.common/3.13.0 @@ -249,16 +249,16 @@ - mvn:org.ow2.asm/asm/9.1 + mvn:org.ow2.asm/asm/9.2 - openhab.tp;feature=xtext-ide;version=2.25.0 + openhab.tp;feature=xtext-ide;version=2.26.0.RC1 openhab.tp-xtext - mvn:org.eclipse.xtext/org.eclipse.xtext.ide/2.25.0 - mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.ide/2.25.0 + mvn:org.eclipse.xtext/org.eclipse.xtext.ide/2.26.0.RC1 + mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.ide/2.26.0.RC1 diff --git a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun index 56e83b949f3..5ec0ce76462 100644 --- a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun +++ b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun @@ -19,7 +19,6 @@ Fragment-Host: org.openhab.core.auth.oauth2client jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ - com.google.gson;version='[2.8.6,2.8.7)',\ 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)',\ @@ -60,4 +59,5 @@ Fragment-Host: org.openhab.core.auth.oauth2client org.openhab.core.io.console;version='[3.3.0,3.3.1)',\ org.openhab.core.io.net;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)' + org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ + com.google.gson;version='[2.8.9,2.8.10)' diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun index 048cf435bb4..c925ebbca0c 100644 --- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun @@ -21,7 +21,6 @@ Fragment-Host: org.openhab.core.automation jollyday;version='[0.5.10,0.5.11)',\ org.threeten.extra;version='[1.5.0,1.5.1)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ - com.google.gson;version='[2.8.6,2.8.7)',\ 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)',\ @@ -54,4 +53,5 @@ Fragment-Host: org.openhab.core.automation org.openhab.core.io.console;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ org.openhab.core.thing;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)' + org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ + com.google.gson;version='[2.8.9,2.8.10)' 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 527b2a8bb10..53d38d78323 100644 --- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun @@ -22,7 +22,6 @@ Fragment-Host: org.openhab.core.automation org.threeten.extra;version='[1.5.0,1.5.1)',\ org.eclipse.jdt.annotation;version='[2.2.100,2.2.101)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ - com.google.gson;version='[2.8.6,2.8.7)',\ 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)',\ @@ -55,4 +54,5 @@ Fragment-Host: org.openhab.core.automation org.openhab.core.io.console;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ org.openhab.core.thing;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)' + org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ + com.google.gson;version='[2.8.9,2.8.10)' 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 962b1b08e8b..02137bbc9d1 100644 --- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun @@ -21,7 +21,6 @@ Fragment-Host: org.openhab.core.automation.module.script jollyday;version='[0.5.10,0.5.11)',\ org.threeten.extra;version='[1.5.0,1.5.1)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ - com.google.gson;version='[2.8.6,2.8.7)',\ 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)',\ @@ -55,4 +54,5 @@ Fragment-Host: org.openhab.core.automation.module.script org.openhab.core.io.console;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ org.openhab.core.thing;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)' + org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ + com.google.gson;version='[2.8.9,2.8.10)' 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 f171393def0..72bd7a1eaf6 100644 --- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun @@ -22,7 +22,6 @@ Fragment-Host: org.openhab.core.automation org.threeten.extra;version='[1.5.0,1.5.1)',\ org.eclipse.jdt.annotation;version='[2.2.100,2.2.101)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ - com.google.gson;version='[2.8.6,2.8.7)',\ 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)',\ @@ -55,4 +54,5 @@ Fragment-Host: org.openhab.core.automation org.openhab.core.io.console;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ org.openhab.core.thing;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)' + org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ + com.google.gson;version='[2.8.9,2.8.10)' diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun index f511cd5e2aa..6dc2647dfaa 100644 --- a/itests/org.openhab.core.automation.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.tests/itest.bndrun @@ -22,7 +22,6 @@ Fragment-Host: org.openhab.core.automation org.threeten.extra;version='[1.5.0,1.5.1)',\ org.eclipse.jdt.annotation;version='[2.2.100,2.2.101)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ - com.google.gson;version='[2.8.6,2.8.7)',\ 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)',\ @@ -55,4 +54,5 @@ Fragment-Host: org.openhab.core.automation org.openhab.core.io.console;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ org.openhab.core.thing;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)' + org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ + com.google.gson;version='[2.8.9,2.8.10)' diff --git a/itests/org.openhab.core.binding.xml.tests/itest.bndrun b/itests/org.openhab.core.binding.xml.tests/itest.bndrun index 1bbb7d4ab9e..94f78184c9c 100644 --- a/itests/org.openhab.core.binding.xml.tests/itest.bndrun +++ b/itests/org.openhab.core.binding.xml.tests/itest.bndrun @@ -24,7 +24,6 @@ Fragment-Host: org.openhab.core.binding.xml jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ - com.google.gson;version='[2.8.6,2.8.7)',\ 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)',\ @@ -57,4 +56,5 @@ Fragment-Host: org.openhab.core.binding.xml org.openhab.core.config.xml;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ - xstream;version='[1.4.19,1.4.20)' + xstream;version='[1.4.19,1.4.20)',\ + com.google.gson;version='[2.8.9,2.8.10)' diff --git a/itests/org.openhab.core.config.core.tests/itest.bndrun b/itests/org.openhab.core.config.core.tests/itest.bndrun index dfec0a8ba04..6bdfc1492f7 100644 --- a/itests/org.openhab.core.config.core.tests/itest.bndrun +++ b/itests/org.openhab.core.config.core.tests/itest.bndrun @@ -20,7 +20,6 @@ Fragment-Host: org.openhab.core.config.core jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ - com.google.gson;version='[2.8.6,2.8.7)',\ 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)',\ @@ -54,4 +53,5 @@ Fragment-Host: org.openhab.core.config.core org.openhab.core.config.core.tests;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ - org.mockito.junit-jupiter;version='[4.1.0,4.1.1)' + org.mockito.junit-jupiter;version='[4.1.0,4.1.1)',\ + com.google.gson;version='[2.8.9,2.8.10)' 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 7702e53048f..57989ab54ee 100644 --- a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun @@ -20,7 +20,6 @@ Fragment-Host: org.openhab.core.config.discovery.mdns org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ javax.jmdns;version='[3.5.7,3.5.8)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ - com.google.gson;version='[2.8.6,2.8.7)',\ 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)',\ @@ -60,4 +59,5 @@ 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)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)' + org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ + com.google.gson;version='[2.8.9,2.8.10)' diff --git a/itests/org.openhab.core.config.discovery.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.tests/itest.bndrun index a8addbf885b..17e50aa58a1 100644 --- a/itests/org.openhab.core.config.discovery.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.tests/itest.bndrun @@ -21,7 +21,6 @@ Fragment-Host: org.openhab.core.config.discovery jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ - com.google.gson;version='[2.8.6,2.8.7)',\ 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)',\ @@ -63,4 +62,5 @@ Fragment-Host: org.openhab.core.config.discovery org.openhab.core.thing;version='[3.3.0,3.3.1)',\ org.openhab.core.thing.xml;version='[3.3.0,3.3.1)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ - xstream;version='[1.4.19,1.4.20)' + xstream;version='[1.4.19,1.4.20)',\ + com.google.gson;version='[2.8.9,2.8.10)' 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 30361d98b82..585af1441b1 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 @@ -19,7 +19,6 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ - com.google.gson;version='[2.8.6,2.8.7)',\ 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)',\ @@ -60,4 +59,5 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs org.openhab.core.io.console;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ org.openhab.core.thing;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)' + org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ + com.google.gson;version='[2.8.9,2.8.10)' 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 c8ec4b0b137..78195c8a283 100644 --- a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun @@ -29,7 +29,6 @@ Provide-Capability: \ jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ - com.google.gson;version='[2.8.6,2.8.7)',\ 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)',\ @@ -68,4 +67,5 @@ Provide-Capability: \ org.openhab.core.io.console;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ org.openhab.core.thing;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)' + org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ + com.google.gson;version='[2.8.9,2.8.10)' diff --git a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun index 6cd22aacda8..6b0692b4eb8 100644 --- a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun +++ b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun @@ -19,7 +19,6 @@ Fragment-Host: org.openhab.core.config.dispatch jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ - com.google.gson;version='[2.8.6,2.8.7)',\ 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)',\ @@ -50,4 +49,5 @@ Fragment-Host: org.openhab.core.config.dispatch org.openhab.core.config.dispatch;version='[3.3.0,3.3.1)',\ org.openhab.core.config.dispatch.tests;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)' + org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ + com.google.gson;version='[2.8.9,2.8.10)' diff --git a/itests/org.openhab.core.config.xml.tests/itest.bndrun b/itests/org.openhab.core.config.xml.tests/itest.bndrun index dd6d6e3b67b..51fed3f193a 100644 --- a/itests/org.openhab.core.config.xml.tests/itest.bndrun +++ b/itests/org.openhab.core.config.xml.tests/itest.bndrun @@ -19,7 +19,6 @@ Fragment-Host: org.openhab.core.config.xml jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ - com.google.gson;version='[2.8.6,2.8.7)',\ 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)',\ @@ -50,4 +49,5 @@ Fragment-Host: org.openhab.core.config.xml org.openhab.core.config.xml.tests;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ - xstream;version='[1.4.19,1.4.20)' + xstream;version='[1.4.19,1.4.20)',\ + com.google.gson;version='[2.8.9,2.8.10)' diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun index 27281caa58a..f963434e65c 100644 --- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun +++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun @@ -27,7 +27,6 @@ feature.openhab-config: \ jollyday;version='[0.5.10,0.5.11)',\ org.threeten.extra;version='[1.5.0,1.5.1)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ - com.google.gson;version='[2.8.6,2.8.7)',\ 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)',\ @@ -59,4 +58,5 @@ feature.openhab-config: \ org.openhab.core.ephemeris.tests;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ - xstream;version='[1.4.19,1.4.20)' + xstream;version='[1.4.19,1.4.20)',\ + com.google.gson;version='[2.8.9,2.8.10)' 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 df34794eba8..399388e4582 100644 --- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun +++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun @@ -25,9 +25,7 @@ Fragment-Host: org.openhab.core.io.rest.core com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ - com.google.gson;version='[2.8.6,2.8.7)',\ org.apache.aries.javax.jax.rs-api;version='[1.0.1,1.0.2)',\ - org.objectweb.asm;version='[9.1.0,9.1.1)',\ org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\ org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\ jakarta.xml.soap-api;version='[1.4.2,1.4.3)',\ @@ -94,4 +92,6 @@ Fragment-Host: org.openhab.core.io.rest.core org.openhab.core.transform;version='[3.3.0,3.3.1)',\ org.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\ org.apache.xbean.finder;version='[4.20.0,4.20.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)' + org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ + com.google.gson;version='[2.8.9,2.8.10)',\ + org.objectweb.asm;version='[9.2.0,9.2.1)' diff --git a/itests/org.openhab.core.model.core.tests/itest.bndrun b/itests/org.openhab.core.model.core.tests/itest.bndrun index f7cc7b880d2..942827f4a5b 100644 --- a/itests/org.openhab.core.model.core.tests/itest.bndrun +++ b/itests/org.openhab.core.model.core.tests/itest.bndrun @@ -9,7 +9,6 @@ Fragment-Host: org.openhab.core.model.core # done # -runbundles: \ - com.google.inject;version='[3.0.0,3.0.1)',\ org.antlr.runtime;version='[3.2.0,3.2.1)',\ org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\ org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\ @@ -18,38 +17,23 @@ Fragment-Host: org.openhab.core.model.core org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\ - io.github.classgraph;version='[4.8.35,4.8.36)',\ org.hamcrest;version='[2.2.0,2.2.1)',\ org.opentest4j;version='[1.2.0,1.2.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ - jollyday;version='[0.5.10,0.5.11)',\ - org.threeten.extra;version='[1.5.0,1.5.1)',\ org.eclipse.emf.common;version='[2.17.0,2.17.1)',\ org.eclipse.emf.ecore;version='[2.20.0,2.20.1)',\ 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.gson;version='[2.8.6,2.8.7)',\ com.google.guava;version='[30.1.0,30.1.1)',\ org.eclipse.equinox.common;version='[3.13.0,3.13.1)',\ - org.eclipse.xtend.lib;version='[2.25.0,2.25.1)',\ - org.eclipse.xtend.lib.macro;version='[2.25.0,2.25.1)',\ - org.eclipse.xtext;version='[2.25.0,2.25.1)',\ - org.eclipse.xtext.common.types;version='[2.25.0,2.25.1)',\ - org.eclipse.xtext.util;version='[2.25.0,2.25.1)',\ - org.eclipse.xtext.xbase;version='[2.25.0,2.25.1)',\ - org.eclipse.xtext.xbase.lib;version='[2.25.0,2.25.1)',\ - org.objectweb.asm;version='[9.1.0,9.1.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)',\ jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\ javax.measure.unit-api;version='[2.1.2,2.1.3)',\ org.osgi.service.cm;version='[1.6.0,1.6.1)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ - org.eclipse.jetty.client;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ @@ -57,10 +41,6 @@ Fragment-Host: org.openhab.core.model.core org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.websocket.api;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.websocket.client;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.websocket.common;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.xml;version='[9.4.43,9.4.44)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -75,13 +55,35 @@ Fragment-Host: org.openhab.core.model.core org.objenesis;version='[3.2.0,3.2.1)',\ biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\ org.apache.felix.scr;version='[2.1.30,2.1.31)',\ - org.ops4j.pax.web.pax-web-api;version='[7.3.23,7.3.24)',\ - org.ops4j.pax.web.pax-web-jetty;version='[7.3.23,7.3.24)',\ - org.ops4j.pax.web.pax-web-runtime;version='[7.3.23,7.3.24)',\ - org.ops4j.pax.web.pax-web-spi;version='[7.3.23,7.3.24)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.osgi.util.promise;version='[1.2.0,1.2.1)',\ org.openhab.core;version='[3.3.0,3.3.1)',\ + org.openhab.core.model.core;version='[3.3.0,3.3.1)',\ + org.openhab.core.model.core.tests;version='[3.3.0,3.3.1)',\ + org.openhab.core.model.sitemap;version='[3.3.0,3.3.1)',\ + org.openhab.core.test;version='[3.3.0,3.3.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ + 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.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\ + org.apache.xbean.finder;version='[4.20.0,4.20.1)',\ + org.eclipse.jetty.client;version='[9.4.43,9.4.44)',\ + org.eclipse.jetty.websocket.api;version='[9.4.43,9.4.44)',\ + org.eclipse.jetty.websocket.client;version='[9.4.43,9.4.44)',\ + org.eclipse.jetty.websocket.common;version='[9.4.43,9.4.44)',\ + org.eclipse.jetty.xml;version='[9.4.43,9.4.44)',\ + 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.openhab.core.audio;version='[3.3.0,3.3.1)',\ org.openhab.core.automation;version='[3.3.0,3.3.1)',\ org.openhab.core.automation.module.script;version='[3.3.0,3.3.1)',\ @@ -90,22 +92,20 @@ Fragment-Host: org.openhab.core.model.core org.openhab.core.io.console;version='[3.3.0,3.3.1)',\ org.openhab.core.io.http;version='[3.3.0,3.3.1)',\ org.openhab.core.io.net;version='[3.3.0,3.3.1)',\ - org.openhab.core.model.core;version='[3.3.0,3.3.1)',\ - org.openhab.core.model.core.tests;version='[3.3.0,3.3.1)',\ org.openhab.core.model.item;version='[3.3.0,3.3.1)',\ + org.openhab.core.model.item.runtime;version='[3.3.0,3.3.1)',\ org.openhab.core.model.persistence;version='[3.3.0,3.3.1)',\ org.openhab.core.model.rule;version='[3.3.0,3.3.1)',\ org.openhab.core.model.script;version='[3.3.0,3.3.1)',\ org.openhab.core.model.script.runtime;version='[3.3.0,3.3.1)',\ - org.openhab.core.model.sitemap;version='[3.3.0,3.3.1)',\ org.openhab.core.model.thing;version='[3.3.0,3.3.1)',\ org.openhab.core.persistence;version='[3.3.0,3.3.1)',\ org.openhab.core.semantics;version='[3.3.0,3.3.1)',\ - org.openhab.core.test;version='[3.3.0,3.3.1)',\ org.openhab.core.thing;version='[3.3.0,3.3.1)',\ org.openhab.core.transform;version='[3.3.0,3.3.1)',\ org.openhab.core.voice;version='[3.3.0,3.3.1)',\ - org.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\ - org.apache.xbean.finder;version='[4.20.0,4.20.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ - org.openhab.core.model.rule.runtime;version='[3.3.0,3.3.1)' + org.ops4j.pax.web.pax-web-api;version='[7.3.23,7.3.24)',\ + org.ops4j.pax.web.pax-web-jetty;version='[7.3.23,7.3.24)',\ + org.ops4j.pax.web.pax-web-runtime;version='[7.3.23,7.3.24)',\ + org.ops4j.pax.web.pax-web-spi;version='[7.3.23,7.3.24)',\ + org.threeten.extra;version='[1.5.0,1.5.1)' diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun index af8b4a1f3c9..b920e62c724 100644 --- a/itests/org.openhab.core.model.item.tests/itest.bndrun +++ b/itests/org.openhab.core.model.item.tests/itest.bndrun @@ -11,7 +11,6 @@ Fragment-Host: org.openhab.core.model.item # done # -runbundles: \ - com.google.inject;version='[3.0.0,3.0.1)',\ org.antlr.runtime;version='[3.2.0,3.2.1)',\ org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\ org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ @@ -20,7 +19,6 @@ Fragment-Host: org.openhab.core.model.item org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\ - io.github.classgraph;version='[4.8.35,4.8.36)',\ org.hamcrest;version='[2.2.0,2.2.1)',\ org.opentest4j;version='[1.2.0,1.2.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ @@ -32,17 +30,8 @@ Fragment-Host: org.openhab.core.model.item org.eclipse.emf.ecore;version='[2.20.0,2.20.1)',\ 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.gson;version='[2.8.6,2.8.7)',\ com.google.guava;version='[30.1.0,30.1.1)',\ org.eclipse.equinox.common;version='[3.13.0,3.13.1)',\ - org.eclipse.xtend.lib;version='[2.25.0,2.25.1)',\ - org.eclipse.xtend.lib.macro;version='[2.25.0,2.25.1)',\ - org.eclipse.xtext;version='[2.25.0,2.25.1)',\ - org.eclipse.xtext.common.types;version='[2.25.0,2.25.1)',\ - org.eclipse.xtext.util;version='[2.25.0,2.25.1)',\ - org.eclipse.xtext.xbase;version='[2.25.0,2.25.1)',\ - org.eclipse.xtext.xbase.lib;version='[2.25.0,2.25.1)',\ - org.objectweb.asm;version='[9.1.0,9.1.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)',\ @@ -106,4 +95,14 @@ Fragment-Host: org.openhab.core.model.item org.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\ org.apache.xbean.finder;version='[4.20.0,4.20.1)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ - org.openhab.core.model.rule.runtime;version='[3.3.0,3.3.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)' diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun index 9c183401a54..f990593c07d 100644 --- a/itests/org.openhab.core.model.rule.tests/itest.bndrun +++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun @@ -11,7 +11,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime # done # -runbundles: \ - com.google.inject;version='[3.0.0,3.0.1)',\ org.antlr.runtime;version='[3.2.0,3.2.1)',\ org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\ org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ @@ -19,10 +18,8 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\ - io.github.classgraph;version='[4.8.35,4.8.36)',\ org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\ com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\ - io.github.classgraph;version='[4.8.35,4.8.36)',\ org.hamcrest;version='[2.2.0,2.2.1)',\ org.opentest4j;version='[1.2.0,1.2.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ @@ -34,17 +31,8 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.eclipse.emf.ecore;version='[2.20.0,2.20.1)',\ 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.gson;version='[2.8.6,2.8.7)',\ com.google.guava;version='[30.1.0,30.1.1)',\ org.eclipse.equinox.common;version='[3.13.0,3.13.1)',\ - org.eclipse.xtend.lib;version='[2.25.0,2.25.1)',\ - org.eclipse.xtend.lib.macro;version='[2.25.0,2.25.1)',\ - org.eclipse.xtext;version='[2.25.0,2.25.1)',\ - org.eclipse.xtext.common.types;version='[2.25.0,2.25.1)',\ - org.eclipse.xtext.util;version='[2.25.0,2.25.1)',\ - org.eclipse.xtext.xbase;version='[2.25.0,2.25.1)',\ - org.eclipse.xtext.xbase.lib;version='[2.25.0,2.25.1)',\ - org.objectweb.asm;version='[9.1.0,9.1.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)',\ @@ -107,5 +95,17 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.openhab.core.voice;version='[3.3.0,3.3.1)',\ org.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\ org.apache.xbean.finder;version='[4.20.0,4.20.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)' + org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ + 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.openhab.core.model.item.runtime;version='[3.3.0,3.3.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 384c9ed6813..cec44d2d037 100644 --- a/itests/org.openhab.core.model.script.tests/itest.bndrun +++ b/itests/org.openhab.core.model.script.tests/itest.bndrun @@ -14,7 +14,6 @@ Fragment-Host: org.openhab.core.model.script # done # -runbundles: \ - com.google.inject;version='[3.0.0,3.0.1)',\ org.antlr.runtime;version='[3.2.0,3.2.1)',\ org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\ org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\ @@ -23,7 +22,6 @@ Fragment-Host: org.openhab.core.model.script org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\ - io.github.classgraph;version='[4.8.35,4.8.36)',\ org.hamcrest;version='[2.2.0,2.2.1)',\ org.opentest4j;version='[1.2.0,1.2.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ @@ -35,17 +33,8 @@ Fragment-Host: org.openhab.core.model.script org.eclipse.emf.ecore;version='[2.20.0,2.20.1)',\ 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.gson;version='[2.8.6,2.8.7)',\ com.google.guava;version='[30.1.0,30.1.1)',\ org.eclipse.equinox.common;version='[3.13.0,3.13.1)',\ - org.eclipse.xtend.lib;version='[2.25.0,2.25.1)',\ - org.eclipse.xtend.lib.macro;version='[2.25.0,2.25.1)',\ - org.eclipse.xtext;version='[2.25.0,2.25.1)',\ - org.eclipse.xtext.common.types;version='[2.25.0,2.25.1)',\ - org.eclipse.xtext.util;version='[2.25.0,2.25.1)',\ - org.eclipse.xtext.xbase;version='[2.25.0,2.25.1)',\ - org.eclipse.xtext.xbase.lib;version='[2.25.0,2.25.1)',\ - org.objectweb.asm;version='[9.1.0,9.1.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)',\ @@ -108,4 +97,14 @@ Fragment-Host: org.openhab.core.model.script org.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\ org.apache.xbean.finder;version='[4.20.0,4.20.1)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ - org.openhab.core.model.rule.runtime;version='[3.3.0,3.3.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)' diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun index ff5e0924a83..47bf4083f99 100644 --- a/itests/org.openhab.core.model.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun @@ -13,7 +13,6 @@ Fragment-Host: org.openhab.core.model.thing # done # -runbundles: \ - com.google.inject;version='[3.0.0,3.0.1)',\ org.antlr.runtime;version='[3.2.0,3.2.1)',\ org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ @@ -22,7 +21,6 @@ Fragment-Host: org.openhab.core.model.thing org.osgi.service.event;version='[1.4.0,1.4.1)',\ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\ - io.github.classgraph;version='[4.8.35,4.8.36)',\ org.hamcrest;version='[2.2.0,2.2.1)',\ org.opentest4j;version='[1.2.0,1.2.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ @@ -34,17 +32,8 @@ Fragment-Host: org.openhab.core.model.thing org.eclipse.emf.ecore;version='[2.20.0,2.20.1)',\ 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.gson;version='[2.8.6,2.8.7)',\ com.google.guava;version='[30.1.0,30.1.1)',\ org.eclipse.equinox.common;version='[3.13.0,3.13.1)',\ - org.eclipse.xtend.lib;version='[2.25.0,2.25.1)',\ - org.eclipse.xtend.lib.macro;version='[2.25.0,2.25.1)',\ - org.eclipse.xtext;version='[2.25.0,2.25.1)',\ - org.eclipse.xtext.common.types;version='[2.25.0,2.25.1)',\ - org.eclipse.xtext.util;version='[2.25.0,2.25.1)',\ - org.eclipse.xtext.xbase;version='[2.25.0,2.25.1)',\ - org.eclipse.xtext.xbase.lib;version='[2.25.0,2.25.1)',\ - org.objectweb.asm;version='[9.1.0,9.1.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)',\ @@ -118,5 +107,15 @@ Fragment-Host: org.openhab.core.model.thing org.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\ org.apache.xbean.finder;version='[4.20.0,4.20.1)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ - org.openhab.core.model.rule.runtime;version='[3.3.0,3.3.1)',\ - xstream;version='[1.4.19,1.4.20)' + 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)' diff --git a/itests/org.openhab.core.storage.json.tests/itest.bndrun b/itests/org.openhab.core.storage.json.tests/itest.bndrun index cfed9f61a2b..ae2c60e8adb 100644 --- a/itests/org.openhab.core.storage.json.tests/itest.bndrun +++ b/itests/org.openhab.core.storage.json.tests/itest.bndrun @@ -19,7 +19,6 @@ Fragment-Host: org.openhab.core.storage.json jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ - com.google.gson;version='[2.8.6,2.8.7)',\ 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,4 +48,5 @@ Fragment-Host: org.openhab.core.storage.json org.openhab.core.storage.json;version='[3.3.0,3.3.1)',\ org.openhab.core.storage.json.tests;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)' + org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ + com.google.gson;version='[2.8.9,2.8.10)' diff --git a/itests/org.openhab.core.tests/itest.bndrun b/itests/org.openhab.core.tests/itest.bndrun index 16e8935e67f..d2234b7f6c6 100644 --- a/itests/org.openhab.core.tests/itest.bndrun +++ b/itests/org.openhab.core.tests/itest.bndrun @@ -19,7 +19,6 @@ Fragment-Host: org.openhab.core jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ - com.google.gson;version='[2.8.6,2.8.7)',\ 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)',\ @@ -52,4 +51,5 @@ Fragment-Host: org.openhab.core org.openhab.core;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ org.openhab.core.tests;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)' + org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ + com.google.gson;version='[2.8.9,2.8.10)' diff --git a/itests/org.openhab.core.thing.tests/itest.bndrun b/itests/org.openhab.core.thing.tests/itest.bndrun index 304b25f71c4..669cf1622e4 100644 --- a/itests/org.openhab.core.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.thing.tests/itest.bndrun @@ -25,7 +25,6 @@ Fragment-Host: org.openhab.core.thing jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ - com.google.gson;version='[2.8.6,2.8.7)',\ 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)',\ @@ -65,4 +64,5 @@ Fragment-Host: org.openhab.core.thing org.openhab.core.thing.tests;version='[3.3.0,3.3.1)',\ org.openhab.core.thing.xml;version='[3.3.0,3.3.1)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ - xstream;version='[1.4.19,1.4.20)' + xstream;version='[1.4.19,1.4.20)',\ + com.google.gson;version='[2.8.9,2.8.10)' diff --git a/itests/org.openhab.core.thing.xml.tests/itest.bndrun b/itests/org.openhab.core.thing.xml.tests/itest.bndrun index 10eb99837a7..91eec3f7e90 100644 --- a/itests/org.openhab.core.thing.xml.tests/itest.bndrun +++ b/itests/org.openhab.core.thing.xml.tests/itest.bndrun @@ -21,7 +21,6 @@ Fragment-Host: org.openhab.core.thing.xml jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ - com.google.gson;version='[2.8.6,2.8.7)',\ 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)',\ @@ -56,4 +55,5 @@ Fragment-Host: org.openhab.core.thing.xml org.openhab.core.thing.xml;version='[3.3.0,3.3.1)',\ org.openhab.core.thing.xml.tests;version='[3.3.0,3.3.1)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ - xstream;version='[1.4.19,1.4.20)' + xstream;version='[1.4.19,1.4.20)',\ + com.google.gson;version='[2.8.9,2.8.10)' diff --git a/itests/org.openhab.core.voice.tests/itest.bndrun b/itests/org.openhab.core.voice.tests/itest.bndrun index 7df58bb7fdd..ef1343dd1aa 100644 --- a/itests/org.openhab.core.voice.tests/itest.bndrun +++ b/itests/org.openhab.core.voice.tests/itest.bndrun @@ -23,8 +23,6 @@ Fragment-Host: org.openhab.core.voice jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ - com.google.gson;version='[2.8.6,2.8.7)',\ - org.objectweb.asm;version='[9.1.0,9.1.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)',\ @@ -69,4 +67,6 @@ Fragment-Host: org.openhab.core.voice org.openhab.core.voice.tests;version='[3.3.0,3.3.1)',\ org.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\ org.apache.xbean.finder;version='[4.20.0,4.20.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)' + org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ + com.google.gson;version='[2.8.9,2.8.10)',\ + org.objectweb.asm;version='[9.2.0,9.2.1)' diff --git a/pom.xml b/pom.xml index e6a5f8fee61..3944cc54dda 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ 4.3.6 0.12.0 1.7.32 - 2.25.0 + 2.26.0.RC1 2.0.3