Skip to content

Commit

Permalink
Upgrade Xtext/Xtend to 2.32.0, LSP4J to 0.21.0
Browse files Browse the repository at this point in the history 
Upgrades Xtext and its dependencies to:

* Xtext/Xtend 2.32.0
* LSP4J 0.21.0
* GSON 2.10.1
* Guava 32.1.2
* Guice 7.0.0

For release notes, see:

https://eclipse.dev/Xtext/releasenotes.html#/releasenotes/2023/08/27/version-2-32-0

Fixes openhab#3321

Signed-off-by: Wouter Born <github@maindrain.net>
  • Loading branch information
@wborn
wborn committed Oct 1, 2023
1 parent d4a433a commit 0486d4b
Show file tree
Hide file tree
Showing 30 changed files with 158 additions and 189 deletions.
18 changes: 0 additions & 18 deletions bom/compile-model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,6 @@
<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>
Expand Down Expand Up @@ -144,14 +138,6 @@
<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>
Expand All @@ -163,10 +149,6 @@
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down
7 changes: 4 additions & 3 deletions bom/compile/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,11 @@
</dependency>

<!-- Gson -->
<!-- The Orbit bundle is used because LSP4J imports com.google.gson.internal -->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.9.1</version>
<groupId>org.eclipse.orbit.bundles</groupId>
<artifactId>com.google.gson</artifactId>
<version>2.10.1.v20230109-0753</version>
<scope>compile</scope>
</dependency>

Expand Down
20 changes: 4 additions & 16 deletions bom/runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -443,9 +443,9 @@

<!-- Gson -->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.9.1</version>
<groupId>org.eclipse.orbit.bundles</groupId>
<artifactId>com.google.gson</artifactId>
<version>2.10.1.v20230109-0753</version>
<scope>compile</scope>
</dependency>

Expand Down Expand Up @@ -789,7 +789,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>30.1-jre</version>
<version>32.1.2-jre</version>
<scope>compile</scope>
</dependency>

Expand Down Expand Up @@ -849,12 +849,6 @@
<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>
Expand Down Expand Up @@ -885,12 +879,6 @@
<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>
Expand Down
6 changes: 3 additions & 3 deletions features/karaf/openhab-core/src/main/feature/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<feature dependency="true">openhab.tp-gson</feature>

<requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.29.0)(!(version&gt;=2.30.0)))"</requirement>
<requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.32.0)(!(version&gt;=2.33.0)))"</requirement>
<feature dependency="true">openhab.tp-xtext</feature>

<requirement>openhab.tp;filter:="(feature=jax-rs-whiteboard)"</requirement>
Expand Down Expand Up @@ -352,10 +352,10 @@

<feature name="openhab-core-model-lsp" version="${project.version}">

<requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.29.0)(!(version&gt;=2.30.0)))"</requirement>
<requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.32.0)(!(version&gt;=2.33.0)))"</requirement>
<feature dependency="true">openhab.tp-xtext-ide</feature>

<requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.19.0)(!(version&gt;=0.20.0)))"</requirement>
<requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.21.0)(!(version&gt;=0.22.0)))"</requirement>
<feature dependency="true">openhab.tp-lsp4j</feature>

<feature>openhab-core-model-item-ide</feature>
Expand Down
54 changes: 26 additions & 28 deletions features/karaf/openhab-tp/src/main/feature/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@
<feature>pax-web-jetty-extras</feature>
<!-- Apache Commons -->
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.12.0</bundle>

<!-- Measurement -->
<bundle dependency="true">mvn:jakarta.annotation/jakarta.annotation-api/2.0.0</bundle>
<bundle dependency="true">mvn:jakarta.inject/jakarta.inject-api/2.0.0</bundle>
<bundle dependency="true">mvn:jakarta.inject/jakarta.inject-api/1.0.5</bundle>
<bundle dependency="true">mvn:javax.measure/unit-api/2.2</bundle>
<!-- The si.uom:si-units manifest has no Export-Package entry. As workaround this OSGi-ify bundle is used. -->
<bundle dependency="true">mvn:org.openhab.osgiify/si.uom.si-units/2.1</bundle>
Expand Down Expand Up @@ -55,8 +54,8 @@
</feature>

