demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-10 21:31:53 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Upgrade Xtext/Xtend to 2.26.0, LSP4J to 0.12.0 (#2786)

Browse Source 
For release notes, see:

https://www.eclipse.org/Xtext/releasenotes.html#/releasenotes/2022/02/28/version-2-26-0

This release adds initial support for Java 17.

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born 2022-03-05 11:28:56 +01:00 committed by GitHub
parent 7f2edc6f93
commit 44f9baff18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
44 changed files with 227 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bom/compile-model/pom.xml
View File

@ -83,6 +83,12 @@
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
<exclusions>
<exclusion>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@ -102,7 +108,7 @@
</exclusions>
</dependency>
<!--Xbase -->
<!-- Xbase -->
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xbase</artifactId>
@ -130,6 +136,22 @@
<scope>compile</scope>
</dependency>
<!-- Classgraph -->
<dependency>
<groupId>org.eclipse.orbit.bundles</groupId>
<artifactId>io.github.classgraph</artifactId>
<version>4.8.138.v20211212-1642 </version>
<scope>compile</scope>
</dependency>
<!-- Guice -->
<dependency>
<groupId>org.eclipse.orbit.bundles</groupId>
<artifactId>com.google.inject</artifactId>
<version>5.0.1.v20210324-2015</version>
<scope>compile</scope>
</dependency>
<!-- TEST -->
<dependency>
<groupId>org.eclipse.xtext</groupId>
@ -141,6 +163,10 @@
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</exclusion>
</exclusions>
</dependency>

2
bom/compile/pom.xml
View File

@ -87,7 +87,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.6</version>
<version>2.8.9</version>
<scope>compile</scope>
</dependency>

26
bom/runtime/pom.xml
View File

@ -427,7 +427,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.6</version>
<version>2.8.9</version>
<scope>compile</scope>
</dependency>
@ -751,14 +751,20 @@
<!-- EMF, Xtext -->
<dependency>
<groupId>org.eclipse.orbit.bundles</groupId>
<artifactId>org.antlr.runtime</artifactId>
<version>3.2.0.v201101311130</version>
<artifactId>com.google.inject</artifactId>
<version>5.0.1.v20210324-2015</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.orbit.bundles</groupId>
<artifactId>io.github.classgraph</artifactId>
<version>4.8.35.v20190528-1517</version>
<version>4.8.138.v20211212-1642 </version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.orbit.bundles</groupId>
<artifactId>org.antlr.runtime</artifactId>
<version>3.2.0.v201101311130</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -798,6 +804,12 @@
<artifactId>org.eclipse.xtext</artifactId>
<version>${xtext.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
@ -828,6 +840,12 @@
<artifactId>org.eclipse.xtext.util</artifactId>
<version>${xtext.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>

2
bundles/org.openhab.core.model.item/bnd.bnd
View File

@ -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"

6
bundles/org.openhab.core.model.item/pom.xml
View File

@ -45,7 +45,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.4.0</version>
<version>3.0.0</version>
<configuration>
<executable>java</executable>
<classpathScope>compile</classpathScope>
@ -62,12 +62,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.2</version>
<version>1.7.36</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.6.4</version>
<version>1.7.36</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>

6
bundles/org.openhab.core.model.persistence/bnd.bnd
View File

@ -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

6
bundles/org.openhab.core.model.persistence/pom.xml
View File

@ -50,7 +50,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.4.0</version>
<version>3.0.0</version>
<configuration>
<executable>java</executable>
<classpathScope>compile</classpathScope>
@ -67,12 +67,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.2</version>
<version>1.7.36</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.6.4</version>
<version>1.7.36</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>

4
bundles/org.openhab.core.model.rule/bnd.bnd
View File

@ -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

6
bundles/org.openhab.core.model.rule/pom.xml
View File

@ -45,7 +45,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.4.0</version>
<version>3.0.0</version>
<configuration>
<executable>java</executable>
<classpathScope>compile</classpathScope>
@ -62,12 +62,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.2</version>
<version>1.7.36</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.6.4</version>
<version>1.7.36</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>

4
bundles/org.openhab.core.model.script/bnd.bnd
View File

@ -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

6
bundles/org.openhab.core.model.script/pom.xml
View File

@ -76,7 +76,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.4.0</version>
<version>3.0.0</version>
<configuration>
<executable>java</executable>
<classpathScope>compile</classpathScope>
@ -93,12 +93,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.2</version>
<version>1.7.36</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.6.4</version>
<version>1.7.36</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>

2
bundles/org.openhab.core.model.sitemap/bnd.bnd
View File

@ -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"

6
bundles/org.openhab.core.model.sitemap/pom.xml
View File

@ -45,7 +45,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.4.0</version>
<version>3.0.0</version>
<configuration>
<executable>java</executable>
<classpathScope>compile</classpathScope>
@ -62,12 +62,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.2</version>
<version>1.7.36</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.6.4</version>
<version>1.7.36</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>

4
bundles/org.openhab.core.model.thing/bnd.bnd
View File

@ -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

6
bundles/org.openhab.core.model.thing/pom.xml
View File

@ -68,7 +68,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.4.0</version>
<version>3.0.0</version>
<configuration>
<executable>java</executable>
<classpathScope>compile</classpathScope>
@ -85,12 +85,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.2</version>
<version>1.7.36</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.6.4</version>
<version>1.7.36</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>

6
features/karaf/openhab-core/src/main/feature/feature.xml
View File

@ -28,7 +28,7 @@
<feature dependency="true">openhab.tp-gson</feature>
<requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.25.0)(!(version&gt;=2.26.0)))"</requirement>
<requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.26.0)(!(version&gt;=2.27.0)))"</requirement>
<feature dependency="true">openhab.tp-xtext</feature>
<requirement>openhab.tp;filter:="(feature=jax-rs-whiteboard)"</requirement>
@ -335,10 +335,10 @@
<feature name="openhab-core-model-lsp" version="${project.version}">
<requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.25.0)(!(version&gt;=2.26.0)))"</requirement>
<requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.26.0)(!(version&gt;=2.27.0)))"</requirement>
<feature dependency="true">openhab.tp-xtext-ide</feature>
<requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.10.0)(!(version&gt;=0.11.0)))"</requirement>
<requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.12.0)(!(version&gt;=0.13.0)))"</requirement>
<feature dependency="true">openhab.tp-lsp4j</feature>
<feature>openhab-core-model-item-ide</feature>

