mirror of
https://github.com/danieldemus/openhab-core.git
synced 2026-07-29 12:34:22 +02:00
Upgrade Xtext/Xtend to 2.23.0 and LSP 0.9.0 (#1685)
Upgrades to: * Xtext 2.23.0 * Xtend 2.23.0 * LSP 0.9.0 For Xtext release notes see: https://www.eclipse.org/Xtext/releasenotes.html#/releasenotes/2020/09/01/version-2-23-0 The Xtext dependencies are now managed using their BOM which makes it easier to keep them in sync. Because Xtext depends on a newer ASM version some runtime dependencies were also upgraded: * ASM 8.0.1 * Pax Web 7.2.15 * XBean 4.17.0 Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born
+17
-22
@@ -15,13 +15,17 @@
|
||||
|
||||
<name>openHAB Core :: BOM :: Compile Model</name>
|
||||
|
||||
<properties>
|
||||
<classgraph.version>4.8.35.v20190528-1517</classgraph.version>
|
||||
<emf.1.version>2.12.0</emf.1.version>
|
||||
<emf.3.version>2.11.0</emf.3.version>
|
||||
<emf.mwe.version>1.5.0</emf.mwe.version>
|
||||
<emf.mwe2.version>2.11.0</emf.mwe2.version>
|
||||
</properties>
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.xtext</groupId>
|
||||
<artifactId>xtext-dev-bom</artifactId>
|
||||
<version>${xtext.version}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
@@ -41,37 +45,37 @@
|
||||
<dependency>
|
||||
<groupId>org.eclipse.emf</groupId>
|
||||
<artifactId>org.eclipse.emf.common</artifactId>
|
||||
<version>${emf.1.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.emf</groupId>
|
||||
<artifactId>org.eclipse.emf.ecore</artifactId>
|
||||
<version>${emf.1.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.emf</groupId>
|
||||
<artifactId>org.eclipse.emf.ecore.change</artifactId>
|
||||
<version>${emf.3.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.emf</groupId>
|
||||
<artifactId>org.eclipse.emf.ecore.xmi</artifactId>
|
||||
<version>${emf.1.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.emf</groupId>
|
||||
<artifactId>org.eclipse.emf.codegen</artifactId>
|
||||
<version>${emf.3.version}</version>
|
||||
<scope>compile</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.eclipse.platform</groupId>
|
||||
<artifactId>org.eclipse.osgi</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.emf</groupId>
|
||||
<artifactId>org.eclipse.emf.codegen.ecore</artifactId>
|
||||
<version>${emf.1.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
@@ -79,7 +83,6 @@
|
||||
<dependency>
|
||||
<groupId>org.eclipse.emf</groupId>
|
||||
<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
|
||||
<version>${emf.mwe2.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
@@ -99,14 +102,6 @@
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<!-- Xtext is using a classgraph artifact from Eclipse Orbit -->
|
||||
<!-- Karaf feature validation fails when using classgraph from Maven Central -->
|
||||
<dependency>
|
||||
<groupId>org.eclipse.orbit.bundles</groupId>
|
||||
<artifactId>io.github.classgraph</artifactId>
|
||||
<version>${classgraph.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!--Xbase -->
|
||||
<dependency>
|
||||
<groupId>org.eclipse.xtext</groupId>
|
||||
|
||||
+41
-28
@@ -18,10 +18,28 @@
|
||||
<properties>
|
||||
<jackson.version>2.10.3</jackson.version>
|
||||
<jetty.version>9.4.20.v20190813</jetty.version>
|
||||
<pax.web.version>7.2.11</pax.web.version>
|
||||
<pax.web.version>7.2.19</pax.web.version>
|
||||
<swagger.version>2.1.0</swagger.version>
|
||||
</properties>
|
||||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.xtext</groupId>
|
||||
<artifactId>xtext-dev-bom</artifactId>
|
||||
<version>${xtext.version}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.eclipse.platform</groupId>
|
||||
<artifactId>org.eclipse.osgi</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
<dependencies>
|
||||
<!-- BEG: Slightly modified EnRoute implementation index artifacts -->
|
||||
|
||||
@@ -728,13 +746,13 @@
|
||||
<dependency>
|
||||
<groupId>org.apache.xbean</groupId>
|
||||
<artifactId>xbean-bundleutils</artifactId>
|
||||
<version>4.12</version>
|
||||
<version>4.17</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.xbean</groupId>
|
||||
<artifactId>xbean-finder</artifactId>
|
||||
<version>4.12</version>
|
||||
<version>4.17</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
@@ -757,53 +775,50 @@
|
||||
<groupId>org.eclipse.orbit.bundles</groupId>
|
||||
<artifactId>io.github.classgraph</artifactId>
|
||||
<version>4.8.35.v20190528-1517</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.emf</groupId>
|
||||
<artifactId>org.eclipse.emf.common</artifactId>
|
||||
<version>2.12.0</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.emf</groupId>
|
||||
<artifactId>org.eclipse.emf.ecore</artifactId>
|
||||
<version>2.12.0</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.emf</groupId>
|
||||
<artifactId>org.eclipse.emf.ecore.change</artifactId>
|
||||
<version>2.11.0</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.emf</groupId>
|
||||
<artifactId>org.eclipse.emf.ecore.xmi</artifactId>
|
||||
<version>2.12.0</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.xtend</groupId>
|
||||
<artifactId>org.eclipse.xtend.lib</artifactId>
|
||||
<version>2.19.0</version>
|
||||
<version>${xtext.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.xtend</groupId>
|
||||
<artifactId>org.eclipse.xtend.lib.macro</artifactId>
|
||||
<version>2.19.0</version>
|
||||
<version>${xtext.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.xtext</groupId>
|
||||
<artifactId>org.eclipse.xtext</artifactId>
|
||||
<version>2.19.0</version>
|
||||
<version>${xtext.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.xtext</groupId>
|
||||
<artifactId>org.eclipse.xtext.common.types</artifactId>
|
||||
<version>2.19.0</version>
|
||||
<version>${xtext.version}</version>
|
||||
<scope>compile</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
@@ -815,7 +830,7 @@
|
||||
<dependency>
|
||||
<groupId>org.eclipse.xtext</groupId>
|
||||
<artifactId>org.eclipse.xtext.ide</artifactId>
|
||||
<version>2.19.0</version>
|
||||
<version>${xtext.version}</version>
|
||||
<scope>compile</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
@@ -827,25 +842,35 @@
|
||||
<dependency>
|
||||
<groupId>org.eclipse.xtext</groupId>
|
||||
<artifactId>org.eclipse.xtext.util</artifactId>
|
||||
<version>2.19.0</version>
|
||||
<version>${xtext.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.xtext</groupId>
|
||||
<artifactId>org.eclipse.xtext.xbase</artifactId>
|
||||
<version>2.19.0</version>
|
||||
<version>${xtext.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.xtext</groupId>
|
||||
<artifactId>org.eclipse.xtext.xbase.ide</artifactId>
|
||||
<version>2.19.0</version>
|
||||
<version>${xtext.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.xtext</groupId>
|
||||
<artifactId>org.eclipse.xtext.xbase.lib</artifactId>
|
||||
<version>2.19.0</version>
|
||||
<version>${xtext.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>log4j</groupId>
|
||||
<artifactId>log4j</artifactId>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.ow2.asm</groupId>
|
||||
<artifactId>asm</artifactId>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
@@ -884,18 +909,6 @@
|
||||
<version>2.4.0-b34</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>log4j</groupId>
|
||||
<artifactId>log4j</artifactId>
|
||||
<version>1.2.17</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.ow2.asm</groupId>
|
||||
<artifactId>asm</artifactId>
|
||||
<version>7.1</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- jollyday -->
|
||||
<dependency>
|
||||
|
||||
Reference in New Issue
Block a user