Update dependencies; fix spotbugs findings

szysas · szysas · commit b3878ac0c1aa · 2023-11-07T15:11:52.000+02:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,12 +6,12 @@ plugins {
     id("maven-publish")
     id("com.github.mfarsikov.kewt-versioning") version "1.0.0"
     id("se.patrikerdes.use-latest-versions") version "0.2.18"
-    id("com.github.ben-manes.versions") version "0.48.0"
+    id("com.github.ben-manes.versions") version "0.49.0"
     id("pmd")
-    id("com.github.spotbugs") version "5.1.3"
+    id("com.github.spotbugs") version "5.2.3"
     id("org.gradle.signing")
     id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
-    id("com.adarshr.test-logger") version "3.2.0"
+    id("com.adarshr.test-logger") version "4.0.0"
 }
 
 allprojects {
diff --git a/coap-cli/build.gradle.kts b/coap-cli/build.gradle.kts
@@ -14,8 +14,8 @@ dependencies {
     implementation("info.picocli:picocli:4.7.5")
 
     testImplementation("org.mockito:mockito-core:4.11.0")
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.1")
     testImplementation("org.awaitility:awaitility:4.2.0")
     testImplementation(testFixtures(project(":coap-core")))
 }
diff --git a/coap-core/build.gradle.kts b/coap-core/build.gradle.kts
@@ -9,14 +9,14 @@ description = "coap-core"
 dependencies {
     api("org.slf4j:slf4j-api:2.0.9")
 
-    testFixturesApi("org.junit.jupiter:junit-jupiter-api:5.10.0")
+    testFixturesApi("org.junit.jupiter:junit-jupiter-api:5.10.1")
     testFixturesApi("org.assertj:assertj-core:3.24.2")
     testFixturesApi("org.awaitility:awaitility:4.2.0")
 
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.1")
     testImplementation("ch.qos.logback:logback-classic:1.3.5")
     testImplementation("org.mockito:mockito-core:4.11.0")
-    testImplementation("nl.jqno.equalsverifier:equalsverifier:3.15.2")
+    testImplementation("nl.jqno.equalsverifier:equalsverifier:3.15.3")
     testImplementation("io.github.artsok:rerunner-jupiter:2.1.6")
 }
 
diff --git a/coap-core/src/main/java/com/mbed/coap/client/RegistrationManager.java b/coap-core/src/main/java/com/mbed/coap/client/RegistrationManager.java
@@ -33,7 +33,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class RegistrationManager {
+public final class RegistrationManager {
     private static final Logger LOGGER = LoggerFactory.getLogger(RegistrationManager.class);
     private final Duration minRetryDelay;
     private final Duration maxRetryDelay;
@@ -128,7 +128,7 @@ private void updateFailed(String errMessage) {
         register();
     }
 
-    protected void registrationFailed(String errMessage) {
+    void registrationFailed(String errMessage) {
         lastRetryDelay = nextDelay(lastRetryDelay);
         registrationLocation = Optional.empty();
         scheduledExecutor.schedule((Runnable) this::register, lastRetryDelay.getSeconds(), TimeUnit.SECONDS);
diff --git a/coap-core/src/main/java/com/mbed/coap/linkformat/PToken.java b/coap-core/src/main/java/com/mbed/coap/linkformat/PToken.java
@@ -21,7 +21,7 @@
 import java.util.Objects;
 
 
-public class PToken implements CharSequence, Serializable {
+public final class PToken implements CharSequence, Serializable {
 
     private static final int validRangeStart = 33; //'!'
     private static final int validRangeStop = 126; //'~'
diff --git a/coap-core/src/main/java/com/mbed/coap/server/block/BlockWiseCallback.java b/coap-core/src/main/java/com/mbed/coap/server/block/BlockWiseCallback.java
@@ -34,7 +34,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-class BlockWiseCallback {
+final class BlockWiseCallback {
     private static final Logger LOGGER = LoggerFactory.getLogger(BlockWiseCallback.class);
     private static final int MAX_BLOCK_RESOURCE_CHANGE = 3;
 
diff --git a/coap-core/src/testFixtures/java/com/mbed/coap/utils/IpPortAddress.java b/coap-core/src/testFixtures/java/com/mbed/coap/utils/IpPortAddress.java
@@ -1,4 +1,5 @@
-/**
+/*
+ * Copyright (C) 2022-2023 java-coap contributors (https://github.com/open-coap/java-coap)
  * Copyright (C) 2011-2018 ARM Limited. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,7 +26,7 @@
  * Container class for raw IP and port without hostname. Avoids deterministic
  * problem of serializing InetSocketAddress with hostname.
  */
-public class IpPortAddress implements Serializable {
+public final class IpPortAddress implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private final byte[] ip;
diff --git a/coap-mbedtls/build.gradle.kts b/coap-mbedtls/build.gradle.kts
@@ -6,13 +6,13 @@ description = "coap-mbedtls"
 
 dependencies {
     api(project(":coap-core"))
-    api("io.github.open-coap:kotlin-mbedtls:1.19.1")
+    api("io.github.open-coap:kotlin-mbedtls:1.20.0")
 
     testImplementation(project(":coap-netty"))
-    testImplementation("io.github.open-coap:kotlin-mbedtls-netty:1.19.1")
+    testImplementation("io.github.open-coap:kotlin-mbedtls-netty:1.20.0")
 
     testImplementation(testFixtures(project(":coap-core")))
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.1")
     testImplementation("ch.qos.logback:logback-classic:1.3.5")
 }
diff --git a/coap-metrics/build.gradle.kts b/coap-metrics/build.gradle.kts
@@ -7,8 +7,8 @@ description = "coap-metrics"
 dependencies {
     api(project(":coap-core"))
 
-    implementation("io.micrometer:micrometer-core:1.11.4")
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
+    implementation("io.micrometer:micrometer-core:1.11.5")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.1")
     testImplementation(testFixtures(project(":coap-core")))
 }
diff --git a/coap-netty/build.gradle.kts b/coap-netty/build.gradle.kts
@@ -7,15 +7,15 @@ description = "coap-netty"
 
 dependencies {
     api(project(":coap-core"))
-    api("io.netty:netty-handler:4.1.99.Final")
+    api("io.netty:netty-handler:4.1.100.Final")
 
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.1")
 
     testImplementation(testFixtures(project(":coap-core")))
     testImplementation("ch.qos.logback:logback-classic:1.3.5")
 
-    jmhImplementation("io.netty:netty-all:4.1.99.Final")
+    jmhImplementation("io.netty:netty-all:4.1.100.Final")
 }
 
 tasks {
diff --git a/coap-tcp/build.gradle.kts b/coap-tcp/build.gradle.kts
@@ -10,11 +10,11 @@ dependencies {
 
     testImplementation(testFixtures(project(":coap-core")))
 
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.1")
     testImplementation("ch.qos.logback:logback-classic:1.3.5")
     testImplementation("org.mockito:mockito-core:4.11.0")
     testImplementation("org.assertj:assertj-core:3.24.2")
-    testImplementation("nl.jqno.equalsverifier:equalsverifier:3.15.2")
+    testImplementation("nl.jqno.equalsverifier:equalsverifier:3.15.3")
     testImplementation("org.awaitility:awaitility:4.2.0")
 }
diff --git a/lwm2m/build.gradle.kts b/lwm2m/build.gradle.kts
@@ -8,11 +8,11 @@ dependencies {
     api("com.google.code.gson:gson:2.10.1")
     api("org.slf4j:slf4j-api:2.0.9")
 
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
-    testImplementation("commons-io:commons-io:2.14.0")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.1")
+    testImplementation("commons-io:commons-io:2.15.0")
     testImplementation("ch.qos.logback:logback-classic:1.3.5")
     testImplementation("org.mockito:mockito-core:4.11.0")
     testImplementation("org.hamcrest:hamcrest-all:1.3")
-    testImplementation("nl.jqno.equalsverifier:equalsverifier:3.15.2")
+    testImplementation("nl.jqno.equalsverifier:equalsverifier:3.15.3")
 }
diff --git a/lwm2m/src/main/java/com/mbed/lwm2m/LWM2MResource.java b/lwm2m/src/main/java/com/mbed/lwm2m/LWM2MResource.java
@@ -21,7 +21,7 @@
 import java.util.List;
 
 @Deprecated
-public class LWM2MResource extends LWM2MResourceInstance {
+public final class LWM2MResource extends LWM2MResourceInstance {
 
     private List<LWM2MResourceInstance> instances;
 
@@ -54,7 +54,7 @@ public LWM2MResource (LWM2MID id, LWM2MResourceInstance... instances) {
         this (id, Arrays.asList(instances));
     }
 
-    public final boolean hasNestedInstances() {
+    public boolean hasNestedInstances() {
         return instances != null && !instances.isEmpty();
     }
 
diff --git a/spotbugs-exlude.xml b/spotbugs-exlude.xml
@@ -54,5 +54,9 @@
         <Class name="com.mbed.coap.server.observe.ObserversManager"/>
         <Bug pattern="WMI_WRONG_MAP_ITERATOR"/>
     </Match>
+    <Match>
+        <Class name="com.mbed.lwm2m.LWM2MResourceInstance"/>
+        <Bug pattern="CT_CONSTRUCTOR_THROW"/>
+    </Match>
 
 </FindBugsFilter>
