Skip to content

Commit c1a21f3

Browse files
holgerfriedrichholgerfriedrich
authored
Upgrade Karaf to 4.4.10 (#20224)
* Revert "Downgrade karaf-maven-plugin to 4.4.8" This reverts commit c6c4eb0. * Add bytebuddy to bootdelegation * Upgrade Karaf to 4.4.10, this includes upgrades for the following libraries: pax-logging from 2.3.1 to 2.3.2 * Temporarily disable broken itests * [mqtt.ruuvigateway] Add strings for itest * Upgrade logback Also-by: Wouter Born <github@maindrain.net> Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
1 parent 1df8f04 commit c1a21f3

File tree

24 files changed

+85
-78
lines changed

24 files changed

+85
-78
lines changed

‎bundles/org.openhab.binding.homeassistant/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
<plugin>
177177
<groupId>org.apache.karaf.tooling</groupId>
178178
<artifactId>karaf-maven-plugin</artifactId>
179-
<version>${karaf.maven.plugin.version}</version>
179+
<version>${karaf.version}</version>
180180
<executions>
181181
<execution>
182182
<id>karaf-feature-verification</id>

‎bundles/org.openhab.binding.homie/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<plugin>
2929
<groupId>org.apache.karaf.tooling</groupId>
3030
<artifactId>karaf-maven-plugin</artifactId>
31-
<version>${karaf.maven.plugin.version}</version>
31+
<version>${karaf.version}</version>
3232
<executions>
3333
<execution>
3434
<id>karaf-feature-verification</id>

‎bundles/org.openhab.binding.mqtt.ruuvigateway/src/main/resources/OH-INF/i18n/mqtt.properties‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,13 @@ channel-type.mqtt.ruuvitag_ts.label = Timestamp
5151
channel-type.mqtt.ruuvitag_ts.description = Timestamp when the message from the Bluetooth sensor was received by the Gateway (ts)
5252
channel-type.mqtt.ruuvitag_ts.state.pattern = %1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS
5353
channel-type.mqtt.ruuvitag_txPower.label = TX Power
54+
55+
# thing status messages
56+
57+
online.waiting-initial-data = Waiting for initial data
58+
offline.configuration-error.missing-topic = MQTT topic is not configured
59+
offline.communication-error.mqtt-subscription-failed = Could not subscribe to MQTT topic
60+
offline.communication-error.mqtt-subscription-failed-details = Could not subscribe to MQTT topic: {0} {1}
61+
offline.communication-error.parse-error = Received data could not be parsed: {0}
62+
offline.communication-error.parse-error-no-fields = Received data could not be parsed - no valid fields found
63+
offline.communication-error.timeout = No valid data received for some time

‎bundles/org.openhab.binding.salus/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>ch.qos.logback</groupId>
4646
<artifactId>logback-classic</artifactId>
47-
<version>1.5.25</version>
47+
<version>1.5.27</version>
4848
<scope>test</scope>
4949
</dependency>
5050
<dependency>

‎bundles/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@
597597
<plugin>
598598
<groupId>org.apache.karaf.tooling</groupId>
599599
<artifactId>karaf-maven-plugin</artifactId>
600-
<version>${karaf.maven.plugin.version}</version>
600+
<version>${karaf.version}</version>
601601
<extensions>true</extensions>
602602
<configuration>
603603
<startLevel>80</startLevel>

‎features/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<plugin>
6464
<groupId>org.apache.karaf.tooling</groupId>
6565
<artifactId>karaf-maven-plugin</artifactId>
66-
<version>${karaf.maven.plugin.version}</version>
66+
<version>${karaf.version}</version>
6767
<extensions>true</extensions>
6868
<configuration>
6969
<startLevel>80</startLevel>

‎itests/itest-common.bndrun‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Export-Package:
4343

4444
-runproperties: \
4545
org.ops4j.pax.logging.DefaultServiceLog.level=WARN,\
46-
org.osgi.framework.bootdelegation="jdk.internal.access,jdk.internal.module"
46+
org.osgi.framework.bootdelegation="jdk.internal.access,jdk.internal.module,org.mockito.internal.creation.bytebuddy.inject"
4747

4848
-runvm.java9plus: \
4949
--add-opens=java.base/java.io=ALL-UNNAMED,\

‎itests/org.openhab.automation.groovyscripting.tests/itest.bndrun‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ Fragment-Host: org.openhab.automation.groovyscripting
4646
junit-platform-engine;version='[1.14.2,1.14.3)',\
4747
junit-platform-launcher;version='[1.14.2,1.14.3)',\
4848
org.opentest4j;version='[1.3.0,1.3.1)',\
49-
ch.qos.logback.classic;version='[1.5.25,1.5.26)',\
50-
ch.qos.logback.core;version='[1.5.25,1.5.26)',\
49+
ch.qos.logback.classic;version='[1.5.27,1.5.28)',\
50+
ch.qos.logback.core;version='[1.5.27,1.5.28)',\
5151
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
5252
org.threeten.extra;version='[1.8.0,1.8.1)',\
5353
com.sun.jna;version='[5.18.1,5.18.2)',\
@@ -64,7 +64,7 @@ Fragment-Host: org.openhab.automation.groovyscripting
6464
org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
6565
org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
6666
org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
67-
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
67+
org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)',\
6868
org.openhab.automation.groovyscripting;version='[5.2.0,5.2.1)',\
6969
org.openhab.automation.groovyscripting.tests;version='[5.2.0,5.2.1)',\
7070
org.openhab.core;version='[5.2.0,5.2.1)',\
@@ -78,7 +78,7 @@ Fragment-Host: org.openhab.automation.groovyscripting
7878
org.openhab.core.thing;version='[5.2.0,5.2.1)',\
7979
org.openhab.core.transform;version='[5.2.0,5.2.1)',\
8080
stax2-api;version='[4.2.2,4.2.3)',\
81-
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
81+
biz.aQute.tester.junit-platform;version='[7.2.1,7.2.2)',\
8282
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
8383
jakarta.annotation-api;version='[2.1.1,2.1.2)',\
8484
org.openhab.core.semantics;version='[5.2.0,5.2.1)',\

