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

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]>
ConnectorIO · Mar 5, 2022 · 44f9baf · 44f9baf
1 parent 7f2edc6
commit 44f9baf
Show file tree

Hide file tree

Showing 44 changed files with 227 additions and 186 deletions.
diff --git a/bom/compile-model/pom.xml b/bom/compile-model/pom.xml
@@ -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>
 

diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml
@@ -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>
 

diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
@@ -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>

diff --git a/bundles/org.openhab.core.model.item/bnd.bnd b/bundles/org.openhab.core.model.item/bnd.bnd
@@ -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"
diff --git a/bundles/org.openhab.core.model.item/pom.xml b/bundles/org.openhab.core.model.item/pom.xml
@@ -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>

diff --git a/bundles/org.openhab.core.model.persistence/bnd.bnd b/bundles/org.openhab.core.model.persistence/bnd.bnd
@@ -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
diff --git a/bundles/org.openhab.core.model.persistence/pom.xml b/bundles/org.openhab.core.model.persistence/pom.xml
@@ -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>

diff --git a/bundles/org.openhab.core.model.rule/bnd.bnd b/bundles/org.openhab.core.model.rule/bnd.bnd
@@ -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
diff --git a/bundles/org.openhab.core.model.rule/pom.xml b/bundles/org.openhab.core.model.rule/pom.xml
@@ -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>

diff --git a/bundles/org.openhab.core.model.script/bnd.bnd b/bundles/org.openhab.core.model.script/bnd.bnd
@@ -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
diff --git a/bundles/org.openhab.core.model.script/pom.xml b/bundles/org.openhab.core.model.script/pom.xml
@@ -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>

diff --git a/bundles/org.openhab.core.model.sitemap/bnd.bnd b/bundles/org.openhab.core.model.sitemap/bnd.bnd
@@ -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"
diff --git a/bundles/org.openhab.core.model.sitemap/pom.xml b/bundles/org.openhab.core.model.sitemap/pom.xml
@@ -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>

diff --git a/bundles/org.openhab.core.model.thing/bnd.bnd b/bundles/org.openhab.core.model.thing/bnd.bnd
@@ -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
diff --git a/bundles/org.openhab.core.model.thing/pom.xml b/bundles/org.openhab.core.model.thing/pom.xml
@@ -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>

diff --git a/features/karaf/openhab-core/src/main/feature/feature.xml b/features/karaf/openhab-core/src/main/feature/feature.xml
@@ -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>