Skip to content

Commit

Permalink
Upgrade Karaf from 4.4.6 to 4.4.7
Browse files Browse the repository at this point in the history 
* Sync runtime dependencies with Karaf 4.4.7, most notably:
   * PaxWeb 8.0.29
   * Jetty 9.4.56.v20240826
   * BouncyCastle 1.78.1
   * CXF 3.6.4
   * Jackson 2.17.2
   * JNA 5.15.0
   * JAXB 2.3.9
   * commons-io 2.17.0
   * commons-lang3 3.17.0
   * XBean 4.26
   * ASM 9.7.1
 * Resolve itest runbundles

Signed-off-by: Holger Friedrich <[email protected]>

paxweb

Signed-off-by: Holger Friedrich <[email protected]>
  • Loading branch information
@holgerfriedrich
holgerfriedrich committed Nov 6, 2024
1 parent 4eec4a3 commit dbc65c6
Show file tree
Hide file tree
Showing 36 changed files with 427 additions and 427 deletions.
10 changes: 5 additions & 5 deletions bom/compile/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

<properties>
<californium.version>2.7.4</californium.version>
<jetty.version>9.4.54.v20240208</jetty.version>
<pax.web.version>8.0.27</pax.web.version>
<jetty.version>9.4.56.v20240826</jetty.version>
<pax.web.version>8.0.29</pax.web.version>
<swagger.version>2.2.15</swagger.version>
</properties>

Expand Down Expand Up @@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.14.0</version>
<version>3.17.0</version>
<scope>compile</scope>
</dependency>

Expand Down Expand Up @@ -418,13 +418,13 @@
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>5.14.0</version>
<version>5.15.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
<version>5.14.0</version>
<version>5.15.0</version>
<scope>compile</scope>
</dependency>

Expand Down
24 changes: 12 additions & 12 deletions bom/runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@

<properties>
<californium.version>2.7.4</californium.version>
<cxf.version>3.6.2</cxf.version>
<jackson.version>2.17.1</jackson.version>
<jetty.version>9.4.54.v20240208</jetty.version>
<cxf.version>3.6.4</cxf.version>
<jackson.version>2.17.2</jackson.version>
<jetty.version>9.4.56.v20240826</jetty.version>
<pax.logging.version>2.2.7</pax.logging.version>
<pax.web.version>8.0.27</pax.web.version>
<pax.web.version>8.0.29</pax.web.version>
<swagger.version>2.2.15</swagger.version>
</properties>

Expand Down Expand Up @@ -194,7 +194,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-osgi</artifactId>
<version>2.3.8</version>
<version>2.3.9</version>
</dependency>

<!-- Activation 1.2 API -->
Expand Down Expand Up @@ -404,12 +404,12 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.15.1</version>
<version>2.17.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.14.0</version>
<version>3.17.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -780,13 +780,13 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-bundleutils</artifactId>
<version>4.24</version>
<version>4.26</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
<version>4.24</version>
<version>4.26</version>
<scope>compile</scope>
</dependency>

Expand Down Expand Up @@ -906,7 +906,7 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.7</version>
<version>9.7.1</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -1066,13 +1066,13 @@
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>5.14.0</version>
<version>5.15.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
<version>5.14.0</version>
<version>5.15.0</version>
<scope>compile</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions bom/test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<name>openHAB Core :: BOM :: Test</name>

<properties>
<cxf.version>3.6.2</cxf.version>
<cxf.version>3.6.4</cxf.version>
<junit.version>5.10.0</junit.version>
<mockito.version>4.11.0</mockito.version>
</properties>
Expand All @@ -25,7 +25,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-osgi</artifactId>
<version>2.3.8</version>
<version>2.3.9</version>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
<version>5.14.0</version>
<version>5.15.0</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.core.io.jetty.certificate/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
<version>1.77</version>
<version>1.78.1</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.core.io.transport.modbus/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
<version>2.11.1</version>
<version>2.12.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.core.semantics/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.7</version>
<version>9.7.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion features/karaf/openhab-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<properties>
<jetty.version>9.4.54.v20240208</jetty.version>
<jna.version>5.14.0</jna.version>
<jna.version>5.15.0</jna.version>
</properties>

