Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dependency upgrades: californium, cxf, junit, swagger #4584

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
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
16 changes: 5 additions & 11 deletions bom/compile/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
<description>The dependencies that are used to compile the core bundles</description>

<properties>
<californium.version>2.7.4</californium.version>
<californium.version>4.0.0-M2</californium.version>
<jetty.version>9.4.57.v20241219</jetty.version>
<pax.web.version>8.0.30</pax.web.version>
<swagger.version>2.2.15</swagger.version>
<swagger.version>2.2.28</swagger.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -103,17 +103,11 @@
<groupId>org.eclipse.californium</groupId>
<artifactId>element-connector</artifactId>
<version>${californium.version}</version>
<exclusions>
<exclusion>
<groupId>net.i2p.crypto</groupId>
<artifactId>eddsa</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.orbit.bundles</groupId>
<artifactId>net.i2p.crypto.eddsa</artifactId>
<version>0.3.0.v20220506-1020</version>
<groupId>org.eclipse.californium</groupId>
<artifactId>californium-osgi</artifactId>
<version>${californium.version}</version>
</dependency>

<!-- Gson -->
Expand Down
31 changes: 18 additions & 13 deletions bom/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@
<name>openHAB Core :: BOM :: Runtime</name>

<properties>
<californium.version>2.7.4</californium.version>
<cxf.version>3.6.4</cxf.version>
<californium.version>4.0.0-M2</californium.version>
<!-- cxf can be updated independently of karaf, only used in karaf tests -->
<cxf.version>3.6.5</cxf.version>
<jackson.version>2.18.2</jackson.version>
<jetty.version>9.4.57.v20241219</jetty.version>
<pax.logging.version>2.2.8</pax.logging.version>
<pax.web.version>8.0.30</pax.web.version>
<swagger.version>2.2.15</swagger.version>
<swagger.version>2.2.28</swagger.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -440,17 +441,21 @@
<groupId>org.eclipse.californium</groupId>
<artifactId>element-connector</artifactId>
<version>${californium.version}</version>
<exclusions>
<exclusion>
<groupId>net.i2p.crypto</groupId>
<artifactId>eddsa</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.orbit.bundles</groupId>
<artifactId>net.i2p.crypto.eddsa</artifactId>
<version>0.3.0.v20220506-1020</version>
<groupId>org.eclipse.californium</groupId>
<artifactId>californium-osgi</artifactId>
<version>${californium.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
<version>1.78.1</version>
</dependency>

<!-- Gson -->
Expand Down Expand Up @@ -1058,7 +1063,7 @@
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.29.2-GA</version>
<version>3.30.2-GA</version>
<scope>compile</scope>
</dependency>

Expand Down
9 changes: 7 additions & 2 deletions bom/test-index/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,17 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.10.0</version>
<version>5.11.4</version>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<version>1.10.0</version>
<version>1.11.4</version>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-engine</artifactId>
<version>1.11.4</version>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
Expand Down
7 changes: 4 additions & 3 deletions bom/test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
<name>openHAB Core :: BOM :: Test</name>

<properties>
<cxf.version>3.6.4</cxf.version>
<junit.version>5.10.0</junit.version>
<!-- cxf can be updated independently, karaf only uses it in tests -->
<cxf.version>3.6.5</cxf.version>
<junit.version>5.11.4</junit.version>
<mockito.version>4.11.0</mockito.version>
</properties>

Expand All @@ -35,7 +36,7 @@
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>2.2</version>
<version>3.0</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down
41 changes: 21 additions & 20 deletions features/karaf/openhab-tp/src/main/feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,13 @@
</feature>

<feature name="openhab.tp-coap" description="Californium CoAP library" version="${project.version}">
<capability>openhab.tp;feature=coap;version=2.7.4</capability>
<bundle>mvn:org.eclipse.californium/californium-osgi/2.7.4</bundle>
<bundle>mvn:org.eclipse.californium/californium-core/2.7.4</bundle>
<bundle>mvn:org.eclipse.californium/element-connector/2.7.4</bundle>
<bundle>mvn:org.eclipse.californium/scandium/2.7.4</bundle>
<bundle>mvn:org.eclipse.orbit.bundles/net.i2p.crypto.eddsa/0.3.0.v20220506-1020</bundle>
<capability>openhab.tp;feature=coap;version=4.0.0-M2</capability>
<bundle>mvn:org.eclipse.californium/californium-osgi/4.0.0-M2</bundle>
<bundle>mvn:org.eclipse.californium/californium-core/4.0.0-M2</bundle>
<bundle>mvn:org.eclipse.californium/element-connector/4.0.0-M2</bundle>
<bundle>mvn:org.eclipse.californium/scandium/4.0.0-M2</bundle>
<bundle dependency="true">mvn:org.slf4j/jul-to-slf4j/2.0.16</bundle>
<bundle dependency="true">mvn:org.bouncycastle/bcprov-jdk18on/1.78.1</bundle>
</feature>

<feature name="openhab.tp-commons-net" description="The Apache Commons Net library" version="${project.version}">
Expand Down Expand Up @@ -115,7 +116,7 @@
</feature>

<feature name="openhab.tp-cxf" description="Apache CXF" version="${project.version}">
<capability>openhab.tp;feature=cxf;version=3.6.4</capability>
<capability>openhab.tp;feature=cxf;version=3.6.5</capability>
<feature dependency="true">openhab.tp-jaxws</feature>
<bundle dependency="true">mvn:com.fasterxml.woodstox/woodstox-core/6.6.2</bundle>
<bundle dependency="true">mvn:jakarta.jws/jakarta.jws-api/2.1.0</bundle>
Expand All @@ -124,12 +125,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.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>
<bundle>mvn:org.apache.cxf/cxf-core/3.6.5</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/3.6.5</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-rs-client/3.6.5</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-rs-sse/3.6.5</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-security/3.6.5</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-transports-http/3.6.5</bundle>
</feature>

<feature name="openhab.tp-jbbp" description="Java Binary Block Parser library" version="${project.version}">
Expand Down Expand Up @@ -270,16 +271,16 @@
</feature>

<feature name="openhab.tp-swagger-jaxrs" description="JAX-RS Whiteboard Swagger Support" version="${project.version}">
<capability>openhab.tp;feature=swagger-jaxrs;version=2.2.15</capability>
<capability>openhab.tp;feature=swagger-jaxrs;version=2.2.28</capability>
<feature dependency="true">openhab.tp-jax-rs-whiteboard</feature>
<feature dependency="true">openhab.tp-jackson</feature>
<bundle dependency="true">mvn:io.swagger.core.v3/swagger-annotations/2.2.15</bundle>
<bundle dependency="true">mvn:io.swagger.core.v3/swagger-core/2.2.15</bundle>
<bundle dependency="true">mvn:io.swagger.core.v3/swagger-integration/2.2.15</bundle>
<bundle dependency="true">mvn:io.swagger.core.v3/swagger-jaxrs2/2.2.15</bundle>
<bundle dependency="true">mvn:io.swagger.core.v3/swagger-models/2.2.15</bundle>
<bundle dependency="true">mvn:io.swagger.core.v3/swagger-annotations/2.2.28</bundle>
<bundle dependency="true">mvn:io.swagger.core.v3/swagger-core/2.2.28</bundle>
<bundle dependency="true">mvn:io.swagger.core.v3/swagger-integration/2.2.28</bundle>
<bundle dependency="true">mvn:io.swagger.core.v3/swagger-jaxrs2/2.2.28</bundle>
<bundle dependency="true">mvn:io.swagger.core.v3/swagger-models/2.2.28</bundle>
<bundle dependency="true">mvn:jakarta.validation/jakarta.validation-api/2.0.2</bundle>
<bundle dependency="true">mvn:org.javassist/javassist/3.29.2-GA</bundle>
<bundle dependency="true">mvn:org.javassist/javassist/3.30.2-GA</bundle>
</feature>

</features>
12 changes: 6 additions & 6 deletions itests/org.openhab.core.addon.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Fragment-Host: org.openhab.core.addon
#
-runbundles: \
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
org.hamcrest;version='[2.2.0,2.2.1)',\
org.hamcrest;version='[3.0.0,3.0.1)',\
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
Expand All @@ -38,11 +38,11 @@ Fragment-Host: org.openhab.core.addon
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.11.0,2.11.1)',\
junit-jupiter-api;version='[5.10.0,5.10.1)',\
junit-jupiter-engine;version='[5.10.0,5.10.1)',\
junit-platform-commons;version='[1.10.0,1.10.1)',\
junit-platform-engine;version='[1.10.0,1.10.1)',\
junit-platform-launcher;version='[1.10.0,1.10.1)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
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)',\
Expand Down
12 changes: 6 additions & 6 deletions itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Fragment-Host: org.openhab.core.auth.oauth2client
#
-runbundles: \
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
org.hamcrest;version='[2.2.0,2.2.1)',\
org.hamcrest;version='[3.0.0,3.0.1)',\
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
Expand All @@ -37,11 +37,11 @@ Fragment-Host: org.openhab.core.auth.oauth2client
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.11.0,2.11.1)',\
junit-jupiter-api;version='[5.10.0,5.10.1)',\
junit-jupiter-engine;version='[5.10.0,5.10.1)',\
junit-platform-commons;version='[1.10.0,1.10.1)',\
junit-platform-engine;version='[1.10.0,1.10.1)',\
junit-platform-launcher;version='[1.10.0,1.10.1)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
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)',\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Fragment-Host: org.openhab.core.automation
#
-runbundles: \
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
org.hamcrest;version='[2.2.0,2.2.1)',\
org.hamcrest;version='[3.0.0,3.0.1)',\
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
Expand Down Expand Up @@ -38,11 +38,11 @@ Fragment-Host: org.openhab.core.automation
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.11.0,2.11.1)',\
junit-jupiter-api;version='[5.10.0,5.10.1)',\
junit-jupiter-engine;version='[5.10.0,5.10.1)',\
junit-platform-commons;version='[1.10.0,1.10.1)',\
junit-platform-engine;version='[1.10.0,1.10.1)',\
junit-platform-launcher;version='[1.10.0,1.10.1)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
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)',\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Fragment-Host: org.openhab.core.automation
#
-runbundles: \
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
org.hamcrest;version='[2.2.0,2.2.1)',\
org.hamcrest;version='[3.0.0,3.0.1)',\
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
Expand Down Expand Up @@ -38,11 +38,11 @@ Fragment-Host: org.openhab.core.automation
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.11.0,2.11.1)',\
junit-jupiter-api;version='[5.10.0,5.10.1)',\
junit-jupiter-engine;version='[5.10.0,5.10.1)',\
junit-platform-commons;version='[1.10.0,1.10.1)',\
junit-platform-engine;version='[1.10.0,1.10.1)',\
junit-platform-launcher;version='[1.10.0,1.10.1)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
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)',\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Fragment-Host: org.openhab.core.automation.module.script
#
-runbundles: \
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
org.hamcrest;version='[2.2.0,2.2.1)',\
org.hamcrest;version='[3.0.0,3.0.1)',\
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
Expand All @@ -34,11 +34,11 @@ Fragment-Host: org.openhab.core.automation.module.script
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.11.0,2.11.1)',\
junit-jupiter-api;version='[5.10.0,5.10.1)',\
junit-jupiter-engine;version='[5.10.0,5.10.1)',\
junit-platform-commons;version='[1.10.0,1.10.1)',\
junit-platform-engine;version='[1.10.0,1.10.1)',\
junit-platform-launcher;version='[1.10.0,1.10.1)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
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)',\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Fragment-Host: org.openhab.core.automation
#
-runbundles: \
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
org.hamcrest;version='[2.2.0,2.2.1)',\
org.hamcrest;version='[3.0.0,3.0.1)',\
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
Expand Down Expand Up @@ -38,11 +38,11 @@ Fragment-Host: org.openhab.core.automation
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.11.0,2.11.1)',\
junit-jupiter-api;version='[5.10.0,5.10.1)',\
junit-jupiter-engine;version='[5.10.0,5.10.1)',\
junit-platform-commons;version='[1.10.0,1.10.1)',\
junit-platform-engine;version='[1.10.0,1.10.1)',\
junit-platform-launcher;version='[1.10.0,1.10.1)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
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)',\
Expand Down
12 changes: 6 additions & 6 deletions itests/org.openhab.core.automation.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Fragment-Host: org.openhab.core.automation
#
-runbundles: \
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
org.hamcrest;version='[2.2.0,2.2.1)',\
org.hamcrest;version='[3.0.0,3.0.1)',\
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
Expand Down Expand Up @@ -38,11 +38,11 @@ Fragment-Host: org.openhab.core.automation
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.11.0,2.11.1)',\
junit-jupiter-api;version='[5.10.0,5.10.1)',\
junit-jupiter-engine;version='[5.10.0,5.10.1)',\
junit-platform-commons;version='[1.10.0,1.10.1)',\
junit-platform-engine;version='[1.10.0,1.10.1)',\
junit-platform-launcher;version='[1.10.0,1.10.1)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-platform-commons;version='[1.11.4,1.11.5)',\
junit-platform-engine;version='[1.11.4,1.11.5)',\
junit-platform-launcher;version='[1.11.4,1.11.5)',\
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)',\
Expand Down
Loading