Upgrade californium to 4.0.0-M2

* Upgrade californium from 2.7.4 to 4.0.0-M2
* Replace special OH built net.i2p.crypto.eddsa by BouncyCastle
* Upgrade slf4j from 2.0.12 to 2.0.16

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

Author: holgerfriedrich

bom/compile/pom.xml

@@ -17,7 +17,7 @@
   <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.28</swagger.version>
@@ -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 -->

bom/runtime/pom.xml

@@ -16,7 +16,7 @@
   <name>openHAB Core :: BOM :: Runtime</name>
 
   <properties>
-    <californium.version>2.7.4</californium.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>
@@ -435,17 +435,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 -->

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

@@ -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}">

pom.xml

@@ -72,7 +72,7 @@
     <karaf.compile.version>4.4.7</karaf.compile.version>
     <karaf.tooling.version>4.4.7</karaf.tooling.version>
     <sat.version>0.17.0</sat.version>
-    <slf4j.version>2.0.12</slf4j.version>
+    <slf4j.version>2.0.16</slf4j.version>
     <xtext.version>2.37.0</xtext.version>
     <spotless.version>2.43.0</spotless.version>
     <!-- Eclipse Java formatter version 4.26+ does not check test files -->