Skip to content

Commit

Permalink
Adapt to xtext 2.35.0.M1
Browse files Browse the repository at this point in the history
* xtext 2.35.0.M1
* Additional library upgrades
* Resolve itest runbundles

Signed-off-by: Holger Friedrich <[email protected]>
  • Loading branch information
holgerfriedrich committed May 12, 2024
1 parent 529240c commit f3560c8
Show file tree
Hide file tree
Showing 41 changed files with 87 additions and 83 deletions.
2 changes: 1 addition & 1 deletion bom/compile-model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
<dependency>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
<version>4.8.168</version>
<version>4.8.172</version>
<scope>compile</scope>
</dependency>

Expand Down
6 changes: 3 additions & 3 deletions bom/compile/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.component</artifactId>
<version>1.5.0</version>
<version>1.5.1</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.component.annotations</artifactId>
<version>1.5.0</version>
<version>1.5.1</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Expand Down Expand Up @@ -76,7 +76,7 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.2</version>
<version>1.3.2</version>
<scope>compile</scope>
</dependency>

Expand Down
10 changes: 5 additions & 5 deletions bom/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.component</artifactId>
<version>1.5.0</version>
<version>1.5.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.component.annotations</artifactId>
<version>1.5.0</version>
<version>1.5.1</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -98,7 +98,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.metatype</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
<scope>compile</scope>
</dependency>

