diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml index d04315cbe..59f25d5ba 100644 --- a/bom/runtime/pom.xml +++ b/bom/runtime/pom.xml @@ -794,7 +794,7 @@ com.google.guava guava - 33.1.0-jre + 33.2.0-jre compile diff --git a/features/karaf/openhab-core/src/main/feature/feature.xml b/features/karaf/openhab-core/src/main/feature/feature.xml index 2305b15a2..14dfd1e1d 100644 --- a/features/karaf/openhab-core/src/main/feature/feature.xml +++ b/features/karaf/openhab-core/src/main/feature/feature.xml @@ -404,7 +404,7 @@ openhab.tp;filter:="(&(feature=xtext-ide)(version>=2.35.0)(!(version>=2.36.0)))" openhab.tp-xtext-ide - openhab.tp;filter:="(&(feature=lsp4j)(version>=0.22.0)(!(version>=0.23.0)))" + openhab.tp;filter:="(&(feature=lsp4j)(version>=0.23.1)(!(version>=0.24.0)))" openhab.tp-lsp4j openhab-core-model-item-ide diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml index f1d86be52..f0cb668fb 100644 --- a/features/karaf/openhab-tp/src/main/feature/feature.xml +++ b/features/karaf/openhab-tp/src/main/feature/feature.xml @@ -205,9 +205,9 @@ - openhab.tp;feature=lsp4j;version=0.22.0 - mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.22.0 - mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.22.0 + openhab.tp;feature=lsp4j;version=0.23.1 + mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.23.1 + mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.23.1 openhab.tp-gson openhab.tp-xtext @@ -247,7 +247,7 @@ 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.1.0-jre + mvn:com.google.guava/guava/33.2.0-jre mvn:com.google.inject/guice/7.0.0 mvn:jakarta.inject/jakarta.inject-api/2.0.1 diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun index 4e2efb0cb..8d949e031 100644 --- a/itests/org.openhab.core.model.item.tests/itest.bndrun +++ b/itests/org.openhab.core.model.item.tests/itest.bndrun @@ -85,7 +85,7 @@ Fragment-Host: org.openhab.core.model.item com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.17.1,2.17.2)',\ stax2-api;version='[4.2.1,4.2.2)',\ org.openhab.core.addon;version='[4.2.0,4.2.1)',\ - com.google.guava;version='[33.1.0,33.1.1)',\ + com.google.guava;version='[33.2.0,33.2.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)',\ diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun index eddced2a8..0489cdcbf 100644 --- a/itests/org.openhab.core.model.rule.tests/itest.bndrun +++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun @@ -89,7 +89,7 @@ Fragment-Host: org.openhab.core.model.rule.runtime com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.17.1,2.17.2)',\ stax2-api;version='[4.2.1,4.2.2)',\ org.openhab.core.addon;version='[4.2.0,4.2.1)',\ - com.google.guava;version='[33.1.0,33.1.1)',\ + com.google.guava;version='[33.2.0,33.2.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)',\ diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun index b9c4542f1..7dbfc24ce 100644 --- a/itests/org.openhab.core.model.script.tests/itest.bndrun +++ b/itests/org.openhab.core.model.script.tests/itest.bndrun @@ -93,7 +93,7 @@ Fragment-Host: org.openhab.core.model.script com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.17.1,2.17.2)',\ stax2-api;version='[4.2.1,4.2.2)',\ org.openhab.core.addon;version='[4.2.0,4.2.1)',\ - com.google.guava;version='[33.1.0,33.1.1)',\ + com.google.guava;version='[33.2.0,33.2.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)',\ diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun index b4e4dd488..ed7fbd526 100644 --- a/itests/org.openhab.core.model.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun @@ -94,7 +94,7 @@ Fragment-Host: org.openhab.core.model.thing com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.17.1,2.17.2)',\ stax2-api;version='[4.2.1,4.2.2)',\ org.openhab.core.addon;version='[4.2.0,4.2.1)',\ - com.google.guava;version='[33.1.0,33.1.1)',\ + com.google.guava;version='[33.2.0,33.2.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)',\ diff --git a/pom.xml b/pom.xml index f002fcf30..af257faea 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ 4.4.6 0.16.0 2.0.12 - 2.35.0.M1 + 2.35.0 2.43.0 4.25