Skip to content

Commit 4da70a2

Browse files
holgerfriedrichwborn
holgerfriedrich
authored and
wborn
committed
Upgrade Karaf from 4.4.6 to 4.4.7
* Sync runtime dependencies with Karaf 4.4.7, most notably: * PaxWeb 8.0.30 * Jetty 9.4.57.v20241219 * BouncyCastle 1.78.1 * CXF 3.6.4 * Jackson 2.18.2 * JNA 5.16.0 * JAXB 2.3.9 * commons-io 2.17.0 * commons-lang3 3.17.0 * XBean 4.26 * ASM 9.7.1 * PaxLogging 2.2.8 * Resolve itest runbundles Signed-off-by: Holger Friedrich <[email protected]>
1 parent e94a3fe commit 4da70a2

File tree

37 files changed

+484
-484
lines changed

37 files changed

+484
-484
lines changed

‎bom/compile/pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
<properties>
2020
<californium.version>2.7.4</californium.version>
21-
<jetty.version>9.4.54.v20240208</jetty.version>
22-
<pax.web.version>8.0.27</pax.web.version>
21+
<jetty.version>9.4.57.v20241219</jetty.version>
22+
<pax.web.version>8.0.30</pax.web.version>
2323
<swagger.version>2.2.15</swagger.version>
2424
</properties>
2525

@@ -84,7 +84,7 @@
8484
<dependency>
8585
<groupId>org.apache.commons</groupId>
8686
<artifactId>commons-lang3</artifactId>
87-
<version>3.14.0</version>
87+
<version>3.17.0</version>
8888
<scope>compile</scope>
8989
</dependency>
9090

@@ -418,13 +418,13 @@
418418
<dependency>
419419
<groupId>net.java.dev.jna</groupId>
420420
<artifactId>jna</artifactId>
421-
<version>5.14.0</version>
421+
<version>5.16.0</version>
422422
<scope>compile</scope>
423423
</dependency>
424424
<dependency>
425425
<groupId>net.java.dev.jna</groupId>
426426
<artifactId>jna-platform</artifactId>
427-
<version>5.14.0</version>
427+
<version>5.16.0</version>
428428
<scope>compile</scope>
429429
</dependency>
430430
</dependencies>

‎bom/runtime/pom.xml

+13-13
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717

1818
<properties>
1919
<californium.version>2.7.4</californium.version>
20-
<cxf.version>3.6.2</cxf.version>
21-
<jackson.version>2.17.1</jackson.version>
22-
<jetty.version>9.4.54.v20240208</jetty.version>
23-
<pax.logging.version>2.2.7</pax.logging.version>
24-
<pax.web.version>8.0.27</pax.web.version>
20+
<cxf.version>3.6.4</cxf.version>
21+
<jackson.version>2.18.2</jackson.version>
22+
<jetty.version>9.4.57.v20241219</jetty.version>
23+
<pax.logging.version>2.2.8</pax.logging.version>
24+
<pax.web.version>8.0.30</pax.web.version>
2525
<swagger.version>2.2.15</swagger.version>
2626
</properties>
2727

@@ -194,7 +194,7 @@
194194
<dependency>
195195
<groupId>com.sun.xml.bind</groupId>
196196
<artifactId>jaxb-osgi</artifactId>
197-
<version>2.3.8</version>
197+
<version>2.3.9</version>
198198
</dependency>
199199

200200
<!-- Activation 1.2 API -->
@@ -404,12 +404,12 @@
404404
<dependency>
405405
<groupId>commons-io</groupId>
406406
<artifactId>commons-io</artifactId>
407-
<version>2.15.1</version>
407+
<version>2.17.0</version>
408408
</dependency>
409409
<dependency>
410410
<groupId>org.apache.commons</groupId>
411411
<artifactId>commons-lang3</artifactId>
412-
<version>3.14.0</version>
412+
<version>3.17.0</version>
413413
<scope>compile</scope>
414414
</dependency>
415415
<dependency>
@@ -780,13 +780,13 @@
780780
<dependency>
781781
<groupId>org.apache.xbean</groupId>
782782
<artifactId>xbean-bundleutils</artifactId>
783-
<version>4.24</version>
783+
<version>4.26</version>
784784
<scope>compile</scope>
785785
</dependency>
786786
<dependency>
787787
<groupId>org.apache.xbean</groupId>
788788
<artifactId>xbean-finder</artifactId>
789-
<version>4.24</version>
789+
<version>4.26</version>
790790
<scope>compile</scope>
791791
</dependency>
792792

