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

Upgrade Xtext/Xtend to 2.25.0, LSP4J to 0.10.0 (#2278)

Browse Source 
For release notes, see:

https://www.eclipse.org/Xtext/releasenotes.html#/releasenotes/2021/03/02/version-2-25-0
https://github.com/eclipse/lsp4j/blob/master/CHANGELOG.md#v0100-nov-2020

Also aligns the spifly and xbean runtime dependencies with Karaf 4.3.1 which was not possible because the older Xtext required ASM 8.0.1.

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born 2021-04-08 16:17:59 +02:00 committed by GitHub
parent b1b58436f2
commit 6eba0a0c33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 115 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bom/runtime/pom.xml
View File

@ -298,7 +298,7 @@
<dependency>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
<version>1.2.3</version>
<version>1.3.2</version>
</dependency>
<!-- END: Slightly modified EnRoute implementation index artifacts -->
@ -697,13 +697,13 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-bundleutils</artifactId>
<version>4.17</version>
<version>4.18</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
<version>4.17</version>
<version>4.18</version>
<scope>compile</scope>
</dependency>
@ -711,7 +711,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>27.1-jre</version>
<version>30.1-jre</version>
<scope>compile</scope>
</dependency>

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.23.0)(!(version&gt;=2.24.0)))"</requirement>
<requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.25.0)(!(version&gt;=2.26.0)))"</requirement>
<feature dependency="true">openhab.tp-xtext</feature>
<requirement>openhab.tp;filter:="(feature=jax-rs-whiteboard)"</requirement>
@ -325,10 +325,10 @@
<feature name="openhab-core-model-lsp" version="${project.version}">
<requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.23.0)(!(version&gt;=2.24.0)))"</requirement>
<requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.25.0)(!(version&gt;=2.26.0)))"</requirement>
<feature dependency="true">openhab.tp-xtext-ide</feature>
<requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.9.0)(!(version&gt;=0.9.9)))"</requirement>
<requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.10.0)(!(version&gt;=0.11.0)))"</requirement>
<feature dependency="true">openhab.tp-lsp4j</feature>
<feature>openhab-core-model-item-ide</feature>

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

@ -175,9 +175,10 @@
</feature>
<feature name="openhab.tp-lsp4j" description="Eclipse LSP4J" version="${project.version}">
<capability>openhab.tp;feature=lsp4j;version=0.9.0</capability>
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.9.0</bundle>
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.9.0</bundle>
<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>
<feature dependency="true">openhab.tp-gson</feature>
<feature dependency="true">openhab.tp-xtext</feature>
@ -197,49 +198,49 @@
</feature>
<feature name="openhab.tp-xtext" description="Xtext - Language Engineering Made Easy" version="${project.version}">
<capability>openhab.tp;feature=xtext;version=2.23.0</capability>
<capability>openhab.tp;feature=xtext;version=2.25.0</capability>
<bundle>mvn:org.eclipse.xtext/org.eclipse.xtext/2.23.0</bundle>
<bundle>mvn:org.eclipse.xtext/org.eclipse.xtext/2.25.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.23.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.common.types/2.25.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.23.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.lib/2.23.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.smap/2.23.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.util/2.23.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib/2.23.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/2.23.0</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:com.google.guava/failureaccess/1.0.1</bundle>
<bundle dependency="true">mvn:com.google.guava/guava/27.1-jre</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.antlr.runtime/3.2.0.v201101311130</bundle>
<bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.common/3.10.400</bundle>
<bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.registry/3.8.400</bundle>
<bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.common/3.13.0</bundle>
<bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.registry/3.9.0</bundle>
<bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.supplement/1.9.0</bundle>
<!-- Add ASM package -->
<!-- org.eclipse.xtext.common.types is using Require-Bundle -->
<bundle dependency="true" start-level="20">mvn:org.ow2.asm/asm/8.0.1</bundle>
<bundle dependency="true" start-level="20">mvn:org.ow2.asm/asm/9.1</bundle>
</feature>
<feature name="openhab.tp-xtext-ide" description="Xtext - IDE Support" version="${project.version}">
<capability>openhab.tp;feature=xtext-ide;version=2.23.0</capability>
<capability>openhab.tp;feature=xtext-ide;version=2.25.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.23.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.ide/2.23.0</bundle>
<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>
</feature>
<feature name="openhab.tp-swagger-jaxrs" description="JAX-RS Whiteboard Swagger Support" version="${project.version}">

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

