Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bom/compile-model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
<dependency>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
<version>4.8.176</version>
<version>4.8.180</version>
<scope>compile</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion bom/compile/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.11.0</version>
<version>2.13.1</version>
<scope>compile</scope>
</dependency>

Expand Down
8 changes: 4 additions & 4 deletions bom/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.11.0</version>
<version>2.13.1</version>
<scope>compile</scope>
</dependency>

Expand Down Expand Up @@ -813,7 +813,7 @@
<dependency>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
<version>4.8.176</version>
<version>4.8.180</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -843,13 +843,13 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.xtend</groupId>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtend.lib</artifactId>
<version>${xtext.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.xtend</groupId>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtend.lib.macro</artifactId>
<version>${xtext.version}</version>
<scope>compile</scope>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.core.model.item.ide/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.xtend</groupId>
<groupId>org.eclipse.xtext</groupId>
<artifactId>xtend-maven-plugin</artifactId>
</plugin>
</plugins>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.core.model.item/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.xtend</groupId>
<groupId>org.eclipse.xtext</groupId>
<artifactId>xtend-maven-plugin</artifactId>
</plugin>
</plugins>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.core.model.persistence.ide/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.xtend</groupId>
<groupId>org.eclipse.xtext</groupId>
<artifactId>xtend-maven-plugin</artifactId>
</plugin>
</plugins>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.core.model.persistence/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.xtend</groupId>
<groupId>org.eclipse.xtext</groupId>
<artifactId>xtend-maven-plugin</artifactId>
</plugin>
</plugins>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.core.model.rule.ide/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.xtend</groupId>
<groupId>org.eclipse.xtext</groupId>
<artifactId>xtend-maven-plugin</artifactId>
</plugin>
</plugins>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.core.model.rule/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.xtend</groupId>
<groupId>org.eclipse.xtext</groupId>
<artifactId>xtend-maven-plugin</artifactId>
<configuration>
<useXbaseGenerated>false</useXbaseGenerated>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.core.model.script.ide/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.xtend</groupId>
<groupId>org.eclipse.xtext</groupId>
<artifactId>xtend-maven-plugin</artifactId>
</plugin>
</plugins>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.core.model.script/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.xtend</groupId>
<groupId>org.eclipse.xtext</groupId>
<artifactId>xtend-maven-plugin</artifactId>
<configuration>
<useXbaseGenerated>false</useXbaseGenerated>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.core.model.sitemap.ide/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.xtend</groupId>
<groupId>org.eclipse.xtext</groupId>
<artifactId>xtend-maven-plugin</artifactId>
</plugin>
</plugins>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.core.model.sitemap/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.xtend</groupId>
<groupId>org.eclipse.xtext</groupId>
<artifactId>xtend-maven-plugin</artifactId>
</plugin>
</plugins>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.core.model.thing.ide/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.xtend</groupId>
<groupId>org.eclipse.xtext</groupId>
<artifactId>xtend-maven-plugin</artifactId>
</plugin>
</plugins>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.core.model.thing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.xtend</groupId>
<groupId>org.eclipse.xtext</groupId>
<artifactId>xtend-maven-plugin</artifactId>
<configuration>
<useXbaseGenerated>false</useXbaseGenerated>
Expand Down
4 changes: 2 additions & 2 deletions features/karaf/openhab-core/src/main/feature/feature.xml
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.39.0)(!(version&gt;=2.40.0)))"</requirement>
<requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.40.0)(!(version&gt;=2.41.0)))"</requirement>
<feature dependency="true">openhab.tp-xtext</feature>

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

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

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

<requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.24.0)(!(version&gt;=0.24.1)))"</requirement>
Expand Down
11 changes: 6 additions & 5 deletions features/karaf/openhab-tp/src/main/feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,9 @@
</feature>

<feature name="openhab.tp-gson" description="Gson" version="${project.version}">
<capability>openhab.tp;feature=gson;version=2.11.0</capability>
<bundle>mvn:com.google.code.gson/gson/2.11.0</bundle>
<capability>openhab.tp;feature=gson;version=2.13.1</capability>
<bundle>mvn:com.google.code.gson/gson/2.13.1</bundle>
<bundle>mvn:com.google.errorprone/error_prone_annotations/2.38.0</bundle>
</feature>

<feature name="openhab.tp-hivemqclient" description="MQTT Client" version="${project.version}">
Expand Down Expand Up @@ -242,16 +243,16 @@
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.lib/${xtext.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.smap/${xtext.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.util/${xtext.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib/${xtext.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/${xtext.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtend.lib/${xtext.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtend.lib.macro/${xtext.version}</bundle>

<bundle dependency="true">mvn:com.google.guava/failureaccess/1.0.3</bundle>
<bundle dependency="true">mvn:com.google.guava/guava/33.4.8-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.176</bundle>
<bundle dependency="true">mvn:io.github.classgraph/classgraph/4.8.180</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.19.0</bundle>
Expand Down
2 changes: 1 addition & 1 deletion itests/org.openhab.core.addon.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
2 changes: 1 addition & 1 deletion itests/org.openhab.core.automation.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
2 changes: 1 addition & 1 deletion itests/org.openhab.core.config.core.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
2 changes: 1 addition & 1 deletion itests/org.openhab.core.ephemeris.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
2 changes: 1 addition & 1 deletion itests/org.openhab.core.io.net.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
2 changes: 1 addition & 1 deletion itests/org.openhab.core.io.rest.core.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
Loading