@@ -906,7 +906,7 @@
906906
<dependency>
907907
<groupId>org.ow2.asm</groupId>
908908
<artifactId>asm</artifactId>
909-
<version>9.7</version>
909+
<version>9.7.1</version>
910910
<scope>compile</scope>
911911
</dependency>
912912
<dependency>
@@ -1066,13 +1066,13 @@
10661066
<dependency>
10671067
<groupId>net.java.dev.jna</groupId>
10681068
<artifactId>jna</artifactId>
1069-
<version>5.14.0</version>
1069+
<version>5.16.0</version>
10701070
<scope>compile</scope>
10711071
</dependency>
10721072
<dependency>
10731073
<groupId>net.java.dev.jna</groupId>
10741074
<artifactId>jna-platform</artifactId>
1075-
<version>5.14.0</version>
1075+
<version>5.16.0</version>
10761076
<scope>compile</scope>
10771077
</dependency>
10781078
</dependencies>

‎bom/test/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<name>openHAB Core :: BOM :: Test</name>
1717

1818
<properties>
19-
<cxf.version>3.6.2</cxf.version>
19+
<cxf.version>3.6.4</cxf.version>
2020
<junit.version>5.10.0</junit.version>
2121
<mockito.version>4.11.0</mockito.version>
2222
</properties>
@@ -25,7 +25,7 @@
2525
<dependency>
2626
<groupId>com.sun.xml.bind</groupId>
2727
<artifactId>jaxb-osgi</artifactId>
28-
<version>2.3.8</version>
28+
<version>2.3.9</version>
2929
</dependency>
3030
<dependency>
3131
<groupId>org.eclipse.jdt</groupId>

‎bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>net.java.dev.jna</groupId>
2525
<artifactId>jna-platform</artifactId>
26-
<version>5.14.0</version>
26+
<version>5.16.0</version>
2727
</dependency>
2828
</dependencies>
2929

‎bundles/org.openhab.core.io.jetty.certificate/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<dependency>
1818
<groupId>org.bouncycastle</groupId>
1919
<artifactId>bcpkix-jdk18on</artifactId>
20-
<version>1.77</version>
20+
<version>1.78.1</version>
2121
</dependency>
2222
</dependencies>
2323

‎bundles/org.openhab.core.io.transport.modbus/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<dependency>
3030
<groupId>org.apache.commons</groupId>
3131
<artifactId>commons-pool2</artifactId>
32-
<version>2.11.1</version>
32+
<version>2.12.0</version>
3333
<scope>compile</scope>
3434
</dependency>
3535
<dependency>

‎bundles/org.openhab.core.semantics/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<dependency>
3030
<groupId>org.ow2.asm</groupId>
3131
<artifactId>asm</artifactId>
32-
<version>9.7</version>
32+
<version>9.7.1</version>
3333
<scope>provided</scope>
3434
</dependency>
3535
</dependencies>

‎bundles/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@
236236
<!-- Required for JDK 17 compatibility, see: https://github.com/highsource/maven-jaxb2-plugin/issues/207 -->
237237
<groupId>org.glassfish.jaxb</groupId>
238238
<artifactId>jaxb-runtime</artifactId>
239-
<version>2.3.8</version>
239+
<version>2.3.9</version>
240240
</dependency>
241241
</dependencies>
242242
<executions>

‎features/karaf/openhab-core/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<description>openHAB Core Features</description>
1717

1818
<properties>
19-
<jetty.version>9.4.54.v20240208</jetty.version>
20-
<jna.version>5.14.0</jna.version>
19+
<jetty.version>9.4.57.v20241219</jetty.version>
20+
<jna.version>5.16.0</jna.version>
2121
</properties>
2222

2323
<build>

‎features/karaf/openhab-core/src/main/feature/feature.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@
262262
<feature>openhab-core-base</feature>
263263
<feature>openhab-transport-serial</feature>
264264

265-
<bundle dependency="true">mvn:org.apache.commons/commons-pool2/2.11.1</bundle>
265+
<bundle dependency="true">mvn:org.apache.commons/commons-pool2/2.12.0</bundle>
266266
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.transport.modbus/${project.version}</bundle>
267267
</feature>
268268

