OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgrade Californium to 2.7.3 (#3085) 

Upgrades Californium from 2.0.0 to 2.7.3 which has many fixes.

For release notes see:

* https://projects.eclipse.org/projects/iot.californium/governance

Replaces #3061, #3062

Signed-off-by: Wouter Born <github@maindrain.net>
pull/3091/head
Wouter Born 2022-09-21 07:48:58 +02:00 committed by GitHub
parent 0f82c38eea
commit 149a9e9ee1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bom/compile/pom.xml
View File

@ -17,6 +17,7 @@
<description>The dependencies that are used to compile the core bundles</description> <description>The dependencies that are used to compile the core bundles</description>
<properties> <properties>
<californium.version>2.7.3</californium.version>
<jetty.version>9.4.46.v20220331</jetty.version> <jetty.version>9.4.46.v20220331</jetty.version>
<swagger.version>2.1.9</swagger.version> <swagger.version>2.1.9</swagger.version>
</properties> </properties>
@ -70,17 +71,28 @@
<dependency> <dependency>
<groupId>org.eclipse.californium</groupId> <groupId>org.eclipse.californium</groupId>
<artifactId>californium-core</artifactId> <artifactId>californium-core</artifactId>
<version>2.0.0</version> <version>${californium.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.californium</groupId> <groupId>org.eclipse.californium</groupId>
<artifactId>scandium</artifactId> <artifactId>scandium</artifactId>
<version>2.0.0</version> <version>${californium.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.californium</groupId> <groupId>org.eclipse.californium</groupId>
<artifactId>element-connector</artifactId> <artifactId>element-connector</artifactId>
<version>2.0.0</version> <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>
</dependency> </dependency>
<!-- Gson --> <!-- Gson -->

18
bom/runtime/pom.xml
View File

@ -16,6 +16,7 @@
<name>openHAB Core :: BOM :: Runtime</name> <name>openHAB Core :: BOM :: Runtime</name>
<properties> <properties>
<californium.version>2.7.3</californium.version>
<cxf.version>3.4.5</cxf.version> <cxf.version>3.4.5</cxf.version>
<!-- revert version of jackson-databind to ${jackson.version} when versions are in-line again --> <!-- revert version of jackson-databind to ${jackson.version} when versions are in-line again -->
<jackson.version>2.12.6</jackson.version> <jackson.version>2.12.6</jackson.version>
@ -411,17 +412,28 @@
<dependency> <dependency>
<groupId>org.eclipse.californium</groupId> <groupId>org.eclipse.californium</groupId>
<artifactId>californium-core</artifactId> <artifactId>californium-core</artifactId>
<version>2.0.0</version> <version>${californium.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.californium</groupId> <groupId>org.eclipse.californium</groupId>
<artifactId>scandium</artifactId> <artifactId>scandium</artifactId>
<version>2.0.0</version> <version>${californium.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.californium</groupId> <groupId>org.eclipse.californium</groupId>
<artifactId>element-connector</artifactId> <artifactId>element-connector</artifactId>
<version>2.0.0</version> <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>
</dependency> </dependency>
<!-- Gson --> <!-- Gson -->

11
features/karaf/openhab-tp/src/main/feature/feature.xml
View File

@ -40,11 +40,12 @@
</feature> </feature>
<feature name="openhab.tp-coap" description="Californium CoAP library" version="${project.version}"> <feature name="openhab.tp-coap" description="Californium CoAP library" version="${project.version}">
<capability>openhab.tp;feature=coap;version=2.0.0</capability> <capability>openhab.tp;feature=coap;version=2.7.3</capability>
<bundle>mvn:org.eclipse.californium/californium-osgi/2.0.0</bundle> <bundle>mvn:org.eclipse.californium/californium-osgi/2.7.3</bundle>
<bundle>mvn:org.eclipse.californium/californium-core/2.0.0</bundle> <bundle>mvn:org.eclipse.californium/californium-core/2.7.3</bundle>
<bundle>mvn:org.eclipse.californium/element-connector/2.0.0</bundle> <bundle>mvn:org.eclipse.californium/element-connector/2.7.3</bundle>
<bundle>mvn:org.eclipse.californium/scandium/2.0.0</bundle> <bundle>mvn:org.eclipse.californium/scandium/2.7.3</bundle>
<bundle>mvn:org.eclipse.orbit.bundles/net.i2p.crypto.eddsa/0.3.0.v20220506-1020</bundle>
</feature> </feature>
<feature name="openhab.tp-commons-net" description="The Apache Commons Net library" version="${project.version}"> <feature name="openhab.tp-commons-net" description="The Apache Commons Net library" version="${project.version}">