Skip to content

Commit 8084755

Browse files
Upgrade Karaf to 4.4.10 (#5353)
Upgrade Karaf from 4.4.9 to 4.4.10. This includes upgrades for the following libraries: * pax-logging from 2.3.1 to 2.3.2 * xbean from 4.28 to 4.29 Reverts downgrade of karaf-maven-plugin to 4.4.8. Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
1 parent e6ca14c commit 8084755

30 files changed

Lines changed: 82 additions & 83 deletions

File tree

bom/runtime/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<jackson.annotations.version>2.21</jackson.annotations.version>
2323
<jackson.version>2.21.0</jackson.version>
2424
<jetty.version>9.4.58.v20250814</jetty.version>
25-
<pax.logging.version>2.3.0</pax.logging.version>
25+
<pax.logging.version>2.3.2</pax.logging.version>
2626
<pax.web.version>8.0.34</pax.web.version>
2727
<swagger.version>2.2.41</swagger.version>
2828
</properties>
@@ -786,13 +786,13 @@
786786
<dependency>
787787
<groupId>org.apache.xbean</groupId>
788788
<artifactId>xbean-bundleutils</artifactId>
789-
<version>4.28</version>
789+
<version>4.29</version>
790790
<scope>compile</scope>
791791
</dependency>
792792
<dependency>
793793
<groupId>org.apache.xbean</groupId>
794794
<artifactId>xbean-finder</artifactId>
795-
<version>4.28</version>
795+
<version>4.29</version>
796796
<scope>compile</scope>
797797
</dependency>
798798

bom/test/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<dependency>
5656
<groupId>ch.qos.logback</groupId>
5757
<artifactId>logback-classic</artifactId>
58-
<version>1.5.25</version>
58+
<version>1.5.27</version>
5959
</dependency>
6060
<dependency>
6161
<groupId>com.jayway.jsonpath</groupId>

bundles/org.openhab.core.test/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
<dependency>
3636
<groupId>ch.qos.logback</groupId>
3737
<artifactId>logback-classic</artifactId>
38-
<version>1.5.25</version>
38+
<version>1.5.27</version>
3939
<scope>compile</scope>
4040
</dependency>
4141
<dependency>
4242
<groupId>ch.qos.logback</groupId>
4343
<artifactId>logback-core</artifactId>
44-
<version>1.5.25</version>
44+
<version>1.5.27</version>
4545
<scope>compile</scope>
4646
</dependency>
4747
<dependency>

bundles/org.openhab.core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<dependency>
1919
<groupId>ch.qos.logback</groupId>
2020
<artifactId>logback-classic</artifactId>
21-
<version>1.5.25</version>
21+
<version>1.5.27</version>
2222
<scope>test</scope>
2323
</dependency>
2424
</dependencies>

features/karaf/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@
4848
<plugin>
4949
<groupId>org.apache.karaf.tooling</groupId>
5050
<artifactId>karaf-maven-plugin</artifactId>
51-
<!-- TODO replace fixed version 4.4.8 by ${karaf.tooling.version} one karaf#2219 is contained in future release -->
52-
<version>4.4.8</version>
51+
<version>${karaf.tooling.version}</version>
5352
<extensions>true</extensions>
5453
<configuration>
5554
<startLevel>80</startLevel>

itests/org.openhab.core.addon.tests/itest.bndrun

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ Fragment-Host: org.openhab.core.addon
4343
junit-platform-engine;version='[1.14.2,1.14.3)',\
4444
junit-platform-launcher;version='[1.14.2,1.14.3)',\
4545
org.opentest4j;version='[1.3.0,1.3.1)',\
46-
ch.qos.logback.classic;version='[1.5.25,1.5.26)',\
47-
ch.qos.logback.core;version='[1.5.25,1.5.26)',\
46+
ch.qos.logback.classic;version='[1.5.27,1.5.28)',\
47+
ch.qos.logback.core;version='[1.5.27,1.5.28)',\
4848
com.sun.jna;version='[5.18.1,5.18.2)',\
4949
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
5050
org.eclipse.jetty.http;version='[9.4.58,9.4.59)',\
@@ -65,4 +65,4 @@ Fragment-Host: org.openhab.core.addon
6565
org.openhab.core.config.core;version='[5.2.0,5.2.1)',\
6666
org.openhab.core.test;version='[5.2.0,5.2.1)',\
6767
biz.aQute.tester.junit-platform;version='[7.2.1,7.2.2)',\
68-
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)'
68+
org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)'

itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ Fragment-Host: org.openhab.core.auth.oauth2client
4242
junit-platform-engine;version='[1.14.2,1.14.3)',\
4343
junit-platform-launcher;version='[1.14.2,1.14.3)',\
4444
org.opentest4j;version='[1.3.0,1.3.1)',\
45-
ch.qos.logback.classic;version='[1.5.25,1.5.26)',\
46-
ch.qos.logback.core;version='[1.5.25,1.5.26)',\
45+
ch.qos.logback.classic;version='[1.5.27,1.5.28)',\
46+
ch.qos.logback.core;version='[1.5.27,1.5.28)',\
4747
xstream;version='[1.4.21,1.4.22)',\
4848
com.sun.jna;version='[5.18.1,5.18.2)',\
4949
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
@@ -77,4 +77,4 @@ Fragment-Host: org.openhab.core.auth.oauth2client
7777
org.openhab.core.test;version='[5.2.0,5.2.1)',\
7878
biz.aQute.tester.junit-platform;version='[7.2.1,7.2.2)',\
7979
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
80-
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)'
80+
org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)'

itests/org.openhab.core.automation.integration.tests/itest.bndrun

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ Fragment-Host: org.openhab.core.automation
4343
junit-platform-engine;version='[1.14.2,1.14.3)',\
4444
junit-platform-launcher;version='[1.14.2,1.14.3)',\
4545
org.opentest4j;version='[1.3.0,1.3.1)',\
46-
ch.qos.logback.classic;version='[1.5.25,1.5.26)',\
47-
ch.qos.logback.core;version='[1.5.25,1.5.26)',\
46+
ch.qos.logback.classic;version='[1.5.27,1.5.28)',\
47+
ch.qos.logback.core;version='[1.5.27,1.5.28)',\
4848
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
4949
org.threeten.extra;version='[1.8.0,1.8.1)',\
5050
com.sun.jna;version='[5.18.1,5.18.2)',\
@@ -74,7 +74,7 @@ Fragment-Host: org.openhab.core.automation
7474
stax2-api;version='[4.2.2,4.2.3)',\
7575
biz.aQute.tester.junit-platform;version='[7.2.1,7.2.2)',\
7676
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
77-
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
77+
org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)',\
7878
org.openhab.core.semantics;version='[5.2.0,5.2.1)',\
7979
de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\
8080
de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\

itests/org.openhab.core.automation.module.core.tests/itest.bndrun

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ Fragment-Host: org.openhab.core.automation
4343
junit-platform-engine;version='[1.14.2,1.14.3)',\
4444
junit-platform-launcher;version='[1.14.2,1.14.3)',\
4545
org.opentest4j;version='[1.3.0,1.3.1)',\
46-
ch.qos.logback.classic;version='[1.5.25,1.5.26)',\
47-
ch.qos.logback.core;version='[1.5.25,1.5.26)',\
46+
ch.qos.logback.classic;version='[1.5.27,1.5.28)',\
47+
ch.qos.logback.core;version='[1.5.27,1.5.28)',\
4848
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
4949
org.threeten.extra;version='[1.8.0,1.8.1)',\
5050
com.sun.jna;version='[5.18.1,5.18.2)',\
@@ -74,7 +74,7 @@ Fragment-Host: org.openhab.core.automation
7474
stax2-api;version='[4.2.2,4.2.3)',\
7575
biz.aQute.tester.junit-platform;version='[7.2.1,7.2.2)',\
7676
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
77-
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
77+
org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)',\
7878
org.openhab.core.semantics;version='[5.2.0,5.2.1)',\
7979
de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\
8080
de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\

itests/org.openhab.core.automation.module.script.tests/itest.bndrun

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ Fragment-Host: org.openhab.core.automation.module.script
3939
junit-platform-engine;version='[1.14.2,1.14.3)',\
4040
junit-platform-launcher;version='[1.14.2,1.14.3)',\
4141
org.opentest4j;version='[1.3.0,1.3.1)',\
42-
ch.qos.logback.classic;version='[1.5.25,1.5.26)',\
43-
ch.qos.logback.core;version='[1.5.25,1.5.26)',\
42+
ch.qos.logback.classic;version='[1.5.27,1.5.28)',\
43+
ch.qos.logback.core;version='[1.5.27,1.5.28)',\
4444
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
4545
org.threeten.extra;version='[1.8.0,1.8.1)',\
4646
com.sun.jna;version='[5.18.1,5.18.2)',\
@@ -71,7 +71,7 @@ Fragment-Host: org.openhab.core.automation.module.script
7171
stax2-api;version='[4.2.2,4.2.3)',\
7272
biz.aQute.tester.junit-platform;version='[7.2.1,7.2.2)',\
7373
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
74-
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
74+
org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)',\
7575
org.openhab.core.semantics;version='[5.2.0,5.2.1)',\
7676
de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\
7777
de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\

0 commit comments

Comments
 (0)