‎features/karaf/openhab-tp/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<name>openHAB Core :: Features :: Karaf :: Target Platform</name>
1616

1717
<properties>
18-
<jetty.version>9.4.54.v20240208</jetty.version>
19-
<jna.version>5.14.0</jna.version>
18+
<jetty.version>9.4.57.v20241219</jetty.version>
19+
<jna.version>5.16.0</jna.version>
2020
</properties>
2121

2222
<build>

‎features/karaf/openhab-tp/src/main/feature/feature.xml

+22-22
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<feature>log</feature>
2424
<feature>pax-web-jetty-extras</feature>
2525
<!-- Apache Commons -->
26-
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.14.0</bundle>
26+
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.17.0</bundle>
2727
<!-- Measurement -->
2828
<bundle dependency="true">mvn:jakarta.annotation/jakarta.annotation-api/2.0.0</bundle>
2929
<bundle dependency="true">mvn:jakarta.inject/jakarta.inject-api/1.0.5</bundle>
@@ -80,19 +80,19 @@
8080
</feature>
8181

8282
<feature name="openhab.tp-jackson" description="FasterXML Jackson bundles" version="${project.version}">
83-
<capability>openhab.tp;feature=jackson;version=2.17.1</capability>
84-
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.17.1</bundle>
85-
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.17.1</bundle>
86-
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.17.1</bundle>
87-
<bundle dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-cbor/2.17.1</bundle>
88-
<bundle dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.17.1</bundle>
89-
<bundle dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.17.1</bundle>
90-
<bundle dependency="true">mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.17.1</bundle>
91-
<bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.17.1</bundle>
92-
<bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.17.1</bundle>
93-
<bundle dependency="true">mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/2.17.1</bundle>
83+
<capability>openhab.tp;feature=jackson;version=2.18.2</capability>
84+
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.18.2</bundle>
85+
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.18.2</bundle>
86+
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.18.2</bundle>
87+
<bundle dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-cbor/2.18.2</bundle>
88+
<bundle dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.18.2</bundle>
89+
<bundle dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.18.2</bundle>
90+
<bundle dependency="true">mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.18.2</bundle>
91+
<bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.18.2</bundle>
92+
<bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.18.2</bundle>
93+
<bundle dependency="true">mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/2.18.2</bundle>
9494
<bundle dependency="true">mvn:org.codehaus.woodstox/stax2-api/4.2.2</bundle>
95-
<bundle dependency="true">mvn:org.yaml/snakeyaml/2.2</bundle>
95+
<bundle dependency="true">mvn:org.yaml/snakeyaml/2.3</bundle>
9696
</feature>
9797

9898
<feature name="openhab.tp-jax-rs-whiteboard" description="Aries JAX-RS Whiteboard" version="${project.version}">
@@ -115,7 +115,7 @@
115115
</feature>
116116

117117
<feature name="openhab.tp-cxf" description="Apache CXF" version="${project.version}">
118-
<capability>openhab.tp;feature=cxf;version=3.6.2</capability>
118+
<capability>openhab.tp;feature=cxf;version=3.6.4</capability>
119119
<feature dependency="true">openhab.tp-jaxws</feature>
120120
<bundle dependency="true">mvn:com.fasterxml.woodstox/woodstox-core/6.5.1</bundle>
121121
<bundle dependency="true">mvn:jakarta.jws/jakarta.jws-api/2.1.0</bundle>
@@ -124,12 +124,12 @@
124124
<bundle dependency="true">mvn:org.apache.aries.spec/org.apache.aries.javax.jax.rs-api/1.0.4</bundle>
125125
<bundle dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/2.3.1</bundle>
126126
<bundle dependency="true">mvn:org.codehaus.woodstox/stax2-api/4.2.2</bundle>
127-
<bundle>mvn:org.apache.cxf/cxf-core/3.6.2</bundle>
128-
<bundle>mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/3.6.2</bundle>
129-
<bundle>mvn:org.apache.cxf/cxf-rt-rs-client/3.6.2</bundle>
130-
<bundle>mvn:org.apache.cxf/cxf-rt-rs-sse/3.6.2</bundle>
131-
<bundle>mvn:org.apache.cxf/cxf-rt-security/3.6.2</bundle>
132-
<bundle>mvn:org.apache.cxf/cxf-rt-transports-http/3.6.2</bundle>
127+
<bundle>mvn:org.apache.cxf/cxf-core/3.6.4</bundle>
128+
<bundle>mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/3.6.4</bundle>
129+
<bundle>mvn:org.apache.cxf/cxf-rt-rs-client/3.6.4</bundle>
130+
<bundle>mvn:org.apache.cxf/cxf-rt-rs-sse/3.6.4</bundle>
131+
<bundle>mvn:org.apache.cxf/cxf-rt-security/3.6.4</bundle>
132+
<bundle>mvn:org.apache.cxf/cxf-rt-transports-http/3.6.4</bundle>
133133
</feature>
134134

