Skip to content

Commit bb4963d

Browse files
wbornwborn
committed
Upgrade Xtext/Xtend to 2.26.0, LSP4J to 0.12.0
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 <github@maindrain.net>
1 parent b4a5cd3 commit bb4963d

File tree

44 files changed

+227
-186
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+227
-186
lines changed

‎bom/compile-model/pom.xml

+27-1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,12 @@
8383
<dependency>
8484
<groupId>org.eclipse.emf</groupId>
8585
<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
86+
<exclusions>
87+
<exclusion>
88+
<groupId>com.google.inject</groupId>
89+
<artifactId>guice</artifactId>
90+
</exclusion>
91+
</exclusions>
8692
</dependency>
8793

8894
<dependency>
@@ -102,7 +108,7 @@
102108
</exclusions>
103109
</dependency>
104110

105-
<!--Xbase -->
111+
<!-- Xbase -->
106112
<dependency>
107113
<groupId>org.eclipse.xtext</groupId>
108114
<artifactId>org.eclipse.xtext.xbase</artifactId>
@@ -130,6 +136,22 @@
130136
<scope>compile</scope>
131137
</dependency>
132138

139+
<!-- Classgraph -->
140+
<dependency>
141+
<groupId>org.eclipse.orbit.bundles</groupId>
142+
<artifactId>io.github.classgraph</artifactId>
143+
<version>4.8.138.v20211212-1642 </version>
144+
<scope>compile</scope>
145+
</dependency>
146+
147+
<!-- Guice -->
148+
<dependency>
149+
<groupId>org.eclipse.orbit.bundles</groupId>
150+
<artifactId>com.google.inject</artifactId>
151+
<version>5.0.1.v20210324-2015</version>
152+
<scope>compile</scope>
153+
</dependency>
154+
133155
<!-- TEST -->
134156
<dependency>
135157
<groupId>org.eclipse.xtext</groupId>
@@ -141,6 +163,10 @@
141163
<groupId>org.eclipse.platform</groupId>
142164
<artifactId>org.eclipse.osgi</artifactId>
143165
</exclusion>
166+
<exclusion>
167+
<groupId>com.google.inject</groupId>
168+
<artifactId>guice</artifactId>
169+
</exclusion>
144170
</exclusions>
145171
</dependency>
146172

‎bom/compile/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<dependency>
8888
<groupId>com.google.code.gson</groupId>
8989
<artifactId>gson</artifactId>
90-
<version>2.8.6</version>
90+
<version>2.8.9</version>
9191
<scope>compile</scope>
9292
</dependency>
9393

‎bom/runtime/pom.xml

+22-4
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@
427427
<dependency>
428428
<groupId>com.google.code.gson</groupId>
429429
<artifactId>gson</artifactId>
430-
<version>2.8.6</version>
430+
<version>2.8.9</version>
431431
<scope>compile</scope>
432432
</dependency>
433433

@@ -751,14 +751,20 @@
751751
<!-- EMF, Xtext -->
752752
<dependency>
753753
<groupId>org.eclipse.orbit.bundles</groupId>
754-
<artifactId>org.antlr.runtime</artifactId>
755-
<version>3.2.0.v201101311130</version>
754+
<artifactId>com.google.inject</artifactId>
755+
<version>5.0.1.v20210324-2015</version>
756756
<scope>compile</scope>
757757
</dependency>
758758
<dependency>
759759
<groupId>org.eclipse.orbit.bundles</groupId>
760760
<artifactId>io.github.classgraph</artifactId>
761-
<version>4.8.35.v20190528-1517</version>
761+
<version>4.8.138.v20211212-1642 </version>
762+
<scope>compile</scope>
763+
</dependency>
764+
<dependency>
765+
<groupId>org.eclipse.orbit.bundles</groupId>
766+
<artifactId>org.antlr.runtime</artifactId>
767+
<version>3.2.0.v201101311130</version>
762768
<scope>compile</scope>
763769
</dependency>
764770
<dependency>
@@ -798,6 +804,12 @@
798804
<artifactId>org.eclipse.xtext</artifactId>
799805
<version>${xtext.version}</version>
800806
<scope>compile</scope>
807+
<exclusions>
808+
<exclusion>
809+
<groupId>com.google.inject</groupId>
810+
<artifactId>guice</artifactId>
811+
</exclusion>
812+
</exclusions>
801813
</dependency>
802814
<dependency>
803815
<groupId>org.eclipse.xtext</groupId>
@@ -828,6 +840,12 @@
828840
<artifactId>org.eclipse.xtext.util</artifactId>
829841
<version>${xtext.version}</version>
830842
<scope>compile</scope>
843+
<exclusions>
844+
<exclusion>
845+
<groupId>com.google.inject</groupId>
846+
<artifactId>guice</artifactId>
847+
</exclusion>
848+
</exclusions>
831849
</dependency>
832850
<dependency>
833851
<groupId>org.eclipse.xtext</groupId>