@ -31,11 +31,6 @@ Fragment-Host: org.openhab.core.io.rest.core
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
javax.xml.soap-api;version='[1.4.0,1.4.1)',\
org.apache.servicemix.specs.jaxws-api-2.3;version='[2.3.0,2.3.1)',\
org.apache.xbean.bundleutils;version='[4.17.0,4.17.1)',\
org.apache.xbean.finder;version='[4.17.0,4.17.1)',\
org.objectweb.asm;version='[8.0.1,8.0.2)',\
org.objectweb.asm.commons;version='[8.0.1,8.0.2)',\
org.objectweb.asm.tree;version='[8.0.1,8.0.2)',\
org.openhab.core;version='[3.1.0,3.1.1)',\
org.openhab.core.config.core;version='[3.1.0,3.1.1)',\
org.openhab.core.config.discovery;version='[3.1.0,3.1.1)',\
@ -75,4 +70,9 @@ Fragment-Host: org.openhab.core.io.rest.core
org.ops4j.pax.web.pax-web-api;version='[7.3.13,7.3.14)',\
org.ops4j.pax.web.pax-web-jetty;version='[7.3.13,7.3.14)',\
org.ops4j.pax.web.pax-web-spi;version='[7.3.13,7.3.14)',\
org.osgi.util.promise;version='[1.1.1,1.1.2)'
org.osgi.util.promise;version='[1.1.1,1.1.2)',\
org.apache.xbean.bundleutils;version='[4.18.0,4.18.1)',\
org.apache.xbean.finder;version='[4.18.0,4.18.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)'

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

@ -20,7 +20,6 @@ Fragment-Host: org.openhab.core.model.core
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)',\
com.google.guava;version='[27.1.0,27.1.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)',\
@ -30,22 +29,9 @@ Fragment-Host: org.openhab.core.model.core
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.apache.xbean.bundleutils;version='[4.17.0,4.17.1)',\
org.apache.xbean.finder;version='[4.17.0,4.17.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.eclipse.equinox.common;version='[3.12.0,3.12.1)',\
org.eclipse.xtend.lib;version='[2.23.0,2.23.1)',\
org.eclipse.xtend.lib.macro;version='[2.23.0,2.23.1)',\
org.eclipse.xtext;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.common.types;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.util;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.xbase;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.xbase.lib;version='[2.23.0,2.23.1)',\
org.objectweb.asm;version='[8.0.1,8.0.2)',\
org.objectweb.asm.commons;version='[8.0.1,8.0.2)',\
org.objectweb.asm.tree;version='[8.0.1,8.0.2)',\
org.openhab.core;version='[3.1.0,3.1.1)',\
org.openhab.core.audio;version='[3.1.0,3.1.1)',\
org.openhab.core.automation;version='[3.1.0,3.1.1)',\
@ -104,4 +90,18 @@ Fragment-Host: org.openhab.core.model.core
org.ops4j.pax.web.pax-web-runtime;version='[7.3.13,7.3.14)',\
org.ops4j.pax.web.pax-web-spi;version='[7.3.13,7.3.14)',\
org.osgi.util.function;version='[1.1.0,1.1.1)',\
org.osgi.util.promise;version='[1.1.1,1.1.2)'
org.osgi.util.promise;version='[1.1.1,1.1.2)',\
com.google.guava;version='[30.1.0,30.1.1)',\
org.apache.xbean.bundleutils;version='[4.18.0,4.18.1)',\
org.apache.xbean.finder;version='[4.18.0,4.18.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)'

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

