demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2026-07-29 12:34:22 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Upgrade Xtext/Xtend to 2.32.0, LSP4J to 0.21.0 (#3817)

Browse Source 
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 #3321

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born
2023-10-01 22:04:27 +02:00
committed by GitHub
parent 3eef2872f5
commit fffa968263
30 changed files with 158 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bom/compile-model/pom.xml
-18
View File
@@ -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>
@@ -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>
@@ -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>
bom/compile/pom.xml
+4 -3
View File
@@ -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>
bom/runtime/pom.xml
+4 -16
View File
@@ -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>
@@ -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>
@@ -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>
@@ -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>