From eb2b9bcd93d642cab9d12d0c8608f35b5eed41d4 Mon Sep 17 00:00:00 2001 From: Holger Friedrich Date: Thu, 21 Nov 2024 21:58:25 +0100 Subject: [PATCH] Upgrade Xtext/Xtend to 2.37.0 * Upgrade Xtext/Xtend from 2.36.0 to 2.37.0, see release notes: https://eclipse.dev/Xtext/releasenotes.html#/releasenotes/2024/11/19/version-2-37-0 https://eclipse.dev/Xtext/xtend/releasenotes.html#/releasenotes/2024/11/19/version-2-37-0 * Upgrade dependencies * ecj from 3.36.0 to 3.39.0 * gson from 2.10.1 to 2.11.0 * classgraph to 4.8.176 * guava from 3.33.0 to 3.33.1 Signed-off-by: Holger Friedrich --- bom/compile-model/pom.xml | 2 +- bom/compile/pom.xml | 7 +++---- bom/runtime/pom.xml | 10 +++++----- .../openhab-core/src/main/feature/feature.xml | 4 ++-- .../openhab-tp/src/main/feature/feature.xml | 8 ++++---- .../org.openhab.core.addon.tests/itest.bndrun | 2 +- .../itest.bndrun | 2 +- .../itest.bndrun | 2 +- .../itest.bndrun | 2 +- .../itest.bndrun | 2 +- .../itest.bndrun | 2 +- .../itest.bndrun | 2 +- .../itest.bndrun | 2 +- .../itest.bndrun | 2 +- .../itest.bndrun | 2 +- .../itest.bndrun | 2 +- .../itest.bndrun | 2 +- .../itest.bndrun | 2 +- .../itest.bndrun | 2 +- .../org.openhab.core.io.net.tests/itest.bndrun | 2 +- .../itest.bndrun | 2 +- .../itest.bndrun | 18 +++++++++--------- .../itest.bndrun | 18 +++++++++--------- .../itest.bndrun | 18 +++++++++--------- .../itest.bndrun | 18 +++++++++--------- .../itest.bndrun | 2 +- itests/org.openhab.core.tests/itest.bndrun | 2 +- .../org.openhab.core.thing.tests/itest.bndrun | 2 +- .../org.openhab.core.voice.tests/itest.bndrun | 2 +- pom.xml | 4 ++-- tools/i18n-plugin/pom.xml | 2 +- tools/upgradetool/pom.xml | 2 +- 32 files changed, 75 insertions(+), 76 deletions(-) diff --git a/bom/compile-model/pom.xml b/bom/compile-model/pom.xml index 8f5944a55db..070a4f013d7 100644 --- a/bom/compile-model/pom.xml +++ b/bom/compile-model/pom.xml @@ -134,7 +134,7 @@ io.github.classgraph classgraph - 4.8.172 + 4.8.176 compile diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml index 40ceeba9c7c..21ca83a8001 100644 --- a/bom/compile/pom.xml +++ b/bom/compile/pom.xml @@ -117,11 +117,10 @@ - - org.eclipse.orbit.bundles - com.google.gson - 2.10.1.v20230109-0753 + com.google.code.gson + gson + 2.11.0 compile diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml index 06d1023bf9c..8d9c4182c3c 100644 --- a/bom/runtime/pom.xml +++ b/bom/runtime/pom.xml @@ -449,9 +449,9 @@ - org.eclipse.orbit.bundles - com.google.gson - 2.10.1.v20230109-0753 + com.google.code.gson + gson + 2.11.0 compile @@ -794,7 +794,7 @@ com.google.guava guava - 33.3.0-jre + 33.3.1-jre compile @@ -808,7 +808,7 @@ io.github.classgraph classgraph - 4.8.174 + 4.8.176 compile diff --git a/features/karaf/openhab-core/src/main/feature/feature.xml b/features/karaf/openhab-core/src/main/feature/feature.xml index 1276c88afbe..82af7499628 100644 --- a/features/karaf/openhab-core/src/main/feature/feature.xml +++ b/features/karaf/openhab-core/src/main/feature/feature.xml @@ -28,7 +28,7 @@ openhab.tp-gson - openhab.tp;filter:="(&(feature=xtext)(version>=2.36.0)(!(version>=2.37.0)))" + openhab.tp;filter:="(&(feature=xtext)(version>=2.37.0)(!(version>=2.38.0)))" openhab.tp-xtext openhab.tp;filter:="(feature=jax-rs-whiteboard)" @@ -401,7 +401,7 @@ - openhab.tp;filter:="(&(feature=xtext-ide)(version>=2.36.0)(!(version>=2.37.0)))" + openhab.tp;filter:="(&(feature=xtext-ide)(version>=2.37.0)(!(version>=2.38.0)))" openhab.tp-xtext-ide openhab.tp;filter:="(&(feature=lsp4j)(version>=0.23.1)(!(version>=0.24.0)))" diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml index 31f7e3b6246..6af8b16bb5f 100644 --- a/features/karaf/openhab-tp/src/main/feature/feature.xml +++ b/features/karaf/openhab-tp/src/main/feature/feature.xml @@ -55,8 +55,8 @@ - openhab.tp;feature=gson;version=2.10.1 - mvn:org.eclipse.orbit.bundles/com.google.gson/2.10.1.v20230109-0753 + openhab.tp;feature=gson;version=2.11.0 + mvn:com.google.code.gson/gson/2.11.0 @@ -244,12 +244,12 @@ mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/${xtext.version} mvn:com.google.guava/failureaccess/1.0.2 - mvn:com.google.guava/guava/33.3.0-jre + mvn:com.google.guava/guava/33.3.1-jre mvn:com.google.inject/guice/7.0.0 mvn:jakarta.inject/jakarta.inject-api/2.0.1 mvn:org.eclipse.orbit.bundles/org.aopalliance/1.0.0.v201105210816 - mvn:io.github.classgraph/classgraph/4.8.174 + mvn:io.github.classgraph/classgraph/4.8.176 mvn:org.eclipse.orbit.bundles/org.antlr.runtime/3.2.0.v201101311130 mvn:org.eclipse.platform/org.eclipse.equinox.common/3.18.0 diff --git a/itests/org.openhab.core.addon.tests/itest.bndrun b/itests/org.openhab.core.addon.tests/itest.bndrun index 60b1cbde512..62136483c1a 100644 --- a/itests/org.openhab.core.addon.tests/itest.bndrun +++ b/itests/org.openhab.core.addon.tests/itest.bndrun @@ -37,7 +37,7 @@ Fragment-Host: org.openhab.core.addon org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-platform-commons;version='[1.10.0,1.10.1)',\ diff --git a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun index 97e98dde65f..cbfee34be22 100644 --- a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun +++ b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun @@ -36,7 +36,7 @@ Fragment-Host: org.openhab.core.auth.oauth2client org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-platform-commons;version='[1.10.0,1.10.1)',\ diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun index ca32fb09240..98c30382867 100644 --- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun @@ -37,7 +37,7 @@ Fragment-Host: org.openhab.core.automation org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-platform-commons;version='[1.10.0,1.10.1)',\ diff --git a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun index b59fedaa084..6d12bd9e9b5 100644 --- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun @@ -37,7 +37,7 @@ Fragment-Host: org.openhab.core.automation org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-platform-commons;version='[1.10.0,1.10.1)',\ diff --git a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun index d3ab6f478a5..33397f75258 100644 --- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun @@ -33,7 +33,7 @@ Fragment-Host: org.openhab.core.automation.module.script org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-platform-commons;version='[1.10.0,1.10.1)',\ diff --git a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun index 62d2836d681..5a0d2feb2f5 100644 --- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun @@ -37,7 +37,7 @@ Fragment-Host: org.openhab.core.automation org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-platform-commons;version='[1.10.0,1.10.1)',\ diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun index b62aef7e7af..ead0729688f 100644 --- a/itests/org.openhab.core.automation.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.tests/itest.bndrun @@ -37,7 +37,7 @@ Fragment-Host: org.openhab.core.automation org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-platform-commons;version='[1.10.0,1.10.1)',\ diff --git a/itests/org.openhab.core.config.core.tests/itest.bndrun b/itests/org.openhab.core.config.core.tests/itest.bndrun index ff6ef86ff10..b3c02537fc7 100644 --- a/itests/org.openhab.core.config.core.tests/itest.bndrun +++ b/itests/org.openhab.core.config.core.tests/itest.bndrun @@ -39,7 +39,7 @@ Fragment-Host: org.openhab.core.config.core org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-platform-commons;version='[1.10.0,1.10.1)',\ diff --git a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun index 90e10812b3d..7b9da2d23f0 100644 --- a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun @@ -38,7 +38,7 @@ Fragment-Host: org.openhab.core.config.discovery.mdns org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-platform-commons;version='[1.10.0,1.10.1)',\ diff --git a/itests/org.openhab.core.config.discovery.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.tests/itest.bndrun index d2d8704aa22..f8b62ecf9dd 100644 --- a/itests/org.openhab.core.config.discovery.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.tests/itest.bndrun @@ -39,7 +39,7 @@ Fragment-Host: org.openhab.core.config.discovery org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-platform-commons;version='[1.10.0,1.10.1)',\ diff --git a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun index 27d13b78256..7ba5f01b685 100644 --- a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun @@ -38,7 +38,7 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-platform-commons;version='[1.10.0,1.10.1)',\ diff --git a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun index 44e754f2eb5..e60e5bb64e8 100644 --- a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun @@ -47,7 +47,7 @@ Provide-Capability: \ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-platform-commons;version='[1.10.0,1.10.1)',\ diff --git a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun index 9c644000595..558292e5133 100644 --- a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun +++ b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun @@ -32,7 +32,7 @@ Fragment-Host: org.openhab.core.config.dispatch org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-platform-commons;version='[1.10.0,1.10.1)',\ diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun index 20ed07ece8c..d971d43a4ad 100644 --- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun +++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun @@ -38,7 +38,7 @@ feature.openhab-config: \ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-platform-commons;version='[1.10.0,1.10.1)',\ diff --git a/itests/org.openhab.core.io.net.tests/itest.bndrun b/itests/org.openhab.core.io.net.tests/itest.bndrun index ea923657074..936c146c399 100644 --- a/itests/org.openhab.core.io.net.tests/itest.bndrun +++ b/itests/org.openhab.core.io.net.tests/itest.bndrun @@ -33,7 +33,7 @@ Fragment-Host: org.openhab.core.io.net org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-platform-commons;version='[1.10.0,1.10.1)',\ diff --git a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun index ee189955361..358d7e9f692 100644 --- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun +++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun @@ -46,7 +46,7 @@ Fragment-Host: org.openhab.core.io.rest.core org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ org.apache.cxf.cxf-core;version='[3.6.4,3.6.5)',\ org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.6.4,3.6.5)',\ org.apache.cxf.cxf-rt-rs-client;version='[3.6.4,3.6.5)',\ diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun index 6d1a7461d95..4bce8e1a105 100644 --- a/itests/org.openhab.core.model.item.tests/itest.bndrun +++ b/itests/org.openhab.core.model.item.tests/itest.bndrun @@ -37,7 +37,7 @@ Fragment-Host: org.openhab.core.model.item org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ com.google.inject;version='[7.0.0,7.0.1)',\ org.eclipse.emf.common;version='[2.24.0,2.24.1)',\ org.eclipse.emf.ecore;version='[2.26.0,2.26.1)',\ @@ -78,13 +78,13 @@ Fragment-Host: org.openhab.core.model.item org.eclipse.jetty.websocket.client;version='[9.4.57,9.4.58)',\ org.eclipse.jetty.websocket.common;version='[9.4.57,9.4.58)',\ org.eclipse.jetty.xml;version='[9.4.57,9.4.58)',\ - 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.eclipse.xtend.lib;version='[2.37.0,2.37.1)',\ + org.eclipse.xtend.lib.macro;version='[2.37.0,2.37.1)',\ + org.eclipse.xtext;version='[2.37.0,2.37.1)',\ + org.eclipse.xtext.common.types;version='[2.37.0,2.37.1)',\ + org.eclipse.xtext.util;version='[2.37.0,2.37.1)',\ + org.eclipse.xtext.xbase;version='[2.37.0,2.37.1)',\ + org.eclipse.xtext.xbase.lib;version='[2.37.0,2.37.1)',\ org.objectweb.asm;version='[9.7.1,9.7.2)',\ org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ @@ -122,7 +122,7 @@ Fragment-Host: org.openhab.core.model.item org.openhab.core.transform;version='[5.0.0,5.0.1)',\ org.openhab.core.voice;version='[5.0.0,5.0.1)',\ stax2-api;version='[4.2.2,4.2.3)',\ - com.google.guava;version='[33.3.0,33.3.1)',\ + com.google.guava;version='[33.3.1,33.3.2)',\ biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ org.osgi.service.cm;version='[1.6.0,1.6.1)',\ de.focus_shift.jollyday-core;version='[0.35.1,0.35.2)',\ diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun index 4985bfca14e..cd54d6c3fed 100644 --- a/itests/org.openhab.core.model.rule.tests/itest.bndrun +++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun @@ -41,7 +41,7 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ com.google.inject;version='[7.0.0,7.0.1)',\ org.eclipse.emf.common;version='[2.24.0,2.24.1)',\ org.eclipse.emf.ecore;version='[2.26.0,2.26.1)',\ @@ -81,13 +81,13 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.eclipse.jetty.websocket.client;version='[9.4.57,9.4.58)',\ org.eclipse.jetty.websocket.common;version='[9.4.57,9.4.58)',\ org.eclipse.jetty.xml;version='[9.4.57,9.4.58)',\ - 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.eclipse.xtend.lib;version='[2.37.0,2.37.1)',\ + org.eclipse.xtend.lib.macro;version='[2.37.0,2.37.1)',\ + org.eclipse.xtext;version='[2.37.0,2.37.1)',\ + org.eclipse.xtext.common.types;version='[2.37.0,2.37.1)',\ + org.eclipse.xtext.util;version='[2.37.0,2.37.1)',\ + org.eclipse.xtext.xbase;version='[2.37.0,2.37.1)',\ + org.eclipse.xtext.xbase.lib;version='[2.37.0,2.37.1)',\ org.objectweb.asm;version='[9.7.1,9.7.2)',\ org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ @@ -125,7 +125,7 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.openhab.core.transform;version='[5.0.0,5.0.1)',\ org.openhab.core.voice;version='[5.0.0,5.0.1)',\ stax2-api;version='[4.2.2,4.2.3)',\ - com.google.guava;version='[33.3.0,33.3.1)',\ + com.google.guava;version='[33.3.1,33.3.2)',\ biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ org.osgi.service.cm;version='[1.6.0,1.6.1)',\ de.focus_shift.jollyday-core;version='[0.35.1,0.35.2)',\ diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun index fd0b333c12e..5f183bb0af3 100644 --- a/itests/org.openhab.core.model.script.tests/itest.bndrun +++ b/itests/org.openhab.core.model.script.tests/itest.bndrun @@ -46,7 +46,7 @@ Fragment-Host: org.openhab.core.model.script org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ com.google.inject;version='[7.0.0,7.0.1)',\ org.eclipse.emf.common;version='[2.24.0,2.24.1)',\ org.eclipse.emf.ecore;version='[2.26.0,2.26.1)',\ @@ -86,13 +86,13 @@ Fragment-Host: org.openhab.core.model.script org.eclipse.jetty.websocket.client;version='[9.4.57,9.4.58)',\ org.eclipse.jetty.websocket.common;version='[9.4.57,9.4.58)',\ org.eclipse.jetty.xml;version='[9.4.57,9.4.58)',\ - 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.eclipse.xtend.lib;version='[2.37.0,2.37.1)',\ + org.eclipse.xtend.lib.macro;version='[2.37.0,2.37.1)',\ + org.eclipse.xtext;version='[2.37.0,2.37.1)',\ + org.eclipse.xtext.common.types;version='[2.37.0,2.37.1)',\ + org.eclipse.xtext.util;version='[2.37.0,2.37.1)',\ + org.eclipse.xtext.xbase;version='[2.37.0,2.37.1)',\ + org.eclipse.xtext.xbase.lib;version='[2.37.0,2.37.1)',\ org.objectweb.asm;version='[9.7.1,9.7.2)',\ org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ @@ -129,7 +129,7 @@ Fragment-Host: org.openhab.core.model.script org.openhab.core.transform;version='[5.0.0,5.0.1)',\ org.openhab.core.voice;version='[5.0.0,5.0.1)',\ stax2-api;version='[4.2.2,4.2.3)',\ - com.google.guava;version='[33.3.0,33.3.1)',\ + com.google.guava;version='[33.3.1,33.3.2)',\ biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ de.focus_shift.jollyday-core;version='[0.35.1,0.35.2)',\ de.focus_shift.jollyday-jackson;version='[0.35.1,0.35.2)',\ diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun index 05fc19412db..7dd9c402af2 100644 --- a/itests/org.openhab.core.model.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun @@ -43,7 +43,7 @@ Fragment-Host: org.openhab.core.model.thing org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ com.google.inject;version='[7.0.0,7.0.1)',\ org.eclipse.emf.common;version='[2.24.0,2.24.1)',\ org.eclipse.emf.ecore;version='[2.26.0,2.26.1)',\ @@ -85,13 +85,13 @@ Fragment-Host: org.openhab.core.model.thing org.eclipse.jetty.websocket.client;version='[9.4.57,9.4.58)',\ org.eclipse.jetty.websocket.common;version='[9.4.57,9.4.58)',\ org.eclipse.jetty.xml;version='[9.4.57,9.4.58)',\ - 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.eclipse.xtend.lib;version='[2.37.0,2.37.1)',\ + org.eclipse.xtend.lib.macro;version='[2.37.0,2.37.1)',\ + org.eclipse.xtext;version='[2.37.0,2.37.1)',\ + org.eclipse.xtext.common.types;version='[2.37.0,2.37.1)',\ + org.eclipse.xtext.util;version='[2.37.0,2.37.1)',\ + org.eclipse.xtext.xbase;version='[2.37.0,2.37.1)',\ + org.eclipse.xtext.xbase.lib;version='[2.37.0,2.37.1)',\ org.objectweb.asm;version='[9.7.1,9.7.2)',\ org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ @@ -131,7 +131,7 @@ Fragment-Host: org.openhab.core.model.thing org.openhab.core.transform;version='[5.0.0,5.0.1)',\ org.openhab.core.voice;version='[5.0.0,5.0.1)',\ stax2-api;version='[4.2.2,4.2.3)',\ - com.google.guava;version='[33.3.0,33.3.1)',\ + com.google.guava;version='[33.3.1,33.3.2)',\ biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ org.osgi.service.cm;version='[1.6.0,1.6.1)',\ de.focus_shift.jollyday-core;version='[0.35.1,0.35.2)',\ diff --git a/itests/org.openhab.core.storage.json.tests/itest.bndrun b/itests/org.openhab.core.storage.json.tests/itest.bndrun index d2beacc2860..2e595360278 100644 --- a/itests/org.openhab.core.storage.json.tests/itest.bndrun +++ b/itests/org.openhab.core.storage.json.tests/itest.bndrun @@ -33,7 +33,7 @@ Fragment-Host: org.openhab.core.storage.json org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-platform-commons;version='[1.10.0,1.10.1)',\ diff --git a/itests/org.openhab.core.tests/itest.bndrun b/itests/org.openhab.core.tests/itest.bndrun index 4c7cce45b89..53df34c0394 100644 --- a/itests/org.openhab.core.tests/itest.bndrun +++ b/itests/org.openhab.core.tests/itest.bndrun @@ -37,7 +37,7 @@ Fragment-Host: org.openhab.core org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-platform-commons;version='[1.10.0,1.10.1)',\ diff --git a/itests/org.openhab.core.thing.tests/itest.bndrun b/itests/org.openhab.core.thing.tests/itest.bndrun index 812b135952c..be46a75a49e 100644 --- a/itests/org.openhab.core.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.thing.tests/itest.bndrun @@ -42,7 +42,7 @@ Fragment-Host: org.openhab.core.thing org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-platform-commons;version='[1.10.0,1.10.1)',\ diff --git a/itests/org.openhab.core.voice.tests/itest.bndrun b/itests/org.openhab.core.voice.tests/itest.bndrun index 4d872db7179..f97b9f385de 100644 --- a/itests/org.openhab.core.voice.tests/itest.bndrun +++ b/itests/org.openhab.core.voice.tests/itest.bndrun @@ -37,7 +37,7 @@ Fragment-Host: org.openhab.core.voice org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-jupiter-params;version='[5.10.0,5.10.1)',\ diff --git a/pom.xml b/pom.xml index c1b4e42798c..164f401aec3 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ 4.4.7 0.17.0 2.0.12 - 2.36.0 + 2.37.0 2.43.0 4.25 @@ -297,7 +297,7 @@ Import-Package: \\ org.eclipse.jdt ecj - 3.36.0 + 3.39.0 diff --git a/tools/i18n-plugin/pom.xml b/tools/i18n-plugin/pom.xml index 16889848635..92c57281289 100644 --- a/tools/i18n-plugin/pom.xml +++ b/tools/i18n-plugin/pom.xml @@ -67,7 +67,7 @@ com.google.code.gson gson - 2.10.1 + 2.11.0 org.openhab.core.bom diff --git a/tools/upgradetool/pom.xml b/tools/upgradetool/pom.xml index 4dd52112aa8..63a18763f0b 100644 --- a/tools/upgradetool/pom.xml +++ b/tools/upgradetool/pom.xml @@ -51,7 +51,7 @@ com.google.code.gson gson - 2.10.1 + 2.11.0 javax.measure