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/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@
<dependency>
<groupId>com.hivemq</groupId>
<artifactId>hivemq-mqtt-client</artifactId>
<version>1.3.7</version>
<version>1.3.9</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Expand Down
4 changes: 2 additions & 2 deletions bom/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -527,13 +527,13 @@
<dependency>
<groupId>com.hivemq</groupId>
<artifactId>hivemq-mqtt-client</artifactId>
<version>1.3.7</version>
<version>1.3.9</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.openhab.osgiify</groupId>
<artifactId>com.google.dagger</artifactId>
<version>2.27</version>
<version>2.42</version>
<scope>compile</scope>
</dependency>

Expand Down
38 changes: 19 additions & 19 deletions features/karaf/openhab-tp/src/main/feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@
</feature>

<feature name="openhab.tp-hivemqclient" description="MQTT Client" version="${project.version}">
<capability>openhab.tp;feature=hivemqclient;version=1.3.7</capability>
<capability>openhab.tp;feature=hivemqclient;version=1.3.9</capability>
<feature dependency="true">openhab.tp-netty</feature>
<bundle dependency="true">mvn:org.jctools/jctools-core/2.1.2</bundle>
<bundle dependency="true">mvn:io.reactivex.rxjava2/rxjava/2.2.21</bundle>
<bundle dependency="true">mvn:org.reactivestreams/reactive-streams/1.0.4</bundle>
<bundle dependency="true">mvn:org.openhab.osgiify/com.google.dagger/2.27</bundle>
<bundle dependency="true">mvn:org.openhab.osgiify/com.google.dagger/2.42</bundle>
<bundle dependency="true">mvn:jakarta.inject/jakarta.inject-api/1.0.5</bundle>
<bundle>mvn:com.hivemq/hivemq-mqtt-client/1.3.7</bundle>
<bundle>mvn:com.hivemq/hivemq-mqtt-client/1.3.9</bundle>
</feature>

<feature name="openhab.tp-httpclient" version="${project.version}">
Expand Down Expand Up @@ -143,22 +143,22 @@
</feature>