‎bundles/org.openhab.core.model.item/bnd.bnd

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ Require-Bundle: com.ibm.icu;resolution:=optional,\
4444
org.eclipse.xtext.common.types,\
4545
org.eclipse.xtext.generator;resolution:=optional,\
4646
org.eclipse.xtext.util,\
47-
org.eclipse.xtext.xbase.lib;bundle-version="2.23.0"
47+
org.eclipse.xtext.xbase.lib;bundle-version="2.26.0"

‎bundles/org.openhab.core.model.item/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<plugin>
4646
<groupId>org.codehaus.mojo</groupId>
4747
<artifactId>exec-maven-plugin</artifactId>
48-
<version>1.4.0</version>
48+
<version>3.0.0</version>
4949
<configuration>
5050
<executable>java</executable>
5151
<classpathScope>compile</classpathScope>
@@ -62,12 +62,12 @@
6262
<dependency>
6363
<groupId>org.slf4j</groupId>
6464
<artifactId>slf4j-api</artifactId>
65-
<version>1.7.2</version>
65+
<version>1.7.36</version>
6666
</dependency>
6767
<dependency>
6868
<groupId>org.slf4j</groupId>
6969
<artifactId>slf4j-simple</artifactId>
70-
<version>1.6.4</version>
70+
<version>1.7.36</version>
7171
</dependency>
7272
<dependency>
7373
<groupId>org.antlr</groupId>

‎bundles/org.openhab.core.model.persistence/bnd.bnd

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ Require-Bundle: org.antlr.runtime,\
4141
org.eclipse.xtext.common.types,\
4242
org.eclipse.xtext.generator;resolution:=optional,\
4343
org.eclipse.xtext.util,\
44-
org.eclipse.xtext.xbase.lib;bundle-version="2.23.0",\
45-
org.eclipse.xtext.xbase;bundle-version="2.23.0";resolution:=optional;visibility:=reexport,\
46-
org.eclipse.xtext;bundle-version="2.23.0";visibility:=reexport
44+
org.eclipse.xtext.xbase.lib;bundle-version="2.26.0",\
45+
org.eclipse.xtext.xbase;bundle-version="2.26.0";resolution:=optional;visibility:=reexport,\
46+
org.eclipse.xtext;bundle-version="2.26.0";visibility:=reexport

‎bundles/org.openhab.core.model.persistence/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<plugin>
5151
<groupId>org.codehaus.mojo</groupId>
5252
<artifactId>exec-maven-plugin</artifactId>
53-
<version>1.4.0</version>
53+
<version>3.0.0</version>
5454
<configuration>
5555
<executable>java</executable>
5656
<classpathScope>compile</classpathScope>
@@ -67,12 +67,12 @@
6767
<dependency>
6868
<groupId>org.slf4j</groupId>
6969
<artifactId>slf4j-api</artifactId>
70-
<version>1.7.2</version>
70+
<version>1.7.36</version>
7171
</dependency>
7272
<dependency>
7373
<groupId>org.slf4j</groupId>
7474
<artifactId>slf4j-simple</artifactId>
75-
<version>1.6.4</version>
75+
<version>1.7.36</version>
7676
</dependency>
7777
<dependency>
7878
<groupId>org.antlr</groupId>

