diff --git a/bom/compile-model/pom.xml b/bom/compile-model/pom.xml index bb165b34e..d4bb795d2 100644 --- a/bom/compile-model/pom.xml +++ b/bom/compile-model/pom.xml @@ -134,7 +134,7 @@ io.github.classgraph classgraph - 4.8.176 + 4.8.180 compile diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml index 540fc7772..648d7bdc2 100644 --- a/bom/compile/pom.xml +++ b/bom/compile/pom.xml @@ -133,7 +133,7 @@ com.google.code.gson gson - 2.11.0 + 2.13.1 compile diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml index 0a2375dfb..e5ea7ad7f 100644 --- a/bom/runtime/pom.xml +++ b/bom/runtime/pom.xml @@ -462,7 +462,7 @@ com.google.code.gson gson - 2.11.0 + 2.13.1 compile @@ -813,7 +813,7 @@ io.github.classgraph classgraph - 4.8.176 + 4.8.180 compile @@ -843,13 +843,13 @@ compile - org.eclipse.xtend + org.eclipse.xtext org.eclipse.xtend.lib ${xtext.version} compile - org.eclipse.xtend + org.eclipse.xtext org.eclipse.xtend.lib.macro ${xtext.version} compile diff --git a/bundles/org.openhab.core.model.item.ide/pom.xml b/bundles/org.openhab.core.model.item.ide/pom.xml index ffa04e59e..e7c99b8cb 100644 --- a/bundles/org.openhab.core.model.item.ide/pom.xml +++ b/bundles/org.openhab.core.model.item.ide/pom.xml @@ -44,7 +44,7 @@ - org.eclipse.xtend + org.eclipse.xtext xtend-maven-plugin diff --git a/bundles/org.openhab.core.model.item/pom.xml b/bundles/org.openhab.core.model.item/pom.xml index fb6f6744d..46ac4abaf 100644 --- a/bundles/org.openhab.core.model.item/pom.xml +++ b/bundles/org.openhab.core.model.item/pom.xml @@ -98,7 +98,7 @@ - org.eclipse.xtend + org.eclipse.xtext xtend-maven-plugin diff --git a/bundles/org.openhab.core.model.persistence.ide/pom.xml b/bundles/org.openhab.core.model.persistence.ide/pom.xml index 58792d735..77ee46110 100644 --- a/bundles/org.openhab.core.model.persistence.ide/pom.xml +++ b/bundles/org.openhab.core.model.persistence.ide/pom.xml @@ -43,7 +43,7 @@ - org.eclipse.xtend + org.eclipse.xtext xtend-maven-plugin diff --git a/bundles/org.openhab.core.model.persistence/pom.xml b/bundles/org.openhab.core.model.persistence/pom.xml index 2fa94c7b9..68da21bab 100644 --- a/bundles/org.openhab.core.model.persistence/pom.xml +++ b/bundles/org.openhab.core.model.persistence/pom.xml @@ -98,7 +98,7 @@ - org.eclipse.xtend + org.eclipse.xtext xtend-maven-plugin diff --git a/bundles/org.openhab.core.model.rule.ide/pom.xml b/bundles/org.openhab.core.model.rule.ide/pom.xml index 39cfad89c..c33d3b84a 100644 --- a/bundles/org.openhab.core.model.rule.ide/pom.xml +++ b/bundles/org.openhab.core.model.rule.ide/pom.xml @@ -48,7 +48,7 @@ - org.eclipse.xtend + org.eclipse.xtext xtend-maven-plugin diff --git a/bundles/org.openhab.core.model.rule/pom.xml b/bundles/org.openhab.core.model.rule/pom.xml index 2767e5ee6..349413df9 100644 --- a/bundles/org.openhab.core.model.rule/pom.xml +++ b/bundles/org.openhab.core.model.rule/pom.xml @@ -108,7 +108,7 @@ - org.eclipse.xtend + org.eclipse.xtext xtend-maven-plugin false diff --git a/bundles/org.openhab.core.model.script.ide/pom.xml b/bundles/org.openhab.core.model.script.ide/pom.xml index b6f4cc64f..07e239916 100644 --- a/bundles/org.openhab.core.model.script.ide/pom.xml +++ b/bundles/org.openhab.core.model.script.ide/pom.xml @@ -43,7 +43,7 @@ - org.eclipse.xtend + org.eclipse.xtext xtend-maven-plugin diff --git a/bundles/org.openhab.core.model.script/pom.xml b/bundles/org.openhab.core.model.script/pom.xml index fc1202a49..1d697c351 100644 --- a/bundles/org.openhab.core.model.script/pom.xml +++ b/bundles/org.openhab.core.model.script/pom.xml @@ -154,7 +154,7 @@ - org.eclipse.xtend + org.eclipse.xtext xtend-maven-plugin false diff --git a/bundles/org.openhab.core.model.sitemap.ide/pom.xml b/bundles/org.openhab.core.model.sitemap.ide/pom.xml index 530e457a4..cadbcde25 100644 --- a/bundles/org.openhab.core.model.sitemap.ide/pom.xml +++ b/bundles/org.openhab.core.model.sitemap.ide/pom.xml @@ -43,7 +43,7 @@ - org.eclipse.xtend + org.eclipse.xtext xtend-maven-plugin diff --git a/bundles/org.openhab.core.model.sitemap/pom.xml b/bundles/org.openhab.core.model.sitemap/pom.xml index f1b1269f9..89dd2addc 100644 --- a/bundles/org.openhab.core.model.sitemap/pom.xml +++ b/bundles/org.openhab.core.model.sitemap/pom.xml @@ -88,7 +88,7 @@ - org.eclipse.xtend + org.eclipse.xtext xtend-maven-plugin diff --git a/bundles/org.openhab.core.model.thing.ide/pom.xml b/bundles/org.openhab.core.model.thing.ide/pom.xml index 343016e6b..d8dfa975a 100644 --- a/bundles/org.openhab.core.model.thing.ide/pom.xml +++ b/bundles/org.openhab.core.model.thing.ide/pom.xml @@ -43,7 +43,7 @@ - org.eclipse.xtend + org.eclipse.xtext xtend-maven-plugin diff --git a/bundles/org.openhab.core.model.thing/pom.xml b/bundles/org.openhab.core.model.thing/pom.xml index 0c6fc2115..baa0c41f5 100644 --- a/bundles/org.openhab.core.model.thing/pom.xml +++ b/bundles/org.openhab.core.model.thing/pom.xml @@ -126,7 +126,7 @@ - org.eclipse.xtend + org.eclipse.xtext xtend-maven-plugin false diff --git a/features/karaf/openhab-core/src/main/feature/feature.xml b/features/karaf/openhab-core/src/main/feature/feature.xml index e8c971508..4fd15eb8e 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.39.0)(!(version>=2.40.0)))" + openhab.tp;filter:="(&(feature=xtext)(version>=2.40.0)(!(version>=2.41.0)))" openhab.tp-xtext openhab.tp;filter:="(feature=jax-rs-whiteboard)" @@ -406,7 +406,7 @@ - openhab.tp;filter:="(&(feature=xtext-ide)(version>=2.39.0)(!(version>=2.40.0)))" + openhab.tp;filter:="(&(feature=xtext-ide)(version>=2.40.0)(!(version>=2.41.0)))" openhab.tp-xtext-ide openhab.tp;filter:="(&(feature=lsp4j)(version>=0.24.0)(!(version>=0.24.1)))" diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml index 4441542dd..8d8d0bf5e 100644 --- a/features/karaf/openhab-tp/src/main/feature/feature.xml +++ b/features/karaf/openhab-tp/src/main/feature/feature.xml @@ -58,8 +58,9 @@ - openhab.tp;feature=gson;version=2.11.0 - mvn:com.google.code.gson/gson/2.11.0 + openhab.tp;feature=gson;version=2.13.1 + mvn:com.google.code.gson/gson/2.13.1 + mvn:com.google.errorprone/error_prone_annotations/2.38.0 @@ -244,8 +245,8 @@ mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.lib/${xtext.version} mvn:org.eclipse.xtext/org.eclipse.xtext.smap/${xtext.version} mvn:org.eclipse.xtext/org.eclipse.xtext.util/${xtext.version} - mvn:org.eclipse.xtend/org.eclipse.xtend.lib/${xtext.version} - mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/${xtext.version} + mvn:org.eclipse.xtext/org.eclipse.xtend.lib/${xtext.version} + mvn:org.eclipse.xtext/org.eclipse.xtend.lib.macro/${xtext.version} mvn:com.google.guava/failureaccess/1.0.3 mvn:com.google.guava/guava/33.4.8-jre @@ -253,7 +254,7 @@ 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.176 + mvn:io.github.classgraph/classgraph/4.8.180 mvn:org.eclipse.orbit.bundles/org.antlr.runtime/3.2.0.v201101311130 mvn:org.eclipse.platform/org.eclipse.equinox.common/3.19.0 diff --git a/itests/org.openhab.core.addon.tests/itest.bndrun b/itests/org.openhab.core.addon.tests/itest.bndrun index f180a8aca..69ecda016 100644 --- a/itests/org.openhab.core.addon.tests/itest.bndrun +++ b/itests/org.openhab.core.addon.tests/itest.bndrun @@ -36,7 +36,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.11.0,2.11.1)',\ + com.google.gson;version='[2.13.1,2.13.2)',\ junit-jupiter-api;version='[5.11.4,5.11.5)',\ junit-jupiter-engine;version='[5.11.4,5.11.5)',\ junit-platform-commons;version='[1.11.4,1.11.5)',\ diff --git a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun index f3cd69c05..551de9739 100644 --- a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun +++ b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun @@ -35,7 +35,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.11.0,2.11.1)',\ + com.google.gson;version='[2.13.1,2.13.2)',\ junit-jupiter-api;version='[5.11.4,5.11.5)',\ junit-jupiter-engine;version='[5.11.4,5.11.5)',\ junit-platform-commons;version='[1.11.4,1.11.5)',\ diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun index a87fff06e..c242c9aa4 100644 --- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun @@ -36,7 +36,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.11.0,2.11.1)',\ + com.google.gson;version='[2.13.1,2.13.2)',\ junit-jupiter-api;version='[5.11.4,5.11.5)',\ junit-jupiter-engine;version='[5.11.4,5.11.5)',\ junit-platform-commons;version='[1.11.4,1.11.5)',\ 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 d036e9caf..83faf5ba5 100644 --- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun @@ -36,7 +36,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.11.0,2.11.1)',\ + com.google.gson;version='[2.13.1,2.13.2)',\ junit-jupiter-api;version='[5.11.4,5.11.5)',\ junit-jupiter-engine;version='[5.11.4,5.11.5)',\ junit-platform-commons;version='[1.11.4,1.11.5)',\ 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 6b45360bd..095be3437 100644 --- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun @@ -32,7 +32,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.11.0,2.11.1)',\ + com.google.gson;version='[2.13.1,2.13.2)',\ junit-jupiter-api;version='[5.11.4,5.11.5)',\ junit-jupiter-engine;version='[5.11.4,5.11.5)',\ junit-platform-commons;version='[1.11.4,1.11.5)',\ 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 c2ee2b6e8..a83d13ef8 100644 --- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun @@ -36,7 +36,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.11.0,2.11.1)',\ + com.google.gson;version='[2.13.1,2.13.2)',\ junit-jupiter-api;version='[5.11.4,5.11.5)',\ junit-jupiter-engine;version='[5.11.4,5.11.5)',\ junit-platform-commons;version='[1.11.4,1.11.5)',\ diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun index 4b0c543bc..49eb3d95f 100644 --- a/itests/org.openhab.core.automation.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.tests/itest.bndrun @@ -36,7 +36,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.11.0,2.11.1)',\ + com.google.gson;version='[2.13.1,2.13.2)',\ junit-jupiter-api;version='[5.11.4,5.11.5)',\ junit-jupiter-engine;version='[5.11.4,5.11.5)',\ junit-platform-commons;version='[1.11.4,1.11.5)',\ diff --git a/itests/org.openhab.core.config.core.tests/itest.bndrun b/itests/org.openhab.core.config.core.tests/itest.bndrun index 7f2f77f5e..b0adf1a0d 100644 --- a/itests/org.openhab.core.config.core.tests/itest.bndrun +++ b/itests/org.openhab.core.config.core.tests/itest.bndrun @@ -38,7 +38,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.11.0,2.11.1)',\ + com.google.gson;version='[2.13.1,2.13.2)',\ junit-jupiter-api;version='[5.11.4,5.11.5)',\ junit-jupiter-engine;version='[5.11.4,5.11.5)',\ junit-platform-commons;version='[1.11.4,1.11.5)',\ 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 9e17e42a2..42365210d 100644 --- a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun @@ -37,7 +37,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.11.0,2.11.1)',\ + com.google.gson;version='[2.13.1,2.13.2)',\ junit-jupiter-api;version='[5.11.4,5.11.5)',\ junit-jupiter-engine;version='[5.11.4,5.11.5)',\ junit-platform-commons;version='[1.11.4,1.11.5)',\ diff --git a/itests/org.openhab.core.config.discovery.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.tests/itest.bndrun index 5649d40f7..12ab94f0d 100644 --- a/itests/org.openhab.core.config.discovery.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.tests/itest.bndrun @@ -38,7 +38,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.11.0,2.11.1)',\ + com.google.gson;version='[2.13.1,2.13.2)',\ junit-jupiter-api;version='[5.11.4,5.11.5)',\ junit-jupiter-engine;version='[5.11.4,5.11.5)',\ junit-platform-commons;version='[1.11.4,1.11.5)',\ 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 dc1a43dd2..2e07749cf 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 @@ -37,7 +37,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.11.0,2.11.1)',\ + com.google.gson;version='[2.13.1,2.13.2)',\ junit-jupiter-api;version='[5.11.4,5.11.5)',\ junit-jupiter-engine;version='[5.11.4,5.11.5)',\ junit-platform-commons;version='[1.11.4,1.11.5)',\ 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 26e2f7b40..d0967f34c 100644 --- a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun @@ -46,7 +46,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.11.0,2.11.1)',\ + com.google.gson;version='[2.13.1,2.13.2)',\ junit-jupiter-api;version='[5.11.4,5.11.5)',\ junit-jupiter-engine;version='[5.11.4,5.11.5)',\ junit-platform-commons;version='[1.11.4,1.11.5)',\ diff --git a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun index 663e07cff..0335ed48f 100644 --- a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun +++ b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun @@ -31,7 +31,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.11.0,2.11.1)',\ + com.google.gson;version='[2.13.1,2.13.2)',\ junit-jupiter-api;version='[5.11.4,5.11.5)',\ junit-jupiter-engine;version='[5.11.4,5.11.5)',\ junit-platform-commons;version='[1.11.4,1.11.5)',\ diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun index 112997bfa..5b4d960b8 100644 --- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun +++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun @@ -37,7 +37,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.11.0,2.11.1)',\ + com.google.gson;version='[2.13.1,2.13.2)',\ junit-jupiter-api;version='[5.11.4,5.11.5)',\ junit-jupiter-engine;version='[5.11.4,5.11.5)',\ junit-platform-commons;version='[1.11.4,1.11.5)',\ diff --git a/itests/org.openhab.core.io.net.tests/itest.bndrun b/itests/org.openhab.core.io.net.tests/itest.bndrun index bd9b9f6d3..70bde909c 100644 --- a/itests/org.openhab.core.io.net.tests/itest.bndrun +++ b/itests/org.openhab.core.io.net.tests/itest.bndrun @@ -32,7 +32,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.11.0,2.11.1)',\ + com.google.gson;version='[2.13.1,2.13.2)',\ junit-jupiter-api;version='[5.11.4,5.11.5)',\ junit-jupiter-engine;version='[5.11.4,5.11.5)',\ junit-platform-commons;version='[1.11.4,1.11.5)',\ 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 eea8d9a41..882776b2d 100644 --- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun +++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun @@ -45,7 +45,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.11.0,2.11.1)',\ + com.google.gson;version='[2.13.1,2.13.2)',\ org.apache.cxf.cxf-core;version='[3.6.8,3.6.9)',\ org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.6.8,3.6.9)',\ org.apache.cxf.cxf-rt-rs-client;version='[3.6.8,3.6.9)',\ diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun index 27bb15eb1..1238a33a1 100644 --- a/itests/org.openhab.core.model.item.tests/itest.bndrun +++ b/itests/org.openhab.core.model.item.tests/itest.bndrun @@ -36,7 +36,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.11.0,2.11.1)',\ + com.google.gson;version='[2.13.1,2.13.2)',\ com.google.inject;version='[7.0.0,7.0.1)',\ org.eclipse.emf.common;version='[2.30.0,2.30.1)',\ org.eclipse.emf.ecore;version='[2.36.0,2.36.1)',\ @@ -53,7 +53,7 @@ Fragment-Host: org.openhab.core.model.item org.threeten.extra;version='[1.8.0,1.8.1)',\ com.google.guava.failureaccess;version='[1.0.3,1.0.4)',\ com.sun.jna;version='[5.17.0,5.17.1)',\ - io.github.classgraph.classgraph;version='[4.8.176,4.8.177)',\ + io.github.classgraph.classgraph;version='[4.8.180,4.8.181)',\ 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.57,9.4.58)',\ @@ -73,13 +73,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.39.0,2.39.1)',\ - org.eclipse.xtend.lib.macro;version='[2.39.0,2.39.1)',\ - org.eclipse.xtext;version='[2.39.0,2.39.1)',\ - org.eclipse.xtext.common.types;version='[2.39.0,2.39.1)',\ - org.eclipse.xtext.util;version='[2.39.0,2.39.1)',\ - org.eclipse.xtext.xbase;version='[2.39.0,2.39.1)',\ - org.eclipse.xtext.xbase.lib;version='[2.39.0,2.39.1)',\ + org.eclipse.xtend.lib;version='[2.40.0,2.40.1)',\ + org.eclipse.xtend.lib.macro;version='[2.40.0,2.40.1)',\ + org.eclipse.xtext;version='[2.40.0,2.40.1)',\ + org.eclipse.xtext.common.types;version='[2.40.0,2.40.1)',\ + org.eclipse.xtext.util;version='[2.40.0,2.40.1)',\ + org.eclipse.xtext.xbase;version='[2.40.0,2.40.1)',\ + org.eclipse.xtext.xbase.lib;version='[2.40.0,2.40.1)',\ org.objectweb.asm;version='[9.8.0,9.8.1)',\ org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ @@ -110,7 +110,6 @@ Fragment-Host: org.openhab.core.model.item org.openhab.core.model.script.runtime;version='[5.1.0,5.1.1)',\ org.openhab.core.model.sitemap;version='[5.1.0,5.1.1)',\ org.openhab.core.model.thing;version='[5.1.0,5.1.1)',\ - org.openhab.core.model.thing.runtime;version='[5.1.0,5.1.1)',\ org.openhab.core.persistence;version='[5.1.0,5.1.1)',\ org.openhab.core.semantics;version='[5.1.0,5.1.1)',\ org.openhab.core.test;version='[5.1.0,5.1.1)',\ @@ -128,4 +127,5 @@ Fragment-Host: org.openhab.core.model.item com.fasterxml.jackson.core.jackson-databind;version='[2.19.2,2.19.3)',\ com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.19.2,2.19.3)',\ com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.19.2,2.19.3)',\ - org.yaml.snakeyaml;version='[2.4.0,2.4.1)' + org.yaml.snakeyaml;version='[2.4.0,2.4.1)',\ + org.openhab.core.model.persistence.runtime;version='[5.1.0,5.1.1)' diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun index b004df473..4b7026d89 100644 --- a/itests/org.openhab.core.model.rule.tests/itest.bndrun +++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun @@ -40,7 +40,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.11.0,2.11.1)',\ + com.google.gson;version='[2.13.1,2.13.2)',\ com.google.inject;version='[7.0.0,7.0.1)',\ org.eclipse.emf.common;version='[2.30.0,2.30.1)',\ org.eclipse.emf.ecore;version='[2.36.0,2.36.1)',\ @@ -57,7 +57,7 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.threeten.extra;version='[1.8.0,1.8.1)',\ com.google.guava.failureaccess;version='[1.0.3,1.0.4)',\ com.sun.jna;version='[5.17.0,5.17.1)',\ - io.github.classgraph.classgraph;version='[4.8.176,4.8.177)',\ + io.github.classgraph.classgraph;version='[4.8.180,4.8.181)',\ org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ org.eclipse.jetty.alpn.client;version='[9.4.57,9.4.58)',\ org.eclipse.jetty.client;version='[9.4.57,9.4.58)',\ @@ -76,13 +76,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.39.0,2.39.1)',\ - org.eclipse.xtend.lib.macro;version='[2.39.0,2.39.1)',\ - org.eclipse.xtext;version='[2.39.0,2.39.1)',\ - org.eclipse.xtext.common.types;version='[2.39.0,2.39.1)',\ - org.eclipse.xtext.util;version='[2.39.0,2.39.1)',\ - org.eclipse.xtext.xbase;version='[2.39.0,2.39.1)',\ - org.eclipse.xtext.xbase.lib;version='[2.39.0,2.39.1)',\ + org.eclipse.xtend.lib;version='[2.40.0,2.40.1)',\ + org.eclipse.xtend.lib.macro;version='[2.40.0,2.40.1)',\ + org.eclipse.xtext;version='[2.40.0,2.40.1)',\ + org.eclipse.xtext.common.types;version='[2.40.0,2.40.1)',\ + org.eclipse.xtext.util;version='[2.40.0,2.40.1)',\ + org.eclipse.xtext.xbase;version='[2.40.0,2.40.1)',\ + org.eclipse.xtext.xbase.lib;version='[2.40.0,2.40.1)',\ org.objectweb.asm;version='[9.8.0,9.8.1)',\ org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ @@ -113,7 +113,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.openhab.core.model.script.runtime;version='[5.1.0,5.1.1)',\ org.openhab.core.model.sitemap;version='[5.1.0,5.1.1)',\ org.openhab.core.model.thing;version='[5.1.0,5.1.1)',\ - org.openhab.core.model.thing.runtime;version='[5.1.0,5.1.1)',\ org.openhab.core.persistence;version='[5.1.0,5.1.1)',\ org.openhab.core.semantics;version='[5.1.0,5.1.1)',\ org.openhab.core.test;version='[5.1.0,5.1.1)',\ diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun index 05a7a2d5c..6180499a0 100644 --- a/itests/org.openhab.core.model.script.tests/itest.bndrun +++ b/itests/org.openhab.core.model.script.tests/itest.bndrun @@ -45,7 +45,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.11.0,2.11.1)',\ + com.google.gson;version='[2.13.1,2.13.2)',\ com.google.inject;version='[7.0.0,7.0.1)',\ org.eclipse.emf.common;version='[2.30.0,2.30.1)',\ org.eclipse.emf.ecore;version='[2.36.0,2.36.1)',\ @@ -62,7 +62,7 @@ Fragment-Host: org.openhab.core.model.script org.threeten.extra;version='[1.8.0,1.8.1)',\ com.google.guava.failureaccess;version='[1.0.3,1.0.4)',\ com.sun.jna;version='[5.17.0,5.17.1)',\ - io.github.classgraph.classgraph;version='[4.8.176,4.8.177)',\ + io.github.classgraph.classgraph;version='[4.8.180,4.8.181)',\ org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ org.eclipse.jetty.alpn.client;version='[9.4.57,9.4.58)',\ org.eclipse.jetty.client;version='[9.4.57,9.4.58)',\ @@ -81,13 +81,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.39.0,2.39.1)',\ - org.eclipse.xtend.lib.macro;version='[2.39.0,2.39.1)',\ - org.eclipse.xtext;version='[2.39.0,2.39.1)',\ - org.eclipse.xtext.common.types;version='[2.39.0,2.39.1)',\ - org.eclipse.xtext.util;version='[2.39.0,2.39.1)',\ - org.eclipse.xtext.xbase;version='[2.39.0,2.39.1)',\ - org.eclipse.xtext.xbase.lib;version='[2.39.0,2.39.1)',\ + org.eclipse.xtend.lib;version='[2.40.0,2.40.1)',\ + org.eclipse.xtend.lib.macro;version='[2.40.0,2.40.1)',\ + org.eclipse.xtext;version='[2.40.0,2.40.1)',\ + org.eclipse.xtext.common.types;version='[2.40.0,2.40.1)',\ + org.eclipse.xtext.util;version='[2.40.0,2.40.1)',\ + org.eclipse.xtext.xbase;version='[2.40.0,2.40.1)',\ + org.eclipse.xtext.xbase.lib;version='[2.40.0,2.40.1)',\ org.objectweb.asm;version='[9.8.0,9.8.1)',\ org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ @@ -117,7 +117,6 @@ Fragment-Host: org.openhab.core.model.script org.openhab.core.model.script.tests;version='[5.1.0,5.1.1)',\ org.openhab.core.model.sitemap;version='[5.1.0,5.1.1)',\ org.openhab.core.model.thing;version='[5.1.0,5.1.1)',\ - org.openhab.core.model.thing.runtime;version='[5.1.0,5.1.1)',\ org.openhab.core.persistence;version='[5.1.0,5.1.1)',\ org.openhab.core.semantics;version='[5.1.0,5.1.1)',\ org.openhab.core.test;version='[5.1.0,5.1.1)',\ diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun index 2c2c15ace..331e4b5da 100644 --- a/itests/org.openhab.core.model.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun @@ -42,7 +42,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.11.0,2.11.1)',\ + com.google.gson;version='[2.13.1,2.13.2)',\ com.google.inject;version='[7.0.0,7.0.1)',\ org.eclipse.emf.common;version='[2.30.0,2.30.1)',\ org.eclipse.emf.ecore;version='[2.36.0,2.36.1)',\ @@ -60,7 +60,7 @@ Fragment-Host: org.openhab.core.model.thing org.threeten.extra;version='[1.8.0,1.8.1)',\ com.google.guava.failureaccess;version='[1.0.3,1.0.4)',\ com.sun.jna;version='[5.17.0,5.17.1)',\ - io.github.classgraph.classgraph;version='[4.8.176,4.8.177)',\ + io.github.classgraph.classgraph;version='[4.8.180,4.8.181)',\ 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.57,9.4.58)',\ @@ -80,13 +80,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.39.0,2.39.1)',\ - org.eclipse.xtend.lib.macro;version='[2.39.0,2.39.1)',\ - org.eclipse.xtext;version='[2.39.0,2.39.1)',\ - org.eclipse.xtext.common.types;version='[2.39.0,2.39.1)',\ - org.eclipse.xtext.util;version='[2.39.0,2.39.1)',\ - org.eclipse.xtext.xbase;version='[2.39.0,2.39.1)',\ - org.eclipse.xtext.xbase.lib;version='[2.39.0,2.39.1)',\ + org.eclipse.xtend.lib;version='[2.40.0,2.40.1)',\ + org.eclipse.xtend.lib.macro;version='[2.40.0,2.40.1)',\ + org.eclipse.xtext;version='[2.40.0,2.40.1)',\ + org.eclipse.xtext.common.types;version='[2.40.0,2.40.1)',\ + org.eclipse.xtext.util;version='[2.40.0,2.40.1)',\ + org.eclipse.xtext.xbase;version='[2.40.0,2.40.1)',\ + org.eclipse.xtext.xbase.lib;version='[2.40.0,2.40.1)',\ org.objectweb.asm;version='[9.8.0,9.8.1)',\ org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ diff --git a/itests/org.openhab.core.storage.json.tests/itest.bndrun b/itests/org.openhab.core.storage.json.tests/itest.bndrun index f35510625..b6a4e4248 100644 --- a/itests/org.openhab.core.storage.json.tests/itest.bndrun +++ b/itests/org.openhab.core.storage.json.tests/itest.bndrun @@ -32,7 +32,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.11.0,2.11.1)',\ + com.google.gson;version='[2.13.1,2.13.2)',\ junit-jupiter-api;version='[5.11.4,5.11.5)',\ junit-jupiter-engine;version='[5.11.4,5.11.5)',\ junit-platform-commons;version='[1.11.4,1.11.5)',\ diff --git a/itests/org.openhab.core.tests/itest.bndrun b/itests/org.openhab.core.tests/itest.bndrun index ed47166c5..8978495d3 100644 --- a/itests/org.openhab.core.tests/itest.bndrun +++ b/itests/org.openhab.core.tests/itest.bndrun @@ -36,7 +36,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.11.0,2.11.1)',\ + com.google.gson;version='[2.13.1,2.13.2)',\ junit-jupiter-api;version='[5.11.4,5.11.5)',\ junit-jupiter-engine;version='[5.11.4,5.11.5)',\ junit-platform-commons;version='[1.11.4,1.11.5)',\ diff --git a/itests/org.openhab.core.thing.tests/itest.bndrun b/itests/org.openhab.core.thing.tests/itest.bndrun index bd5c3a90b..72b40c59b 100644 --- a/itests/org.openhab.core.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.thing.tests/itest.bndrun @@ -41,7 +41,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.11.0,2.11.1)',\ + com.google.gson;version='[2.13.1,2.13.2)',\ junit-jupiter-api;version='[5.11.4,5.11.5)',\ junit-jupiter-engine;version='[5.11.4,5.11.5)',\ junit-platform-commons;version='[1.11.4,1.11.5)',\ diff --git a/itests/org.openhab.core.voice.tests/itest.bndrun b/itests/org.openhab.core.voice.tests/itest.bndrun index 807030254..5389b1efd 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.11.0,2.11.1)',\ + com.google.gson;version='[2.13.1,2.13.2)',\ junit-jupiter-api;version='[5.11.4,5.11.5)',\ junit-jupiter-engine;version='[5.11.4,5.11.5)',\ junit-jupiter-params;version='[5.11.4,5.11.5)',\ diff --git a/pom.xml b/pom.xml index 73f6782f0..d50ee8ac6 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ 4.4.8 0.17.0 2.0.16 - 2.39.0 + 2.40.0 2.44.3 4.25 @@ -418,7 +418,7 @@ Import-Package: \\ - org.eclipse.xtend + org.eclipse.xtext xtend-maven-plugin ${xtext.version} diff --git a/tools/i18n-plugin/pom.xml b/tools/i18n-plugin/pom.xml index f1da15e5a..f8e786e27 100644 --- a/tools/i18n-plugin/pom.xml +++ b/tools/i18n-plugin/pom.xml @@ -71,7 +71,7 @@ com.google.code.gson gson - 2.11.0 + 2.13.1 org.openhab.core.bom diff --git a/tools/upgradetool/pom.xml b/tools/upgradetool/pom.xml index d4440d4bb..7e133a25d 100644 --- a/tools/upgradetool/pom.xml +++ b/tools/upgradetool/pom.xml @@ -96,7 +96,7 @@ com.google.code.gson gson - 2.11.0 + 2.13.1