Skip to content

Commit

Permalink
Upgrade Xtext/Xtend to 2.26.0, LSP4J to 0.12.0 (openhab#2786)
Browse files Browse the repository at this point in the history
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 <[email protected]>
GitOrigin-RevId: 44f9baf
wborn authored and splatch committed Jul 12, 2023
1 parent 16aef25 commit da69dc3
Showing 11 changed files with 92 additions and 48 deletions.
28 changes: 27 additions & 1 deletion bom/compile-model/pom.xml
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 1 deletion bom/compile/pom.xml
Original file line number Diff line number Diff line change
@@ -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 changes: 22 additions & 4 deletions bom/runtime/pom.xml
Original file line number Diff line number Diff line change
@@ -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>
6 changes: 3 additions & 3 deletions bundles/org.opensmarthouse.core.model.item/pom.xml
Original file line number Diff line number Diff line change
@@ -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 changes: 3 additions & 3 deletions bundles/org.opensmarthouse.core.model.persistence/pom.xml
Original file line number Diff line number Diff line change
@@ -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>
6 changes: 3 additions & 3 deletions bundles/org.opensmarthouse.core.model.rule/pom.xml
Original file line number Diff line number Diff line change
@@ -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 changes: 3 additions & 3 deletions bundles/org.opensmarthouse.core.model.script/pom.xml
Original file line number Diff line number Diff line change
@@ -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>
6 changes: 3 additions & 3 deletions bundles/org.opensmarthouse.core.model.sitemap/pom.xml
Original file line number Diff line number Diff line change
@@ -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 changes: 3 additions & 3 deletions bundles/org.opensmarthouse.core.model.thing/pom.xml
Original file line number Diff line number Diff line change
@@ -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 changes: 3 additions & 3 deletions features/karaf/openhab-core/src/main/feature/feature.xml
Original file line number Diff line number Diff line change
@@ -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 changes: 21 additions & 21 deletions features/karaf/openhab-tp/src/main/feature/feature.xml
Original file line number Diff line number Diff line change
@@ -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}">

0 comments on commit da69dc3

Please sign in to comment.