135135
<feature name="openhab.tp-jbbp" description="Java Binary Block Parser library" version="${project.version}">
@@ -158,10 +158,10 @@
158158
</feature>
159159

160160
<feature name="openhab.tp-jaxb" description="JAXB bundles" version="${project.version}">
161-
<capability>openhab.tp;feature=jaxb;version=2.3.8</capability>
161+
<capability>openhab.tp;feature=jaxb;version=2.3.9</capability>
162162
<bundle start-level="10">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.2.1/1.2.1_3</bundle>
163163
<bundle start-level="10">mvn:jakarta.xml.bind/jakarta.xml.bind-api/2.3.3</bundle>
164-
<bundle start-level="20">mvn:com.sun.xml.bind/jaxb-osgi/2.3.8</bundle>
164+
<bundle start-level="20">mvn:com.sun.xml.bind/jaxb-osgi/2.3.9</bundle>
165165
<bundle start-level="20">mvn:org.glassfish.hk2/osgi-resource-locator/1.0.3</bundle>
166166
</feature>
167167

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

+12-12
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Fragment-Host: org.openhab.core.addon
3232
tech.units.indriya;version='[2.2.0,2.2.1)',\
3333
uom-lib-common;version='[2.2.0,2.2.1)',\
3434
io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
35-
com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\
35+
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\
3636
org.apache.felix.scr;version='[2.2.6,2.2.7)',\
3737
org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\
3838
org.osgi.service.event;version='[1.4.1,1.4.2)',\
@@ -46,24 +46,24 @@ Fragment-Host: org.openhab.core.addon
4646
org.opentest4j;version='[1.3.0,1.3.1)',\
4747
ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
4848
ch.qos.logback.core;version='[1.3.14,1.3.15)',\
49-
com.sun.jna;version='[5.14.0,5.14.1)',\
49+
com.sun.jna;version='[5.16.0,5.16.1)',\
5050
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
51-
org.eclipse.jetty.http;version='[9.4.54,9.4.55)',\
52-
org.eclipse.jetty.io;version='[9.4.54,9.4.55)',\
53-
org.eclipse.jetty.security;version='[9.4.54,9.4.55)',\
54-
org.eclipse.jetty.server;version='[9.4.54,9.4.55)',\
55-
org.eclipse.jetty.servlet;version='[9.4.54,9.4.55)',\
56-
org.eclipse.jetty.util;version='[9.4.54,9.4.55)',\
57-
org.eclipse.jetty.util.ajax;version='[9.4.54,9.4.55)',\
51+
org.eclipse.jetty.http;version='[9.4.57,9.4.58)',\
52+
org.eclipse.jetty.io;version='[9.4.57,9.4.58)',\
53+
org.eclipse.jetty.security;version='[9.4.57,9.4.58)',\
54+
org.eclipse.jetty.server;version='[9.4.57,9.4.58)',\
55+
org.eclipse.jetty.servlet;version='[9.4.57,9.4.58)',\
56+
org.eclipse.jetty.util;version='[9.4.57,9.4.58)',\
57+
org.eclipse.jetty.util.ajax;version='[9.4.57,9.4.58)',\
5858
org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
5959
org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
6060
org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
6161
org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
62-
org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)',\
63-
org.objectweb.asm;version='[9.7.0,9.7.1)',\
62+
org.objectweb.asm;version='[9.7.1,9.7.2)',\
6463
org.openhab.core;version='[5.0.0,5.0.1)',\
6564
org.openhab.core.addon;version='[5.0.0,5.0.1)',\
6665
org.openhab.core.addon.tests;version='[5.0.0,5.0.1)',\
6766
org.openhab.core.config.core;version='[5.0.0,5.0.1)',\
6867
org.openhab.core.test;version='[5.0.0,5.0.1)',\
69-
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)'
68+
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
69+
org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)'

0 commit comments

Comments
 (0)