@ -22,7 +22,6 @@ Fragment-Host: org.openhab.core.model.item
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)',\
com.google.guava;version='[27.1.0,27.1.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)',\
@ -32,22 +31,9 @@ Fragment-Host: org.openhab.core.model.item
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.apache.xbean.bundleutils;version='[4.17.0,4.17.1)',\
org.apache.xbean.finder;version='[4.17.0,4.17.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.eclipse.equinox.common;version='[3.12.0,3.12.1)',\
org.eclipse.xtend.lib;version='[2.23.0,2.23.1)',\
org.eclipse.xtend.lib.macro;version='[2.23.0,2.23.1)',\
org.eclipse.xtext;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.common.types;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.util;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.xbase;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.xbase.lib;version='[2.23.0,2.23.1)',\
org.objectweb.asm;version='[8.0.1,8.0.2)',\
org.objectweb.asm.commons;version='[8.0.1,8.0.2)',\
org.objectweb.asm.tree;version='[8.0.1,8.0.2)',\
org.openhab.core;version='[3.1.0,3.1.1)',\
org.openhab.core.audio;version='[3.1.0,3.1.1)',\
org.openhab.core.automation;version='[3.1.0,3.1.1)',\
@ -101,4 +87,18 @@ Fragment-Host: org.openhab.core.model.item
org.ops4j.pax.web.pax-web-runtime;version='[7.3.13,7.3.14)',\
org.ops4j.pax.web.pax-web-spi;version='[7.3.13,7.3.14)',\
org.osgi.util.function;version='[1.1.0,1.1.1)',\
org.osgi.util.promise;version='[1.1.1,1.1.2)'
org.osgi.util.promise;version='[1.1.1,1.1.2)',\
com.google.guava;version='[30.1.0,30.1.1)',\
org.apache.xbean.bundleutils;version='[4.18.0,4.18.1)',\
org.apache.xbean.finder;version='[4.18.0,4.18.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)'

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

@ -21,13 +21,11 @@ Fragment-Host: org.openhab.core.model.rule.runtime
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)',\
com.google.guava;version='[27.1.0,27.1.1)',\
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)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)',\
com.google.guava;version='[27.1.0,27.1.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)',\
@ -37,22 +35,9 @@ Fragment-Host: org.openhab.core.model.rule.runtime
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.apache.xbean.bundleutils;version='[4.17.0,4.17.1)',\
org.apache.xbean.finder;version='[4.17.0,4.17.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.eclipse.equinox.common;version='[3.12.0,3.12.1)',\
org.eclipse.xtend.lib;version='[2.23.0,2.23.1)',\
org.eclipse.xtend.lib.macro;version='[2.23.0,2.23.1)',\
org.eclipse.xtext;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.common.types;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.util;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.xbase;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.xbase.lib;version='[2.23.0,2.23.1)',\
org.objectweb.asm;version='[8.0.1,8.0.2)',\
org.objectweb.asm.commons;version='[8.0.1,8.0.2)',\
org.objectweb.asm.tree;version='[8.0.1,8.0.2)',\
org.openhab.core;version='[3.1.0,3.1.1)',\
org.openhab.core.audio;version='[3.1.0,3.1.1)',\
org.openhab.core.automation;version='[3.1.0,3.1.1)',\
@ -106,5 +91,19 @@ Fragment-Host: org.openhab.core.model.rule.runtime
org.ops4j.pax.web.pax-web-runtime;version='[7.3.13,7.3.14)',\
org.ops4j.pax.web.pax-web-spi;version='[7.3.13,7.3.14)',\
org.osgi.util.function;version='[1.1.0,1.1.1)',\
org.osgi.util.promise;version='[1.1.1,1.1.2)'
org.osgi.util.promise;version='[1.1.1,1.1.2)',\
com.google.guava;version='[30.1.0,30.1.1)',\
org.apache.xbean.bundleutils;version='[4.18.0,4.18.1)',\
org.apache.xbean.finder;version='[4.18.0,4.18.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)'
-runblacklist: bnd.identity;id='jakarta.activation-api'

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

@ -22,7 +22,6 @@ Fragment-Host: org.openhab.core.model.script
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)',\
com.google.guava;version='[27.1.0,27.1.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)',\
@ -32,22 +31,9 @@ Fragment-Host: org.openhab.core.model.script
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.apache.xbean.bundleutils;version='[4.17.0,4.17.1)',\
org.apache.xbean.finder;version='[4.17.0,4.17.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.eclipse.equinox.common;version='[3.12.0,3.12.1)',\
org.eclipse.xtend.lib;version='[2.23.0,2.23.1)',\
org.eclipse.xtend.lib.macro;version='[2.23.0,2.23.1)',\
org.eclipse.xtext;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.common.types;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.util;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.xbase;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.xbase.lib;version='[2.23.0,2.23.1)',\
org.objectweb.asm;version='[8.0.1,8.0.2)',\
org.objectweb.asm.commons;version='[8.0.1,8.0.2)',\
org.objectweb.asm.tree;version='[8.0.1,8.0.2)',\
org.openhab.core;version='[3.1.0,3.1.1)',\
org.openhab.core.audio;version='[3.1.0,3.1.1)',\
org.openhab.core.automation;version='[3.1.0,3.1.1)',\
@ -101,4 +87,18 @@ Fragment-Host: org.openhab.core.model.script
org.ops4j.pax.web.pax-web-runtime;version='[7.3.13,7.3.14)',\
org.ops4j.pax.web.pax-web-spi;version='[7.3.13,7.3.14)',\
org.osgi.util.function;version='[1.1.0,1.1.1)',\
org.osgi.util.promise;version='[1.1.1,1.1.2)'
org.osgi.util.promise;version='[1.1.1,1.1.2)',\
com.google.guava;version='[30.1.0,30.1.1)',\
org.apache.xbean.bundleutils;version='[4.18.0,4.18.1)',\
org.apache.xbean.finder;version='[4.18.0,4.18.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)'

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