<build>
Expand Down
2 changes: 1 addition & 1 deletion features/karaf/openhab-core/src/main/feature/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@
<feature>openhab-core-base</feature>
<feature>openhab-transport-serial</feature>

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

Expand Down
2 changes: 1 addition & 1 deletion features/karaf/openhab-tp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<properties>
<jetty.version>9.4.54.v20240208</jetty.version>
<jna.version>5.14.0</jna.version>
<jna.version>5.15.0</jna.version>
</properties>

<build>
Expand Down
40 changes: 20 additions & 20 deletions features/karaf/openhab-tp/src/main/feature/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<feature>log</feature>
<feature>pax-web-jetty-extras</feature>
<!-- Apache Commons -->
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.14.0</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.17.0</bundle>
<!-- Measurement -->
<bundle dependency="true">mvn:jakarta.annotation/jakarta.annotation-api/2.0.0</bundle>
<bundle dependency="true">mvn:jakarta.inject/jakarta.inject-api/1.0.5</bundle>
Expand Down Expand Up @@ -80,17 +80,17 @@
</feature>

<feature name="openhab.tp-jackson" description="FasterXML Jackson bundles" version="${project.version}">
<capability>openhab.tp;feature=jackson;version=2.17.1</capability>
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.17.1</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.17.1</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.17.1</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-cbor/2.17.1</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.17.1</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.17.1</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.17.1</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.17.1</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.17.1</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/2.17.1</bundle>
<capability>openhab.tp;feature=jackson;version=2.17.2</capability>
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.17.2</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.17.2</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.17.2</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-cbor/2.17.2</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.17.2</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.17.2</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.17.2</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.17.2</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.17.2</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/2.17.2</bundle>
<bundle dependency="true">mvn:org.codehaus.woodstox/stax2-api/4.2.2</bundle>
<bundle dependency="true">mvn:org.yaml/snakeyaml/2.2</bundle>
</feature>
Expand All @@ -115,7 +115,7 @@
</feature>

<feature name="openhab.tp-cxf" description="Apache CXF" version="${project.version}">
<capability>openhab.tp;feature=cxf;version=3.6.2</capability>
<capability>openhab.tp;feature=cxf;version=3.6.4</capability>
<feature dependency="true">openhab.tp-jaxws</feature>
<bundle dependency="true">mvn:com.fasterxml.woodstox/woodstox-core/6.5.1</bundle>
<bundle dependency="true">mvn:jakarta.jws/jakarta.jws-api/2.1.0</bundle>
Expand All @@ -124,12 +124,12 @@
<bundle dependency="true">mvn:org.apache.aries.spec/org.apache.aries.javax.jax.rs-api/1.0.4</bundle>
<bundle dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/2.3.1</bundle>
<bundle dependency="true">mvn:org.codehaus.woodstox/stax2-api/4.2.2</bundle>
<bundle>mvn:org.apache.cxf/cxf-core/3.6.2</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/3.6.2</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-rs-client/3.6.2</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-rs-sse/3.6.2</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-security/3.6.2</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-transports-http/3.6.2</bundle>
<bundle>mvn:org.apache.cxf/cxf-core/3.6.4</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/3.6.4</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-rs-client/3.6.4</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-rs-sse/3.6.4</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-security/3.6.4</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-transports-http/3.6.4</bundle>
</feature>

<feature name="openhab.tp-jbbp" description="Java Binary Block Parser library" version="${project.version}">
Expand Down Expand Up @@ -161,7 +161,7 @@
<capability>openhab.tp;feature=jaxb;version=2.3.8</capability>
<bundle start-level="10">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.2.1/1.2.1_3</bundle>
<bundle start-level="10">mvn:jakarta.xml.bind/jakarta.xml.bind-api/2.3.3</bundle>
<bundle start-level="20">mvn:com.sun.xml.bind/jaxb-osgi/2.3.8</bundle>
<bundle start-level="20">mvn:com.sun.xml.bind/jaxb-osgi/2.3.9</bundle>
<bundle start-level="20">mvn:org.glassfish.hk2/osgi-resource-locator/1.0.3</bundle>
</feature>