‎itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn
4444
junit-platform-engine;version='[1.14.2,1.14.3)',\
4545
junit-platform-launcher;version='[1.14.2,1.14.3)',\
4646
org.opentest4j;version='[1.3.0,1.3.1)',\
47-
ch.qos.logback.classic;version='[1.5.25,1.5.26)',\
48-
ch.qos.logback.core;version='[1.5.25,1.5.26)',\
47+
ch.qos.logback.classic;version='[1.5.27,1.5.28)',\
48+
ch.qos.logback.core;version='[1.5.27,1.5.28)',\
4949
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
5050
org.threeten.extra;version='[1.8.0,1.8.1)',\
5151
com.sun.jna;version='[5.18.1,5.18.2)',\
@@ -62,7 +62,7 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn
6262
org.objectweb.asm.tree;version='[9.9.0,9.9.1)',\
6363
org.objectweb.asm.tree.analysis;version='[9.9.0,9.9.1)',\
6464
org.objectweb.asm.util;version='[9.9.0,9.9.1)',\
65-
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
65+
org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)',\
6666
org.openhab.automation.jsscriptingnashorn;version='[5.2.0,5.2.1)',\
6767
org.openhab.automation.jsscriptingnashorn.tests;version='[5.2.0,5.2.1)',\
6868
org.openhab.core;version='[5.2.0,5.2.1)',\
@@ -76,7 +76,7 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn
7676
org.openhab.core.thing;version='[5.2.0,5.2.1)',\
7777
org.openhab.core.transform;version='[5.2.0,5.2.1)',\
7878
stax2-api;version='[4.2.2,4.2.3)',\
79-
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
79+
biz.aQute.tester.junit-platform;version='[7.2.1,7.2.2)',\
8080
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
8181
jakarta.annotation-api;version='[2.1.1,2.1.2)',\
8282
org.openhab.core.semantics;version='[5.2.0,5.2.1)',\

‎itests/org.openhab.binding.avmfritz.tests/itest.bndrun‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ Fragment-Host: org.openhab.binding.avmfritz
4545
junit-platform-engine;version='[1.14.2,1.14.3)',\
4646
junit-platform-launcher;version='[1.14.2,1.14.3)',\
4747
org.opentest4j;version='[1.3.0,1.3.1)',\
48-
ch.qos.logback.classic;version='[1.5.25,1.5.26)',\
49-
ch.qos.logback.core;version='[1.5.25,1.5.26)',\
48+
ch.qos.logback.classic;version='[1.5.27,1.5.28)',\
49+
ch.qos.logback.core;version='[1.5.27,1.5.28)',\
5050
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
5151
com.sun.jna;version='[5.18.1,5.18.2)',\
5252
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
@@ -72,7 +72,7 @@ Fragment-Host: org.openhab.binding.avmfritz
7272
org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
7373
org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
7474
org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
75-
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
75+
org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)',\
7676
org.ops4j.pax.web.pax-web-api;version='[8.0.34,8.0.35)',\
7777
org.ops4j.pax.web.pax-web-jetty;version='[8.0.34,8.0.35)',\
7878
org.ops4j.pax.web.pax-web-runtime;version='[8.0.34,8.0.35)',\
@@ -90,7 +90,7 @@ Fragment-Host: org.openhab.binding.avmfritz
9090
org.openhab.core.test;version='[5.2.0,5.2.1)',\
9191
org.openhab.core.thing;version='[5.2.0,5.2.1)',\
9292
org.openhab.core.transform;version='[5.2.0,5.2.1)',\
93-
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
93+
biz.aQute.tester.junit-platform;version='[7.2.1,7.2.2)',\
9494
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
9595
org.jupnp;version='[3.0.4,3.0.5)',\
9696
jakarta.annotation-api;version='[2.1.1,2.1.2)',\

0 commit comments

Comments
 (0)