<feature name="openhab.tp-netty" description="Netty bundles" version="${project.version}">
<capability>openhab.tp;feature=netty;version=4.1.122.Final</capability>
<bundle dependency="true">mvn:io.netty/netty-buffer/4.1.122.Final</bundle>
<bundle dependency="true">mvn:io.netty/netty-common/4.1.122.Final</bundle>
<bundle dependency="true">mvn:io.netty/netty-codec/4.1.122.Final</bundle>
<bundle dependency="true">mvn:io.netty/netty-codec-http/4.1.122.Final</bundle>
<bundle dependency="true">mvn:io.netty/netty-codec-http2/4.1.122.Final</bundle>
<bundle dependency="true">mvn:io.netty/netty-codec-mqtt/4.1.122.Final</bundle>
<bundle dependency="true">mvn:io.netty/netty-codec-socks/4.1.122.Final</bundle>
<bundle dependency="true">mvn:io.netty/netty-handler/4.1.122.Final</bundle>
<bundle dependency="true">mvn:io.netty/netty-handler-proxy/4.1.122.Final</bundle>
<bundle dependency="true">mvn:io.netty/netty-resolver/4.1.122.Final</bundle>
<bundle dependency="true">mvn:io.netty/netty-transport/4.1.122.Final</bundle>
<bundle dependency="true">mvn:io.netty/netty-transport-native-epoll/4.1.122.Final</bundle>
<bundle dependency="true">mvn:io.netty/netty-transport-native-kqueue/4.1.122.Final</bundle>
<bundle dependency="true">mvn:io.netty/netty-transport-native-unix-common/4.1.122.Final</bundle>
<bundle dependency="true">mvn:io.netty/netty-transport-classes-epoll/4.1.122.Final</bundle>
<capability>openhab.tp;feature=netty;version=4.1.126.Final</capability>
<bundle dependency="true">mvn:io.netty/netty-buffer/4.1.126.Final</bundle>
<bundle dependency="true">mvn:io.netty/netty-common/4.1.126.Final</bundle>
<bundle dependency="true">mvn:io.netty/netty-codec/4.1.126.Final</bundle>
<bundle dependency="true">mvn:io.netty/netty-codec-http/4.1.126.Final</bundle>
<bundle dependency="true">mvn:io.netty/netty-codec-http2/4.1.126.Final</bundle>
<bundle dependency="true">mvn:io.netty/netty-codec-mqtt/4.1.126.Final</bundle>
<bundle dependency="true">mvn:io.netty/netty-codec-socks/4.1.126.Final</bundle>
<bundle dependency="true">mvn:io.netty/netty-handler/4.1.126.Final</bundle>
<bundle dependency="true">mvn:io.netty/netty-handler-proxy/4.1.126.Final</bundle>
<bundle dependency="true">mvn:io.netty/netty-resolver/4.1.126.Final</bundle>
<bundle dependency="true">mvn:io.netty/netty-transport/4.1.126.Final</bundle>
<bundle dependency="true">mvn:io.netty/netty-transport-native-epoll/4.1.126.Final</bundle>
<bundle dependency="true">mvn:io.netty/netty-transport-native-kqueue/4.1.126.Final</bundle>
<bundle dependency="true">mvn:io.netty/netty-transport-native-unix-common/4.1.126.Final</bundle>
<bundle dependency="true">mvn:io.netty/netty-transport-classes-epoll/4.1.126.Final</bundle>
<bundle dependency="true">mvn:io.netty/netty-tcnative-classes/2.0.70.Final</bundle>
</feature>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,5 @@ Fragment-Host: org.openhab.core.auth.oauth2client
org.openhab.core.io.net;version='[5.1.0,5.1.1)',\
org.openhab.core.test;version='[5.1.0,5.1.1)',\
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)'
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Fragment-Host: org.openhab.core.automation
org.openhab.core.transform;version='[5.1.0,5.1.1)',\
stax2-api;version='[4.2.2,4.2.3)',\
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
org.openhab.core.semantics;version='[5.1.0,5.1.1)',\
de.focus_shift.jollyday-core;version='[1.5.4,1.5.5)',\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Fragment-Host: org.openhab.core.automation
org.openhab.core.transform;version='[5.1.0,5.1.1)',\
stax2-api;version='[4.2.2,4.2.3)',\
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
org.openhab.core.semantics;version='[5.1.0,5.1.1)',\
de.focus_shift.jollyday-core;version='[1.5.4,1.5.5)',\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Fragment-Host: org.openhab.core.automation.module.script
org.openhab.core.transform;version='[5.1.0,5.1.1)',\
stax2-api;version='[4.2.2,4.2.3)',\
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
org.openhab.core.semantics;version='[5.1.0,5.1.1)',\
de.focus_shift.jollyday-core;version='[1.5.4,1.5.5)',\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Fragment-Host: org.openhab.core.automation
org.openhab.core.transform;version='[5.1.0,5.1.1)',\
stax2-api;version='[4.2.2,4.2.3)',\
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
org.openhab.core.semantics;version='[5.1.0,5.1.1)',\
de.focus_shift.jollyday-core;version='[1.5.4,1.5.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 @@ -73,7 +73,7 @@ Fragment-Host: org.openhab.core.automation
org.openhab.core.transform;version='[5.1.0,5.1.1)',\
stax2-api;version='[4.2.2,4.2.3)',\
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
org.openhab.core.semantics;version='[5.1.0,5.1.1)',\
de.focus_shift.jollyday-core;version='[1.5.4,1.5.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 @@ -66,5 +66,5 @@ Fragment-Host: org.openhab.core.config.core
org.openhab.core.config.core.tests;version='[5.1.0,5.1.1)',\
org.openhab.core.test;version='[5.1.0,5.1.1)',\
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)'
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,6 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
org.openhab.core.thing;version='[5.1.0,5.1.1)',\
org.openhab.core.transform;version='[5.1.0,5.1.1)',\
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
org.openhab.core.semantics;version='[5.1.0,5.1.1)'
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,6 @@ Fragment-Host: org.openhab.core.config.discovery
org.openhab.core.thing;version='[5.1.0,5.1.1)',\
org.openhab.core.transform;version='[5.1.0,5.1.1)',\
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
org.openhab.core.semantics;version='[5.1.0,5.1.1)'
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,5 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
org.openhab.core.thing;version='[5.1.0,5.1.1)',\
org.openhab.core.transform;version='[5.1.0,5.1.1)',\
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
org.openhab.core.semantics;version='[5.1.0,5.1.1)'
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,6 @@ Provide-Capability: \
org.openhab.core.thing;version='[5.1.0,5.1.1)',\
org.openhab.core.transform;version='[5.1.0,5.1.1)',\
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
org.openhab.core.semantics;version='[5.1.0,5.1.1)'
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,5 @@ Fragment-Host: org.openhab.core.config.dispatch
org.openhab.core.config.dispatch.tests;version='[5.1.0,5.1.1)',\
org.openhab.core.test;version='[5.1.0,5.1.1)',\
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)'
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 @@ -68,7 +68,7 @@ feature.openhab-config: \
org.openhab.core.test;version='[5.1.0,5.1.1)',\
stax2-api;version='[4.2.2,4.2.3)',\
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
de.focus_shift.jollyday-core;version='[1.5.4,1.5.5)',\
de.focus_shift.jollyday-jackson;version='[1.5.4,1.5.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 @@ -71,5 +71,5 @@ Fragment-Host: org.openhab.core.io.net
org.openhab.core.io.net.tests;version='[5.1.0,5.1.1)',\
org.openhab.core.test;version='[5.1.0,5.1.1)',\
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)'
3 changes: 2 additions & 1 deletion itests/org.openhab.core.io.rest.core.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,5 @@ Fragment-Host: org.openhab.core.io.rest.core
org.openhab.core.transform;version='[5.1.0,5.1.1)',\
stax2-api;version='[4.2.2,4.2.3)',\
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)'
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
org.osgi.service.cm;version='[1.6.1,1.6.2)'
3 changes: 2 additions & 1 deletion itests/org.openhab.core.model.item.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ 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)',\
Expand All @@ -128,4 +129,4 @@ Fragment-Host: org.openhab.core.model.item
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.openhab.core.model.persistence.runtime;version='[5.1.0,5.1.1)'
org.osgi.service.cm;version='[1.6.1,1.6.2)'
4 changes: 3 additions & 1 deletion itests/org.openhab.core.model.rule.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ 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)',\
Expand All @@ -130,4 +131,5 @@ Fragment-Host: org.openhab.core.model.rule.runtime
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.osgi.service.cm;version='[1.6.1,1.6.2)'
1 change: 1 addition & 0 deletions itests/org.openhab.core.model.script.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ 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)',\
Expand Down
3 changes: 2 additions & 1 deletion itests/org.openhab.core.model.thing.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -136,4 +136,5 @@ Fragment-Host: org.openhab.core.model.thing
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.osgi.service.cm;version='[1.6.1,1.6.2)'
2 changes: 1 addition & 1 deletion itests/org.openhab.core.storage.json.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@ Fragment-Host: org.openhab.core.storage.json
org.openhab.core.thing;version='[5.1.0,5.1.1)',\
org.openhab.core.transform;version='[5.1.0,5.1.1)',\
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
org.openhab.core.semantics;version='[5.1.0,5.1.1)'
2 changes: 1 addition & 1 deletion itests/org.openhab.core.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,5 @@ Fragment-Host: org.openhab.core
org.openhab.core.test;version='[5.1.0,5.1.1)',\
org.openhab.core.tests;version='[5.1.0,5.1.1)',\
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)'