<feature name="openhab.tp-gson" description="Gson" version="${project.version}">
<capability>openhab.tp;feature=gson;version=2.9.1</capability>
<bundle>mvn:com.google.code.gson/gson/2.9.1</bundle>
<capability>openhab.tp;feature=gson;version=2.10.1</capability>
<bundle>mvn:org.eclipse.orbit.bundles/com.google.gson/2.10.1.v20230109-0753</bundle>
</feature>

<feature name="openhab.tp-hivemqclient" description="MQTT Client" version="${project.version}">
Expand Down Expand Up @@ -198,9 +197,9 @@
</feature>

<feature name="openhab.tp-lsp4j" description="Eclipse LSP4J" version="${project.version}">
<capability>openhab.tp;feature=lsp4j;version=0.19.0</capability>
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.19.0</bundle>
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.19.0</bundle>
<capability>openhab.tp;feature=lsp4j;version=0.21.0</capability>
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.21.0</bundle>
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.21.0</bundle>

<feature dependency="true">openhab.tp-gson</feature>
<feature dependency="true">openhab.tp-xtext</feature>
Expand All @@ -220,50 +219,49 @@
</feature>

<feature name="openhab.tp-xtext" description="Xtext - Language Engineering Made Easy" version="${project.version}">
<capability>openhab.tp;feature=xtext;version=2.29.0</capability>
<capability>openhab.tp;feature=xtext;version=${xtext.version}</capability>