Expand Down
20 changes: 10 additions & 10 deletions itests/org.openhab.core.addon.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Fragment-Host: org.openhab.core.addon
tech.units.indriya;version='[2.2.0,2.2.1)',\
uom-lib-common;version='[2.2.0,2.2.1)',\
io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\
org.apache.felix.scr;version='[2.2.6,2.2.7)',\
org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\
org.osgi.service.event;version='[1.4.1,1.4.2)',\
Expand All @@ -48,21 +48,21 @@ Fragment-Host: org.openhab.core.addon
org.opentest4j;version='[1.3.0,1.3.1)',\
ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
ch.qos.logback.core;version='[1.3.14,1.3.15)',\
com.sun.jna;version='[5.14.0,5.14.1)',\
com.sun.jna;version='[5.15.0,5.15.1)',\
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
org.eclipse.jetty.http;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.io;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.security;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.server;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.servlet;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.util;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.util.ajax;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.http;version='[9.4.56,9.4.57)',\
org.eclipse.jetty.io;version='[9.4.56,9.4.57)',\
org.eclipse.jetty.security;version='[9.4.56,9.4.57)',\
org.eclipse.jetty.server;version='[9.4.56,9.4.57)',\
org.eclipse.jetty.servlet;version='[9.4.56,9.4.57)',\
org.eclipse.jetty.util;version='[9.4.56,9.4.57)',\
org.eclipse.jetty.util.ajax;version='[9.4.56,9.4.57)',\
org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)',\
org.objectweb.asm;version='[9.7.0,9.7.1)',\
org.objectweb.asm;version='[9.7.1,9.7.2)',\
org.openhab.core;version='[4.3.0,4.3.1)',\
org.openhab.core.addon;version='[4.3.0,4.3.1)',\
org.openhab.core.addon.tests;version='[4.3.0,4.3.1)',\
Expand Down
36 changes: 18 additions & 18 deletions itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Fragment-Host: org.openhab.core.auth.oauth2client
tech.units.indriya;version='[2.2.0,2.2.1)',\
uom-lib-common;version='[2.2.0,2.2.1)',\
io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\
org.apache.felix.scr;version='[2.2.6,2.2.7)',\
org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\
org.osgi.service.event;version='[1.4.1,1.4.2)',\
Expand All @@ -48,24 +48,24 @@ Fragment-Host: org.openhab.core.auth.oauth2client
ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
ch.qos.logback.core;version='[1.3.14,1.3.15)',\
xstream;version='[1.4.20,1.4.21)',\
com.sun.jna;version='[5.14.0,5.14.1)',\
com.sun.jna;version='[5.15.0,5.15.1)',\
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
org.eclipse.jetty.alpn.client;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.client;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.http;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.http2.client;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.http2.common;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.http2.hpack;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.io;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.security;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.server;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.servlet;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.util;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.util.ajax;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.websocket.api;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.websocket.client;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.websocket.common;version='[9.4.54,9.4.55)',\
org.objectweb.asm;version='[9.7.0,9.7.1)',\
org.eclipse.jetty.alpn.client;version='[9.4.56,9.4.57)',\
org.eclipse.jetty.client;version='[9.4.56,9.4.57)',\
org.eclipse.jetty.http;version='[9.4.56,9.4.57)',\
org.eclipse.jetty.http2.client;version='[9.4.56,9.4.57)',\
org.eclipse.jetty.http2.common;version='[9.4.56,9.4.57)',\
org.eclipse.jetty.http2.hpack;version='[9.4.56,9.4.57)',\
org.eclipse.jetty.io;version='[9.4.56,9.4.57)',\
org.eclipse.jetty.security;version='[9.4.56,9.4.57)',\
org.eclipse.jetty.server;version='[9.4.56,9.4.57)',\
org.eclipse.jetty.servlet;version='[9.4.56,9.4.57)',\
org.eclipse.jetty.util;version='[9.4.56,9.4.57)',\
org.eclipse.jetty.util.ajax;version='[9.4.56,9.4.57)',\
org.eclipse.jetty.websocket.api;version='[9.4.56,9.4.57)',\
org.eclipse.jetty.websocket.client;version='[9.4.56,9.4.57)',\
org.eclipse.jetty.websocket.common;version='[9.4.56,9.4.57)',\
org.objectweb.asm;version='[9.7.1,9.7.2)',\
org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
Expand Down
Loading

0 comments on commit dbc65c6

Please sign in to comment.