42
features/karaf/openhab-tp/src/main/feature/feature.xml
View File

@ -53,8 +53,8 @@
</feature>
<feature name="openhab.tp-gson" description="Gson" version="${project.version}">
<capability>openhab.tp;feature=gson;version=2.8.6</capability>
<bundle>mvn:com.google.code.gson/gson/2.8.6</bundle>
<capability>openhab.tp;feature=gson;version=2.8.9</capability>
<bundle>mvn:com.google.code.gson/gson/2.8.9</bundle>
</feature>
<feature name="openhab.tp-hivemqclient" description="MQTT Client" version="${project.version}">
@ -193,10 +193,9 @@
</feature>
<feature name="openhab.tp-lsp4j" description="Eclipse LSP4J" version="${project.version}">
<capability>openhab.tp;feature=lsp4j;version=0.10.0</capability>
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.10.0</bundle>
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.10.0</bundle>
<bundle dependency="true">mvn:com.google.guava/guava/27.1-jre</bundle>
<capability>openhab.tp;feature=lsp4j;version=0.12.0</capability>
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.12.0</bundle>
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.12.0</bundle>
<feature dependency="true">openhab.tp-gson</feature>
<feature dependency="true">openhab.tp-xtext</feature>
@ -216,31 +215,32 @@
</feature>
<feature name="openhab.tp-xtext" description="Xtext - Language Engineering Made Easy" version="${project.version}">
<capability>openhab.tp;feature=xtext;version=2.25.0</capability>
<capability>openhab.tp;feature=xtext;version=2.26.0</capability>
<bundle>mvn:org.eclipse.xtext/org.eclipse.xtext/2.25.0</bundle>
<bundle>mvn:org.eclipse.xtext/org.eclipse.xtext/2.26.0</bundle>
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.common/2.17.0</bundle>
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore/2.20.0</bundle>
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore.change/2.14.0</bundle>
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore.xmi/2.16.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.common.types/2.25.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.common.types/2.26.0</bundle>
<bundle dependency="true">mvn:javax.annotation/javax.annotation-api/1.2</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase/2.25.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.lib/2.25.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.smap/2.25.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.util/2.25.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib/2.25.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/2.25.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase/2.26.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.lib/2.26.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.smap/2.26.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.util/2.26.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib/2.26.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/2.26.0</bundle>
<bundle dependency="true">mvn:com.google.guava/failureaccess/1.0.1</bundle>
<bundle dependency="true">mvn:com.google.guava/guava/30.1-jre</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/1_2</bundle>
<bundle dependency="true">mvn:org.eclipse.orbit.bundles/com.google.inject/3.0.0.v201312141243</bundle>
<bundle dependency="true">mvn:org.eclipse.orbit.bundles/io.github.classgraph/4.8.35.v20190528-1517</bundle>
<bundle dependency="true">mvn:org.eclipse.orbit.bundles/org.aopalliance/1.0.0.v201105210816</bundle>
<bundle dependency="true">mvn:org.eclipse.orbit.bundles/com.google.inject/5.0.1.v20210324-2015</bundle>
<bundle dependency="true">mvn:org.eclipse.orbit.bundles/io.github.classgraph/4.8.138.v20211212-1642</bundle>
<bundle dependency="true">mvn:org.eclipse.orbit.bundles/org.antlr.runtime/3.2.0.v201101311130</bundle>
<bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.common/3.13.0</bundle>
@ -249,16 +249,16 @@
<!-- Add ASM package -->
<!-- org.eclipse.xtext.common.types is using Require-Bundle -->
<bundle dependency="true" start-level="20">mvn:org.ow2.asm/asm/9.1</bundle>
<bundle dependency="true" start-level="20">mvn:org.ow2.asm/asm/9.2</bundle>
</feature>
<feature name="openhab.tp-xtext-ide" description="Xtext - IDE Support" version="${project.version}">
<capability>openhab.tp;feature=xtext-ide;version=2.25.0</capability>
<capability>openhab.tp;feature=xtext-ide;version=2.26.0</capability>
<feature dependency="true">openhab.tp-xtext</feature>
<!-- Support for the Language Server Protocol -->
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.ide/2.25.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.ide/2.25.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.ide/2.26.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.ide/2.26.0</bundle>
</feature>
<feature name="openhab.tp-swagger-jaxrs" description="JAX-RS Whiteboard Swagger Support" version="${project.version}">

