Integration of Californium 4.0.0-M2

eclipse-leshan · Jan 13, 2025 · 9eec2be · 9eec2be
1 parent 3478efd
commit 9eec2be
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/...ap/src/main/java/org/eclipse/leshan/transport/californium/bsserver/ConnectionCleaner.java b/...ap/src/main/java/org/eclipse/leshan/transport/californium/bsserver/ConnectionCleaner.java
@@ -17,13 +17,13 @@
 
 import java.security.Principal;
 import java.security.PublicKey;
+import java.util.function.Predicate;
 
 import javax.security.auth.x500.X500Principal;
 
 import org.eclipse.californium.elements.auth.PreSharedKeyIdentity;
 import org.eclipse.californium.elements.auth.RawPublicKeyIdentity;
 import org.eclipse.californium.elements.auth.X509CertPath;
-import org.eclipse.californium.elements.util.Filter;
 import org.eclipse.californium.scandium.DTLSConnector;
 import org.eclipse.leshan.core.security.certificate.util.X509CertUtil;
 import org.eclipse.leshan.servers.security.SecurityInfo;
@@ -40,9 +40,9 @@ public ConnectionCleaner(DTLSConnector connector) {
     }
 
     public void cleanConnectionFor(final SecurityInfo... infos) {
-        connector.startTerminateConnectionsForPrincipal(new Filter<Principal>() {
+        connector.startTerminateConnectionsForPrincipal(new Predicate<Principal>() {
             @Override
-            public boolean accept(Principal principal) {
+            public boolean test(Principal principal) {
                 if (principal != null) {
                     for (SecurityInfo info : infos) {
                         if (info != null) {

diff --git a/...coap/src/main/java/org/eclipse/leshan/transport/californium/server/ConnectionCleaner.java b/...coap/src/main/java/org/eclipse/leshan/transport/californium/server/ConnectionCleaner.java
@@ -17,13 +17,13 @@
 
 import java.security.Principal;
 import java.security.PublicKey;
+import java.util.function.Predicate;
 
 import javax.security.auth.x500.X500Principal;
 
 import org.eclipse.californium.elements.auth.PreSharedKeyIdentity;
 import org.eclipse.californium.elements.auth.RawPublicKeyIdentity;
 import org.eclipse.californium.elements.auth.X509CertPath;
-import org.eclipse.californium.elements.util.Filter;
 import org.eclipse.californium.scandium.DTLSConnector;
 import org.eclipse.leshan.core.security.certificate.util.X509CertUtil;
 import org.eclipse.leshan.servers.security.SecurityInfo;
@@ -40,9 +40,9 @@ public ConnectionCleaner(DTLSConnector connector) {
     }
 
     public void cleanConnectionFor(final SecurityInfo... infos) {
-        connector.startTerminateConnectionsForPrincipal(new Filter<Principal>() {
+        connector.startTerminateConnectionsForPrincipal(new Predicate<Principal>() {
             @Override
-            public boolean accept(Principal principal) {
+            public boolean test(Principal principal) {
                 if (principal != null) {
                     for (SecurityInfo info : infos) {
                         if (info != null) {

diff --git a/pom.xml b/pom.xml
@@ -133,11 +133,11 @@ Contributors:
 
     <!-- we use properties for version when there are used more than once -->
     <!-- dependencies version -->
-    <californium.version>3.13.0</californium.version>
+    <californium.version>4.0.0-M2</californium.version>
     <logback.version>1.3.15</logback.version>
     <javacoap.version>6.21.0</javacoap.version>
     <netty.version>4.1.115.Final</netty.version>
-    <slf4j.api.version>2.0.13</slf4j.api.version>
+    <slf4j.api.version>2.0.16</slf4j.api.version>
     <jetty.version>12.0.14</jetty.version>
     <jackson.version>2.15.3</jackson.version>
     <picocli.version>4.7.5</picocli.version>
@@ -280,7 +280,7 @@ Contributors:
       <dependency>
         <groupId>com.upokecenter</groupId>
         <artifactId>cbor</artifactId>
-        <version>4.5.3</version>
+        <version>4.5.6</version>
       </dependency>
       <!-- redis -->
       <dependency>