Upgrade Xtext to 2.35.0 (openhab#4264)

* Upgrade Xtext from 2.35.0.M1 to 2.35.0 final release, see release notes: https://eclipse.dev/Xtext/releasenotes.html#/releasenotes/2024/05/28/version-2-35-0 * Upgrade dependencies * Guava from 33.1.0 to 33.2.0 * Lsp4j from 0.22.0 to 0.23.1 Signed-off-by: Holger Friedrich <[email protected]>
andrewfg · Jun 1, 2024 · ea71af9 · ea71af9
1 parent 7198c12
commit ea71af9
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
@@ -794,7 +794,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>33.1.0-jre</version>
+      <version>33.2.0-jre</version>
       <scope>compile</scope>
     </dependency>
 

diff --git a/features/karaf/openhab-core/src/main/feature/feature.xml b/features/karaf/openhab-core/src/main/feature/feature.xml
@@ -404,7 +404,7 @@
 		<requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.35.0)(!(version&gt;=2.36.0)))"</requirement>
 		<feature dependency="true">openhab.tp-xtext-ide</feature>
 
-		<requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.22.0)(!(version&gt;=0.23.0)))"</requirement>
+		<requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.23.1)(!(version&gt;=0.24.0)))"</requirement>
 		<feature dependency="true">openhab.tp-lsp4j</feature>
 
 		<feature>openhab-core-model-item-ide</feature>

diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml
@@ -205,9 +205,9 @@
 	</feature>
 
 	<feature name="openhab.tp-lsp4j" description="Eclipse LSP4J" version="${project.version}">
-		<capability>openhab.tp;feature=lsp4j;version=0.22.0</capability>
-		<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.22.0</bundle>
-		<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.22.0</bundle>
+		<capability>openhab.tp;feature=lsp4j;version=0.23.1</capability>
+		<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.23.1</bundle>
+		<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.23.1</bundle>
 
 		<feature dependency="true">openhab.tp-gson</feature>
 		<feature dependency="true">openhab.tp-xtext</feature>
@@ -247,7 +247,7 @@
 		<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.2</bundle>
-		<bundle dependency="true">mvn:com.google.guava/guava/33.1.0-jre</bundle>
+		<bundle dependency="true">mvn:com.google.guava/guava/33.2.0-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>
 

diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun
@@ -85,7 +85,7 @@ Fragment-Host: org.openhab.core.model.item
 	com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.17.1,2.17.2)',\
 	stax2-api;version='[4.2.1,4.2.2)',\
 	org.openhab.core.addon;version='[4.2.0,4.2.1)',\
-	com.google.guava;version='[33.1.0,33.1.1)',\
+	com.google.guava;version='[33.2.0,33.2.1)',\
 	com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
 	com.sun.jna;version='[5.14.0,5.14.1)',\
 	io.github.classgraph.classgraph;version='[4.8.172,4.8.173)',\

diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun
@@ -89,7 +89,7 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.17.1,2.17.2)',\
 	stax2-api;version='[4.2.1,4.2.2)',\
 	org.openhab.core.addon;version='[4.2.0,4.2.1)',\
-	com.google.guava;version='[33.1.0,33.1.1)',\
+	com.google.guava;version='[33.2.0,33.2.1)',\
 	com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
 	com.sun.jna;version='[5.14.0,5.14.1)',\
 	io.github.classgraph.classgraph;version='[4.8.172,4.8.173)',\

diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun
@@ -93,7 +93,7 @@ Fragment-Host: org.openhab.core.model.script
 	com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.17.1,2.17.2)',\
 	stax2-api;version='[4.2.1,4.2.2)',\
 	org.openhab.core.addon;version='[4.2.0,4.2.1)',\
-	com.google.guava;version='[33.1.0,33.1.1)',\
+	com.google.guava;version='[33.2.0,33.2.1)',\
 	com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
 	com.sun.jna;version='[5.14.0,5.14.1)',\
 	io.github.classgraph.classgraph;version='[4.8.172,4.8.173)',\

diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun
@@ -94,7 +94,7 @@ Fragment-Host: org.openhab.core.model.thing
 	com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.17.1,2.17.2)',\
 	stax2-api;version='[4.2.1,4.2.2)',\
 	org.openhab.core.addon;version='[4.2.0,4.2.1)',\
-	com.google.guava;version='[33.1.0,33.1.1)',\
+	com.google.guava;version='[33.2.0,33.2.1)',\
 	com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
 	com.sun.jna;version='[5.14.0,5.14.1)',\
 	io.github.classgraph.classgraph;version='[4.8.172,4.8.173)',\

diff --git a/pom.xml b/pom.xml
@@ -73,7 +73,7 @@
     <karaf.tooling.version>4.4.6</karaf.tooling.version>
     <sat.version>0.16.0</sat.version>
     <slf4j.version>2.0.12</slf4j.version>
-    <xtext.version>2.35.0.M1</xtext.version>
+    <xtext.version>2.35.0</xtext.version>
     <spotless.version>2.43.0</spotless.version>
     <!-- Eclipse Java formatter version 4.26+ does not check test files -->
     <spotless.eclipse.version>4.25</spotless.eclipse.version>