Skip to content

Commit

Permalink
Upgrade Xtext/Xtend to 2.36.0
Browse files Browse the repository at this point in the history 
* Upgrade Xtext/Xtend from 2.35.0 to 2.36.0, see release notes:
  https://eclipse.dev/Xtext/releasenotes.html#/releasenotes/2024/08/25/version-2-36-0
  https://eclipse.dev/Xtext/xtend/releasenotes.html#/releasenotes/2024/08/25/version-2-36-0
* Upgrade dependencies
  * Guava from 33.2.0 to 33.3.0
  * Classgraph from 4.8.172 to 4.8.174

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
  • Loading branch information
@holgerfriedrich @wborn
holgerfriedrich authored and wborn committed Oct 5, 2024
1 parent 49199a4 commit 22eec8c
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 43 deletions.
4 changes: 2 additions & 2 deletions bom/runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.2.0-jre</version>
<version>33.3.0-jre</version>
<scope>compile</scope>
</dependency>

Expand All @@ -808,7 +808,7 @@
<dependency>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
<version>4.8.172</version>
<version>4.8.174</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions features/karaf/openhab-core/src/main/feature/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

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

<requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.35.0)(!(version&gt;=2.36.0)))"</requirement>
<requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.36.0)(!(version&gt;=2.37.0)))"</requirement>
<feature dependency="true">openhab.tp-xtext</feature>

<requirement>openhab.tp;filter:="(feature=jax-rs-whiteboard)"</requirement>
Expand Down Expand Up @@ -401,7 +401,7 @@

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

<requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.35.0)(!(version&gt;=2.36.0)))"</requirement>
<requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.36.0)(!(version&gt;=2.37.0)))"</requirement>
<feature dependency="true">openhab.tp-xtext-ide</feature>

<requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.23.1)(!(version&gt;=0.24.0)))"</requirement>
Expand Down
4 changes: 2 additions & 2 deletions features/karaf/openhab-tp/src/main/feature/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,12 +247,12 @@
<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.2.0-jre</bundle>
<bundle dependency="true">mvn:com.google.guava/guava/33.3.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>

<bundle dependency="true">mvn:org.eclipse.orbit.bundles/org.aopalliance/1.0.0.v201105210816</bundle>
<bundle dependency="true">mvn:io.github.classgraph/classgraph/4.8.172</bundle>
<bundle dependency="true">mvn:io.github.classgraph/classgraph/4.8.174</bundle>
<bundle dependency="true">mvn:org.eclipse.orbit.bundles/org.antlr.runtime/3.2.0.v201101311130</bundle>

<bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.common/3.18.0</bundle>
Expand Down
18 changes: 9 additions & 9 deletions itests/org.openhab.core.model.item.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ Fragment-Host: org.openhab.core.model.item
com.fasterxml.jackson.core.jackson-core;version='[2.17.1,2.17.2)',\
com.fasterxml.jackson.core.jackson-databind;version='[2.17.1,2.17.2)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.17.1,2.17.2)',\
com.google.guava;version='[33.2.0,33.2.1)',\
com.google.guava;version='[33.3.0,33.4.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)',\
io.github.classgraph.classgraph;version='[4.8.174,4.8.175)',\
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.eclipse.jetty.alpn.client;version='[9.4.54,9.4.55)',\
Expand All @@ -81,13 +81,13 @@ Fragment-Host: org.openhab.core.model.item
org.eclipse.jetty.websocket.client;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.websocket.common;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.xml;version='[9.4.54,9.4.55)',\
org.eclipse.xtend.lib;version='[2.35.0,2.35.1)',\
org.eclipse.xtend.lib.macro;version='[2.35.0,2.35.1)',\
org.eclipse.xtext;version='[2.35.0,2.35.1)',\
org.eclipse.xtext.common.types;version='[2.35.0,2.35.1)',\
org.eclipse.xtext.util;version='[2.35.0,2.35.1)',\
org.eclipse.xtext.xbase;version='[2.35.0,2.35.1)',\
org.eclipse.xtext.xbase.lib;version='[2.35.0,2.35.1)',\
org.eclipse.xtend.lib;version='[2.36.0,2.36.1)',\
org.eclipse.xtend.lib.macro;version='[2.36.0,2.36.1)',\
org.eclipse.xtext;version='[2.36.0,2.36.1)',\
org.eclipse.xtext.common.types;version='[2.36.0,2.36.1)',\
org.eclipse.xtext.util;version='[2.36.0,2.36.1)',\
org.eclipse.xtext.xbase;version='[2.36.0,2.36.1)',\
org.eclipse.xtext.xbase.lib;version='[2.36.0,2.36.1)',\
org.objectweb.asm;version='[9.7.0,9.7.1)',\
org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
Expand Down
18 changes: 9 additions & 9 deletions itests/org.openhab.core.model.rule.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ Fragment-Host: org.openhab.core.model.rule.runtime
com.fasterxml.jackson.core.jackson-core;version='[2.17.1,2.17.2)',\
com.fasterxml.jackson.core.jackson-databind;version='[2.17.1,2.17.2)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.17.1,2.17.2)',\
com.google.guava;version='[33.2.0,33.2.1)',\
com.google.guava;version='[33.3.0,33.4.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)',\
io.github.classgraph.classgraph;version='[4.8.174,4.8.175)',\
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
org.eclipse.jetty.alpn.client;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.client;version='[9.4.54,9.4.55)',\
Expand All @@ -84,13 +84,13 @@ Fragment-Host: org.openhab.core.model.rule.runtime
org.eclipse.jetty.websocket.client;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.websocket.common;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.xml;version='[9.4.54,9.4.55)',\
org.eclipse.xtend.lib;version='[2.35.0,2.35.1)',\
org.eclipse.xtend.lib.macro;version='[2.35.0,2.35.1)',\
org.eclipse.xtext;version='[2.35.0,2.35.1)',\
org.eclipse.xtext.common.types;version='[2.35.0,2.35.1)',\
org.eclipse.xtext.util;version='[2.35.0,2.35.1)',\
org.eclipse.xtext.xbase;version='[2.35.0,2.35.1)',\
org.eclipse.xtext.xbase.lib;version='[2.35.0,2.35.1)',\
org.eclipse.xtend.lib;version='[2.36.0,2.36.1)',\
org.eclipse.xtend.lib.macro;version='[2.36.0,2.36.1)',\
org.eclipse.xtext;version='[2.36.0,2.36.1)',\
org.eclipse.xtext.common.types;version='[2.36.0,2.36.1)',\
org.eclipse.xtext.util;version='[2.36.0,2.36.1)',\
org.eclipse.xtext.xbase;version='[2.36.0,2.36.1)',\
org.eclipse.xtext.xbase.lib;version='[2.36.0,2.36.1)',\
org.objectweb.asm;version='[9.7.0,9.7.1)',\
org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
Expand Down
18 changes: 9 additions & 9 deletions itests/org.openhab.core.model.script.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ Fragment-Host: org.openhab.core.model.script
com.fasterxml.jackson.core.jackson-core;version='[2.17.1,2.17.2)',\
com.fasterxml.jackson.core.jackson-databind;version='[2.17.1,2.17.2)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.17.1,2.17.2)',\
com.google.guava;version='[33.2.0,33.2.1)',\
com.google.guava;version='[33.3.0,33.4.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)',\
io.github.classgraph.classgraph;version='[4.8.174,4.8.175)',\
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
org.eclipse.jetty.alpn.client;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.client;version='[9.4.54,9.4.55)',\
Expand All @@ -89,13 +89,13 @@ Fragment-Host: org.openhab.core.model.script
org.eclipse.jetty.websocket.client;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.websocket.common;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.xml;version='[9.4.54,9.4.55)',\
org.eclipse.xtend.lib;version='[2.35.0,2.35.1)',\
org.eclipse.xtend.lib.macro;version='[2.35.0,2.35.1)',\
org.eclipse.xtext;version='[2.35.0,2.35.1)',\
org.eclipse.xtext.common.types;version='[2.35.0,2.35.1)',\
org.eclipse.xtext.util;version='[2.35.0,2.35.1)',\
org.eclipse.xtext.xbase;version='[2.35.0,2.35.1)',\
org.eclipse.xtext.xbase.lib;version='[2.35.0,2.35.1)',\
org.eclipse.xtend.lib;version='[2.36.0,2.36.1)',\
org.eclipse.xtend.lib.macro;version='[2.36.0,2.36.1)',\
org.eclipse.xtext;version='[2.36.0,2.36.1)',\
org.eclipse.xtext.common.types;version='[2.36.0,2.36.1)',\
org.eclipse.xtext.util;version='[2.36.0,2.36.1)',\
org.eclipse.xtext.xbase;version='[2.36.0,2.36.1)',\
org.eclipse.xtext.xbase.lib;version='[2.36.0,2.36.1)',\
org.objectweb.asm;version='[9.7.0,9.7.1)',\
org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
Expand Down
18 changes: 9 additions & 9 deletions itests/org.openhab.core.model.thing.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ Fragment-Host: org.openhab.core.model.thing
com.fasterxml.jackson.core.jackson-core;version='[2.17.1,2.17.2)',\
com.fasterxml.jackson.core.jackson-databind;version='[2.17.1,2.17.2)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.17.1,2.17.2)',\
com.google.guava;version='[33.2.0,33.2.1)',\
com.google.guava;version='[33.3.0,33.4.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)',\
io.github.classgraph.classgraph;version='[4.8.174,4.8.175)',\
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.eclipse.jetty.alpn.client;version='[9.4.54,9.4.55)',\
Expand All @@ -88,13 +88,13 @@ Fragment-Host: org.openhab.core.model.thing
org.eclipse.jetty.websocket.client;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.websocket.common;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.xml;version='[9.4.54,9.4.55)',\
org.eclipse.xtend.lib;version='[2.35.0,2.35.1)',\
org.eclipse.xtend.lib.macro;version='[2.35.0,2.35.1)',\
org.eclipse.xtext;version='[2.35.0,2.35.1)',\
org.eclipse.xtext.common.types;version='[2.35.0,2.35.1)',\
org.eclipse.xtext.util;version='[2.35.0,2.35.1)',\
org.eclipse.xtext.xbase;version='[2.35.0,2.35.1)',\
org.eclipse.xtext.xbase.lib;version='[2.35.0,2.35.1)',\
org.eclipse.xtend.lib;version='[2.36.0,2.36.1)',\
org.eclipse.xtend.lib.macro;version='[2.36.0,2.36.1)',\
org.eclipse.xtext;version='[2.36.0,2.36.1)',\
org.eclipse.xtext.common.types;version='[2.36.0,2.36.1)',\
org.eclipse.xtext.util;version='[2.36.0,2.36.1)',\
org.eclipse.xtext.xbase;version='[2.36.0,2.36.1)',\
org.eclipse.xtext.xbase.lib;version='[2.36.0,2.36.1)',\
org.objectweb.asm;version='[9.7.0,9.7.1)',\
org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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</xtext.version>
<xtext.version>2.36.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>
Expand Down

0 comments on commit 22eec8c

Please sign in to comment.