Expand Down Expand Up @@ -148,7 +148,7 @@
<dependency>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
<version>2.0.0</version>
<version>2.0.2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -808,7 +808,7 @@
<dependency>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
<version>4.8.168</version>
<version>4.8.172</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion bom/test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
<version>2.0.0</version>
<version>2.0.2</version>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.core.io.console.eclipse/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>3.13.100</version>
<version>3.18.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.core.io.transport.modbus/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
<version>2.8.1</version>
<version>2.11.1</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions bundles/org.openhab.core.model.item/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.36</version>
<version>${slf4j-for-model.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.36</version>
<version>${slf4j-for-model.version}</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
Expand Down
4 changes: 2 additions & 2 deletions bundles/org.openhab.core.model.persistence/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.36</version>
<version>${slf4j-for-model.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.36</version>
<version>${slf4j-for-model.version}</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
Expand Down
4 changes: 2 additions & 2 deletions bundles/org.openhab.core.model.rule/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.36</version>
<version>${slf4j-for-model.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.36</version>
<version>${slf4j-for-model.version}</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
Expand Down
4 changes: 2 additions & 2 deletions bundles/org.openhab.core.model.script/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.36</version>
<version>${slf4j-for-model.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.36</version>
<version>${slf4j-for-model.version}</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
Expand Down
4 changes: 2 additions & 2 deletions bundles/org.openhab.core.model.sitemap/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.36</version>
<version>${slf4j-for-model.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.36</version>
<version>${slf4j-for-model.version}</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
Expand Down
4 changes: 2 additions & 2 deletions bundles/org.openhab.core.model.thing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.36</version>
<version>${slf4j-for-model.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.36</version>
<version>${slf4j-for-model.version}</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
Expand Down
2 changes: 1 addition & 1 deletion bundles/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@
<!-- Required for JDK 17 compatibility, see: https://github.com/highsource/maven-jaxb2-plugin/issues/207 -->
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.6</version>
<version>2.3.8</version>
</dependency>
</dependencies>
<executions>
Expand Down
2 changes: 1 addition & 1 deletion features/karaf/openhab-core/src/main/feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@
<feature>openhab-core-base</feature>
<feature>openhab-transport-serial</feature>

<bundle dependency="true">mvn:org.apache.commons/commons-pool2/2.8.1</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-pool2/2.11.1</bundle>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.transport.modbus/${project.version}</bundle>
</feature>

Expand Down
10 changes: 5 additions & 5 deletions features/karaf/openhab-tp/src/main/feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<bundle dependency="true">mvn:tech.units/indriya/2.2</bundle>
<bundle dependency="true">mvn:tech.uom.lib/uom-lib-common/2.2</bundle>
<bundle dependency="true">mvn:org.apiguardian/apiguardian-api/1.1.2</bundle>
<bundle dependency="true">mvn:org.osgi/org.osgi.service.component.annotations/1.5.0</bundle>
<bundle dependency="true">mvn:org.osgi/org.osgi.service.component.annotations/1.5.1</bundle>

<!-- TODO: Unbundled libraries -->
<bundle dependency="true">mvn:com.thoughtworks.xstream/xstream/1.4.20</bundle>
Expand Down Expand Up @@ -96,7 +96,7 @@
</feature>

<feature name="openhab.tp-jax-rs-whiteboard" description="Aries JAX-RS Whiteboard" version="${project.version}">
<capability>openhab.tp;feature=jax-rs-whiteboard;version=2.0.0</capability>
<capability>openhab.tp;feature=jax-rs-whiteboard;version=2.0.2</capability>
<feature dependency="true">spifly</feature>
<feature dependency="true">http-whiteboard</feature>
<feature dependency="true">openhab.tp-cxf</feature>
Expand All @@ -105,7 +105,7 @@
<bundle dependency="true">mvn:org.osgi/org.osgi.util.promise/1.3.0</bundle>
<bundle dependency="true">mvn:org.osgi/org.osgi.service.jaxrs/1.0.1</bundle>
<bundle>mvn:org.apache.aries.component-dsl/org.apache.aries.component-dsl.component-dsl/1.2.2</bundle>
<bundle>mvn:org.apache.aries.jax.rs/org.apache.aries.jax.rs.whiteboard/2.0.0</bundle>
<bundle>mvn:org.apache.aries.jax.rs/org.apache.aries.jax.rs.whiteboard/2.0.2</bundle>
</feature>

<feature name="openhab.tp-jna" description="Java Native Access (JNA)" version="${project.version}">
Expand Down Expand Up @@ -237,7 +237,7 @@
<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/${xtext.version}</bundle>

<bundle dependency="true">mvn:javax.annotation/javax.annotation-api/1.2</bundle>
<bundle dependency="true">mvn:javax.annotation/javax.annotation-api/1.3.2</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>
Expand All @@ -252,7 +252,7 @@
<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:io.github.classgraph/classgraph/4.8.168</bundle>
<bundle dependency="true">mvn:io.github.classgraph/classgraph/4.8.172</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.18.0</bundle>
Expand Down
2 changes: 1 addition & 1 deletion itests/org.openhab.core.addon.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Fragment-Host: org.openhab.core.addon
org.osgi.util.function;version='[1.2.0,1.2.1)',\
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)',\
org.osgi.service.component;version='[1.5.1,1.5.2)'
xstream;version='[1.4.20,1.4.21)',\
org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Fragment-Host: org.openhab.core.auth.oauth2client
org.osgi.util.function;version='[1.2.0,1.2.1)',\
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)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Fragment-Host: org.openhab.core.automation
org.osgi.util.function;version='[1.2.0,1.2.1)',\
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)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.20,1.4.21)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
Expand Down Expand Up @@ -57,7 +57,7 @@ Fragment-Host: org.openhab.core.automation
org.openhab.core.test;version='[4.2.0,4.2.1)',\
org.openhab.core.thing;version='[4.2.0,4.2.1)',\
org.openhab.core.transform;version='[4.2.0,4.2.1)',\
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
org.threeten.extra;version='[1.7.2,1.7.3)',\
com.fasterxml.jackson.core.jackson-annotations;version='[2.16.0,2.16.1)',\
com.fasterxml.jackson.core.jackson-core;version='[2.16.0,2.16.1)',\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Fragment-Host: org.openhab.core.automation
org.osgi.util.function;version='[1.2.0,1.2.1)',\
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)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.20,1.4.21)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
Expand Down Expand Up @@ -57,7 +57,7 @@ Fragment-Host: org.openhab.core.automation
org.openhab.core.test;version='[4.2.0,4.2.1)',\
org.openhab.core.thing;version='[4.2.0,4.2.1)',\
org.openhab.core.transform;version='[4.2.0,4.2.1)',\
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
org.threeten.extra;version='[1.7.2,1.7.3)',\
com.fasterxml.jackson.core.jackson-annotations;version='[2.16.0,2.16.1)',\
com.fasterxml.jackson.core.jackson-core;version='[2.16.0,2.16.1)',\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Fragment-Host: org.openhab.core.automation.module.script
org.osgi.util.function;version='[1.2.0,1.2.1)',\
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)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.20,1.4.21)',\
org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
Expand Down Expand Up @@ -54,7 +54,7 @@ Fragment-Host: org.openhab.core.automation.module.script
org.openhab.core.test;version='[4.2.0,4.2.1)',\
org.openhab.core.thing;version='[4.2.0,4.2.1)',\
org.openhab.core.transform;version='[4.2.0,4.2.1)',\
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
org.threeten.extra;version='[1.7.2,1.7.3)',\
com.fasterxml.jackson.core.jackson-annotations;version='[2.16.0,2.16.1)',\
com.fasterxml.jackson.core.jackson-core;version='[2.16.0,2.16.1)',\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Fragment-Host: org.openhab.core.automation
org.osgi.util.function;version='[1.2.0,1.2.1)',\
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)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.20,1.4.21)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
Expand Down Expand Up @@ -57,7 +57,7 @@ Fragment-Host: org.openhab.core.automation
org.openhab.core.test;version='[4.2.0,4.2.1)',\
org.openhab.core.thing;version='[4.2.0,4.2.1)',\
org.openhab.core.transform;version='[4.2.0,4.2.1)',\
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
org.threeten.extra;version='[1.7.2,1.7.3)',\
com.fasterxml.jackson.core.jackson-annotations;version='[2.16.0,2.16.1)',\
com.fasterxml.jackson.core.jackson-core;version='[2.16.0,2.16.1)',\
Expand Down
4 changes: 2 additions & 2 deletions itests/org.openhab.core.automation.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Fragment-Host: org.openhab.core.automation
org.osgi.util.function;version='[1.2.0,1.2.1)',\
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)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.20,1.4.21)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
Expand Down Expand Up @@ -57,7 +57,7 @@ Fragment-Host: org.openhab.core.automation
org.openhab.core.test;version='[4.2.0,4.2.1)',\
org.openhab.core.thing;version='[4.2.0,4.2.1)',\
org.openhab.core.transform;version='[4.2.0,4.2.1)',\
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
org.threeten.extra;version='[1.7.2,1.7.3)',\
com.fasterxml.jackson.core.jackson-annotations;version='[2.16.0,2.16.1)',\
com.fasterxml.jackson.core.jackson-core;version='[2.16.0,2.16.1)',\
Expand Down
2 changes: 1 addition & 1 deletion itests/org.openhab.core.config.core.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Fragment-Host: org.openhab.core.config.core
org.osgi.util.function;version='[1.2.0,1.2.1)',\
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)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.20,1.4.21)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
javax.jmdns;version='[3.5.9,3.5.10)',\
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)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.20,1.4.21)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
Expand Down Expand Up @@ -59,7 +59,7 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
org.openhab.core.test;version='[4.2.0,4.2.1)',\
org.openhab.core.thing;version='[4.2.0,4.2.1)',\
org.openhab.core.transform;version='[4.2.0,4.2.1)',\
org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
org.openhab.core.addon;version='[4.2.0,4.2.1)',\
com.sun.jna;version='[5.14.0,5.14.1)',\
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
Expand Down
Loading

0 comments on commit f3560c8

Please sign in to comment.