4
itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
View File

@ -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)'

4
itests/org.openhab.core.automation.integration.tests/itest.bndrun
View File

@ -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)'

4
itests/org.openhab.core.automation.module.core.tests/itest.bndrun
View File

@ -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)'

4
itests/org.openhab.core.automation.module.script.tests/itest.bndrun
View File

@ -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)'

4
itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
View File

@ -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)'

4
itests/org.openhab.core.automation.tests/itest.bndrun
View File

@ -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)'

4
itests/org.openhab.core.binding.xml.tests/itest.bndrun
View File

@ -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)'

4
itests/org.openhab.core.config.core.tests/itest.bndrun
View File

@ -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)'

4
itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
View File

@ -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)'

4
itests/org.openhab.core.config.discovery.tests/itest.bndrun
View File

@ -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)'

4
itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun
View File

@ -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)'

4
itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
View File

@ -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)'

4
itests/org.openhab.core.config.dispatch.tests/itest.bndrun
View File

@ -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)'

4
itests/org.openhab.core.config.xml.tests/itest.bndrun
View File

@ -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)'

4
itests/org.openhab.core.ephemeris.tests/itest.bndrun
View File

@ -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)'

6
itests/org.openhab.core.io.rest.core.tests/itest.bndrun
View File

@ -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)'

64
itests/org.openhab.core.model.core.tests/itest.bndrun
View File

@ -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)'

23
itests/org.openhab.core.model.item.tests/itest.bndrun
View File

@ -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)'

26
itests/org.openhab.core.model.rule.tests/itest.bndrun
View File

@ -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'

23
itests/org.openhab.core.model.script.tests/itest.bndrun
View File

@ -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)'

25
itests/org.openhab.core.model.thing.tests/itest.bndrun
View File

@ -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)'

4
itests/org.openhab.core.storage.json.tests/itest.bndrun
View File

@ -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)'

4
itests/org.openhab.core.tests/itest.bndrun
View File

@ -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)'

4
itests/org.openhab.core.thing.tests/itest.bndrun
View File

@ -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)'

4
itests/org.openhab.core.thing.xml.tests/itest.bndrun
View File

@ -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)'

6
itests/org.openhab.core.voice.tests/itest.bndrun
View File

@ -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)'

2
pom.xml
View File

@ -76,7 +76,7 @@
<karaf.tooling.version>4.3.6</karaf.tooling.version>
<sat.version>0.12.0</sat.version>
<slf4j.version>1.7.32</slf4j.version>
<xtext.version>2.25.0</xtext.version>
<xtext.version>2.26.0</xtext.version>
<spotless.version>2.0.3</spotless.version>
</properties>