‎bundles/org.openhab.core.model.rule/bnd.bnd

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ Require-Bundle: org.antlr.runtime,\
5050
org.eclipse.xtext.generator;resolution:=optional,\
5151
org.eclipse.xtext.util,\
5252
org.eclipse.xtext.xbase,\
53-
org.eclipse.xtext.xbase.lib;bundle-version="2.23.0",\
53+
org.eclipse.xtext.xbase.lib;bundle-version="2.26.0",\
5454
org.eclipse.xtext;visibility:=reexport,\
55-
org.objectweb.asm;bundle-version="[8.0.0,9.0.0)";resolution:=optional
55+
org.objectweb.asm;bundle-version="[9.0.0,10.0.0)";resolution:=optional

‎bundles/org.openhab.core.model.rule/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<plugin>
4646
<groupId>org.codehaus.mojo</groupId>
4747
<artifactId>exec-maven-plugin</artifactId>
48-
<version>1.4.0</version>
48+
<version>3.0.0</version>
4949
<configuration>
5050
<executable>java</executable>
5151
<classpathScope>compile</classpathScope>
@@ -62,12 +62,12 @@
6262
<dependency>
6363
<groupId>org.slf4j</groupId>
6464
<artifactId>slf4j-api</artifactId>
65-
<version>1.7.2</version>
65+
<version>1.7.36</version>
6666
</dependency>
6767
<dependency>
6868
<groupId>org.slf4j</groupId>
6969
<artifactId>slf4j-simple</artifactId>
70-
<version>1.6.4</version>
70+
<version>1.7.36</version>
7171
</dependency>
7272
<dependency>
7373
<groupId>org.antlr</groupId>

‎bundles/org.openhab.core.model.script/bnd.bnd

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ Require-Bundle: org.antlr.runtime,\
6262
org.eclipse.xtext.common.types,\
6363
org.eclipse.xtext.generator;resolution:=optional,\
6464
org.eclipse.xtext.util,\
65-
org.eclipse.xtext.xbase.lib;bundle-version="2.23.0",\
65+
org.eclipse.xtext.xbase.lib;bundle-version="2.26.0",\
6666
org.eclipse.xtext.xbase;visibility:=reexport,\
6767
org.eclipse.xtext;visibility:=reexport,\
68-
org.objectweb.asm;resolution:=optional
68+
org.objectweb.asm;bundle-version="[9.0.0,10.0.0)";resolution:=optional
6969
-includeresource: resources

‎bundles/org.openhab.core.model.script/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<plugin>
7777
<groupId>org.codehaus.mojo</groupId>
7878
<artifactId>exec-maven-plugin</artifactId>
79-
<version>1.4.0</version>
79+
<version>3.0.0</version>
8080
<configuration>
8181
<executable>java</executable>
8282
<classpathScope>compile</classpathScope>
@@ -93,12 +93,12 @@
9393
<dependency>
9494
<groupId>org.slf4j</groupId>
9595
<artifactId>slf4j-api</artifactId>
96-
<version>1.7.2</version>
96+
<version>1.7.36</version>
9797
</dependency>
9898
<dependency>
9999
<groupId>org.slf4j</groupId>
100100
<artifactId>slf4j-simple</artifactId>
101-
<version>1.6.4</version>
101+
<version>1.7.36</version>
102102
</dependency>
103103
<dependency>
104104
<groupId>org.antlr</groupId>

‎bundles/org.openhab.core.model.sitemap/bnd.bnd

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ Require-Bundle: org.antlr.runtime,\
2828
org.eclipse.xtext,\
2929
org.eclipse.xtext.generator;resolution:=optional,\
3030
org.eclipse.xtext.util,\
31-
org.eclipse.xtext.xbase.lib;bundle-version="2.23.0"
31+
org.eclipse.xtext.xbase.lib;bundle-version="2.26.0"