@ -24,7 +24,6 @@ Fragment-Host: org.openhab.core.model.thing
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)',\
com.google.guava;version='[27.1.0,27.1.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)',\
@ -34,22 +33,9 @@ Fragment-Host: org.openhab.core.model.thing
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.apache.xbean.bundleutils;version='[4.17.0,4.17.1)',\
org.apache.xbean.finder;version='[4.17.0,4.17.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.eclipse.equinox.common;version='[3.12.0,3.12.1)',\
org.eclipse.xtend.lib;version='[2.23.0,2.23.1)',\
org.eclipse.xtend.lib.macro;version='[2.23.0,2.23.1)',\
org.eclipse.xtext;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.common.types;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.util;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.xbase;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.xbase.lib;version='[2.23.0,2.23.1)',\
org.objectweb.asm;version='[8.0.1,8.0.2)',\
org.objectweb.asm.commons;version='[8.0.1,8.0.2)',\
org.objectweb.asm.tree;version='[8.0.1,8.0.2)',\
org.openhab.core;version='[3.1.0,3.1.1)',\
org.openhab.core.audio;version='[3.1.0,3.1.1)',\
org.openhab.core.automation;version='[3.1.0,3.1.1)',\
@ -114,4 +100,18 @@ Fragment-Host: org.openhab.core.model.thing
org.ops4j.pax.web.pax-web-runtime;version='[7.3.13,7.3.14)',\
org.ops4j.pax.web.pax-web-spi;version='[7.3.13,7.3.14)',\
org.osgi.util.function;version='[1.1.0,1.1.1)',\
org.osgi.util.promise;version='[1.1.1,1.1.2)'
org.osgi.util.promise;version='[1.1.1,1.1.2)',\
com.google.guava;version='[30.1.0,30.1.1)',\
org.apache.xbean.bundleutils;version='[4.18.0,4.18.1)',\
org.apache.xbean.finder;version='[4.18.0,4.18.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)'

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

@ -21,11 +21,6 @@ Fragment-Host: org.openhab.core.voice
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)',\
org.apache.xbean.bundleutils;version='[4.17.0,4.17.1)',\
org.apache.xbean.finder;version='[4.17.0,4.17.1)',\
org.objectweb.asm;version='[8.0.1,8.0.2)',\
org.objectweb.asm.commons;version='[8.0.1,8.0.2)',\
org.objectweb.asm.tree;version='[8.0.1,8.0.2)',\
org.openhab.core;version='[3.1.0,3.1.1)',\
org.openhab.core.audio;version='[3.1.0,3.1.1)',\
org.openhab.core.config.core;version='[3.1.0,3.1.1)',\
@ -60,4 +55,9 @@ Fragment-Host: org.openhab.core.voice
org.ops4j.pax.web.pax-web-runtime;version='[7.3.13,7.3.14)',\
org.ops4j.pax.web.pax-web-spi;version='[7.3.13,7.3.14)',\
org.osgi.util.function;version='[1.1.0,1.1.1)',\
org.osgi.util.promise;version='[1.1.1,1.1.2)'
org.osgi.util.promise;version='[1.1.1,1.1.2)',\
org.apache.xbean.bundleutils;version='[4.18.0,4.18.1)',\
org.apache.xbean.finder;version='[4.18.0,4.18.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)'

2
pom.xml
View File

@ -76,7 +76,7 @@
<karaf.tooling.version>4.3.1</karaf.tooling.version>
<sat.version>0.10.0</sat.version>
<slf4j.version>1.7.21</slf4j.version>
<xtext.version>2.23.0</xtext.version>
<xtext.version>2.25.0</xtext.version>
<spotless.version>2.0.3</spotless.version>
</properties>