<bundle>mvn:org.eclipse.xtext/org.eclipse.xtext/2.29.0</bundle>
<bundle>mvn:org.eclipse.xtext/org.eclipse.xtext/${xtext.version}</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.common/2.24.0</bundle>
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore/2.26.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.29.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.common.types/${xtext.version}</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.29.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.lib/2.29.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.smap/2.29.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.util/2.29.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib/2.29.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/2.29.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase/${xtext.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.lib/${xtext.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.smap/${xtext.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.util/${xtext.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib/${xtext.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/${xtext.version}</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:com.google.guava/guava/32.1.2-jre</bundle>
<bundle dependency="true">mvn:com.google.inject/guice/7.0.0</bundle>
<bundle dependency="true">mvn:jakarta.inject/jakarta.inject-api/2.0.1</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.149.v20220915-0556</bundle>
<bundle dependency="true">mvn:org.eclipse.orbit.bundles/org.antlr.runtime/3.2.0.v201101311130</bundle>

<bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.common/3.13.0</bundle>
<bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.common/3.18.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/9.4</bundle>
<!-- Used for feature verification only because this is already provided by Karaf -->
<bundle dependency="true" start="false">mvn:org.eclipse.platform/org.eclipse.osgi/3.18.0</bundle>
</feature>

<feature name="openhab.tp-xtext-ide" description="Xtext - IDE Support" version="${project.version}">
<capability>openhab.tp;feature=xtext-ide;version=2.29.0</capability>
<capability>openhab.tp;feature=xtext-ide;version=${xtext.version}</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.29.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.ide/2.29.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.ide/${xtext.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.ide/${xtext.version}</bundle>
</feature>

<feature name="openhab.tp-swagger-jaxrs" description="JAX-RS Whiteboard Swagger Support" version="${project.version}">
Expand Down
6 changes: 3 additions & 3 deletions itests/org.openhab.core.addon.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ Fragment-Host: org.openhab.core.addon
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
com.google.gson;version='[2.9.1,2.9.2)',\
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.0,1.5.1)',\
Expand Down Expand Up @@ -60,11 +59,12 @@ Fragment-Host: org.openhab.core.addon
org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\
org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\
org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\
org.objectweb.asm;version='[9.4.0,9.4.1)',\
org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\
org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\
org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\
org.objectweb.asm.util;version='[9.4.0,9.4.1)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)'
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.10.1,2.10.2)',\
org.objectweb.asm;version='[9.5.0,9.5.1)'
6 changes: 3 additions & 3 deletions itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ Fragment-Host: org.openhab.core.auth.oauth2client
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
com.google.gson;version='[2.9.1,2.9.2)',\
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.0,1.5.1)',\
Expand Down Expand Up @@ -68,11 +67,12 @@ Fragment-Host: org.openhab.core.auth.oauth2client
org.eclipse.jetty.websocket.api;version='[9.4.52,9.4.53)',\
org.eclipse.jetty.websocket.client;version='[9.4.52,9.4.53)',\
org.eclipse.jetty.websocket.common;version='[9.4.52,9.4.53)',\
org.objectweb.asm;version='[9.4.0,9.4.1)',\
org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\
org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\
org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\
org.objectweb.asm.util;version='[9.4.0,9.4.1)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)'
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.10.1,2.10.2)',\
org.objectweb.asm;version='[9.5.0,9.5.1)'
6 changes: 3 additions & 3 deletions itests/org.openhab.core.automation.integration.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ Fragment-Host: org.openhab.core.automation
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
com.google.gson;version='[2.9.1,2.9.2)',\
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.0,1.5.1)',\
Expand Down Expand Up @@ -66,11 +65,12 @@ Fragment-Host: org.openhab.core.automation
org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\
org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\
org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\
org.objectweb.asm;version='[9.4.0,9.4.1)',\
org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\
org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\
org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\
org.objectweb.asm.util;version='[9.4.0,9.4.1)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)'
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.10.1,2.10.2)',\
org.objectweb.asm;version='[9.5.0,9.5.1)'
6 changes: 3 additions & 3 deletions itests/org.openhab.core.automation.module.core.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ Fragment-Host: org.openhab.core.automation
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
com.google.gson;version='[2.9.1,2.9.2)',\
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.0,1.5.1)',\
Expand Down Expand Up @@ -66,11 +65,12 @@ Fragment-Host: org.openhab.core.automation
org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\
org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\
org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\
org.objectweb.asm;version='[9.4.0,9.4.1)',\
org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\
org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\
org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\
org.objectweb.asm.util;version='[9.4.0,9.4.1)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)'
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.10.1,2.10.2)',\
org.objectweb.asm;version='[9.5.0,9.5.1)'
6 changes: 3 additions & 3 deletions itests/org.openhab.core.automation.module.script.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ Fragment-Host: org.openhab.core.automation.module.script
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
com.google.gson;version='[2.9.1,2.9.2)',\
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.0,1.5.1)',\
Expand Down Expand Up @@ -63,11 +62,12 @@ Fragment-Host: org.openhab.core.automation.module.script
org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\
org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\
org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\
org.objectweb.asm;version='[9.4.0,9.4.1)',\
org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\
org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\
org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\
org.objectweb.asm.util;version='[9.4.0,9.4.1)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)'
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.10.1,2.10.2)',\
org.objectweb.asm;version='[9.5.0,9.5.1)'
6 changes: 3 additions & 3 deletions itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ Fragment-Host: org.openhab.core.automation
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
com.google.gson;version='[2.9.1,2.9.2)',\
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.0,1.5.1)',\
Expand Down Expand Up @@ -66,11 +65,12 @@ Fragment-Host: org.openhab.core.automation
org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\
org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\
org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\
org.objectweb.asm;version='[9.4.0,9.4.1)',\
org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\
org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\
org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\
org.objectweb.asm.util;version='[9.4.0,9.4.1)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)'
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.10.1,2.10.2)',\
org.objectweb.asm;version='[9.5.0,9.5.1)'
6 changes: 3 additions & 3 deletions itests/org.openhab.core.automation.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ Fragment-Host: org.openhab.core.automation
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
com.google.gson;version='[2.9.1,2.9.2)',\
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.0,1.5.1)',\
Expand Down Expand Up @@ -66,11 +65,12 @@ Fragment-Host: org.openhab.core.automation
org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\
org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\
org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\
org.objectweb.asm;version='[9.4.0,9.4.1)',\
org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\
org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\
org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\
org.objectweb.asm.util;version='[9.4.0,9.4.1)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)'
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.10.1,2.10.2)',\
org.objectweb.asm;version='[9.5.0,9.5.1)'
Loading

0 comments on commit 0486d4b

Please sign in to comment.