‎bundles/org.openhab.core.model.sitemap/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<plugin>
4646
<groupId>org.codehaus.mojo</groupId>
4747
<artifactId>exec-maven-plugin</artifactId>
48-
<version>1.4.0</version>
48+
<version>3.0.0</version>
4949
<configuration>
5050
<executable>java</executable>
5151
<classpathScope>compile</classpathScope>
@@ -62,12 +62,12 @@
6262
<dependency>
6363
<groupId>org.slf4j</groupId>
6464
<artifactId>slf4j-api</artifactId>
65-
<version>1.7.2</version>
65+
<version>1.7.36</version>
6666
</dependency>
6767
<dependency>
6868
<groupId>org.slf4j</groupId>
6969
<artifactId>slf4j-simple</artifactId>
70-
<version>1.6.4</version>
70+
<version>1.7.36</version>
7171
</dependency>
7272
<dependency>
7373
<groupId>org.antlr</groupId>

‎bundles/org.openhab.core.model.thing/bnd.bnd

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Require-Bundle: org.antlr.runtime,\
4545
org.eclipse.xtext.common.types,\
4646
org.eclipse.xtext.generator;resolution:=optional,\
4747
org.eclipse.xtext.util,\
48-
org.eclipse.xtext.xbase.lib;bundle-version="2.23.0",\
48+
org.eclipse.xtext.xbase.lib;bundle-version="2.26.0",\
4949
org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport,\
5050
org.eclipse.xtext;visibility:=reexport,\
51-
org.objectweb.asm;bundle-version="[8.0.0,9.0.0)";resolution:=optional
51+
org.objectweb.asm;bundle-version="[9.0.0,10.0.0)";resolution:=optional

‎bundles/org.openhab.core.model.thing/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<plugin>
6969
<groupId>org.codehaus.mojo</groupId>
7070
<artifactId>exec-maven-plugin</artifactId>
71-
<version>1.4.0</version>
71+
<version>3.0.0</version>
7272
<configuration>
7373
<executable>java</executable>
7474
<classpathScope>compile</classpathScope>
@@ -85,12 +85,12 @@
8585
<dependency>
8686
<groupId>org.slf4j</groupId>
8787
<artifactId>slf4j-api</artifactId>
88-
<version>1.7.2</version>
88+
<version>1.7.36</version>
8989
</dependency>
9090
<dependency>
9191
<groupId>org.slf4j</groupId>
9292
<artifactId>slf4j-simple</artifactId>
93-
<version>1.6.4</version>
93+
<version>1.7.36</version>
9494
</dependency>
9595
<dependency>
9696
<groupId>org.antlr</groupId>

‎features/karaf/openhab-core/src/main/feature/feature.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
<feature dependency="true">openhab.tp-gson</feature>
3030

31-
<requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.25.0)(!(version&gt;=2.26.0)))"</requirement>
31+
<requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.26.0)(!(version&gt;=2.27.0)))"</requirement>
3232
<feature dependency="true">openhab.tp-xtext</feature>
3333

3434
<requirement>openhab.tp;filter:="(feature=jax-rs-whiteboard)"</requirement>
@@ -335,10 +335,10 @@
335335

336336
<feature name="openhab-core-model-lsp" version="${project.version}">
337337

338-
<requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.25.0)(!(version&gt;=2.26.0)))"</requirement>
338+
<requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.26.0)(!(version&gt;=2.27.0)))"</requirement>
339339
<feature dependency="true">openhab.tp-xtext-ide</feature>
340340

341-
<requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.10.0)(!(version&gt;=0.11.0)))"</requirement>
341+
<requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.12.0)(!(version&gt;=0.13.0)))"</requirement>
342342
<feature dependency="true">openhab.tp-lsp4j</feature>
343343

344344
<feature>openhab-core-model-item-ide</feature>

0 commit comments

Comments
 (0)