Start version 5.2.0

* Upgrade to Spring Boot `3.5.9`
* Upgrade all the possible dependencies to the latest supported by the mentioned Spring Boot
* Upgrade to Gradle `9.2.1`
* Add `junit-platform-launcher` dependency as it looks like it is not supplied by the `spring-boot-starter-test` anymore
* Add `org.eclipse.paho.client.mqttv3` dependency into `spring-mqtt-common` as it is optional in Spring Integration now
* Fix `spring-computer-vision-function` for `djl-0.36.0` compatibility

Author: artembilan

build.gradle

@@ -7,7 +7,7 @@ plugins {
 	id 'base'
 	id 'io.spring.dependency-management' version '1.1.7'
 	id 'io.spring.javaformat' version "${javaFormatVersion}"
-	id 'com.github.spotbugs' version '6.1.13'
+	id 'com.github.spotbugs' version '6.4.8'
 }
 
 description = 'Spring Functions Catalog'
@@ -138,6 +138,8 @@ configure(javaProjects) { subproject ->
 		testImplementation 'org.awaitility:awaitility'
 		testImplementation 'org.testcontainers:junit-jupiter'
 
+		testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+
 		// NOTE: We explicitly specify checkstyle dep before javaformat checkstyle due to antlr class mismatch
 		checkstyle("com.puppycrawl.tools:checkstyle:${checkstyle.toolVersion}")
 		checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:${javaFormatVersion}")

common/spring-metadata-store-common/build.gradle

@@ -17,5 +17,5 @@ dependencies {
     optionalApi 'software.amazon.awssdk:dynamodb'
 
     testImplementation 'org.hsqldb:hsqldb'
-    testImplementation 'org.apache.curator:curator-test:5.7.1'
+    testImplementation 'org.apache.curator:curator-test:5.9.0'
 }

common/spring-mqtt-common/build.gradle

@@ -1,3 +1,4 @@
 dependencies {
     api 'org.springframework.integration:spring-integration-mqtt'
+	api 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'
 }

dependencies.gradle

@@ -1,9 +1,9 @@
 ext {
-    springBootVersion = '3.4.13'
-    springCloudAwsVersion = '3.2.1'
+    springBootVersion = '3.5.9'
+    springCloudAwsVersion = '3.4.2'
 
-    debeziumVersion = '3.0.8.Final'
-    djlVersion = '0.26.0'
+    debeziumVersion = '3.1.3.Final'
+    djlVersion = '0.36.0'
 
     springIntegrationAws = 'org.springframework.integration:spring-integration-aws:3.0.10'
     ftpServerCore = 'org.apache.ftpserver:ftpserver-core:1.2.1'

function/spring-computer-vision-function/src/main/java/org/springframework/cloud/fn/computer/vision/JsonHelper.java

@@ -17,6 +17,7 @@
 package org.springframework.cloud.fn.computer.vision;
 
 import java.lang.reflect.Type;
+import java.util.Arrays;
 import java.util.List;
 
 import ai.djl.modality.Classifications;
@@ -39,6 +40,7 @@
  * {@link Classifications}, {@link CategoryMask} and {@link Joints} to/from JSON.
  *
  * @author Christian Tzolov
+ * @author Artem Bilan
  */
 public final class JsonHelper {
 
@@ -68,7 +70,10 @@ public static String toJson(Classifications classifications) {
 	}
 
 	public static Classifications toClassifications(String json) {
-		return GSON.fromJson(json, Classifications.class);
+		Classifications.Classification[] classifications = GSON.fromJson(json, Classifications.Classification[].class);
+		return new Classifications(
+				Arrays.stream(classifications).map(Classifications.Classification::getClassName).toList(),
+				Arrays.stream(classifications).map(Classifications.Classification::getProbability).toList());
 	}
 
 	private static final Gson GSON2 = JsonUtils.builder()
@@ -80,7 +85,11 @@ public static String toJson(DetectedObjects detectedObject) {
 	}
 
 	public static DetectedObjects toDetectedObjects(String json) {
-		return GSON2.fromJson(json, DetectedObjects.class);
+		DetectedObjects.DetectedObject[] detectedObjects = GSON2.fromJson(json, DetectedObjects.DetectedObject[].class);
+		return new DetectedObjects(
+				Arrays.stream(detectedObjects).map(DetectedObjects.DetectedObject::getClassName).toList(),
+				Arrays.stream(detectedObjects).map(DetectedObjects.DetectedObject::getProbability).toList(),
+				Arrays.stream(detectedObjects).map(DetectedObjects.DetectedObject::getBoundingBox).toList());
 	}
 
 	public record Mask(List<String> classes, int[][] mask) {

function/spring-computer-vision-function/src/test/java/org/springframework/cloud/fn/computer/vision/ComputerVisionFunctionConfigurationTests.java

@@ -107,6 +107,7 @@ public void tf2SavedModel() {
 	}
 
 	@Test
+	@DisabledOnOs(OS.WINDOWS)
 	public void yolov8Detection() {
 		applicationContextRunner.withPropertyValues(
 		// @formatter:off

function/spring-computer-vision-function/src/test/java/org/springframework/cloud/fn/computer/vision/JsonHelperTests.java

@@ -28,6 +28,7 @@
 
 /**
  * @author Christian Tzolov
+ * @author Artem Bilan
  */
 public class JsonHelperTests {
 
@@ -58,8 +59,8 @@ public void classifications() {
 
 		var classifications2 = JsonHelper.toClassifications(json);
 
-		assertThat(classifications2.getClassNames()).isEqualTo(classifications.getClassNames());
-		assertThat(classifications2.getProbabilities()).isEqualTo(classifications.getProbabilities());
+		assertThat(classifications2.getClassNames()).containsAll(classifications.getClassNames());
+		assertThat(classifications2.getProbabilities()).containsAll(classifications.getProbabilities());
 		assertThat(classifications2.topK()).hasSize(3);
 	}
 
@@ -75,8 +76,8 @@ public void detectedObjects() {
 
 		var detectedObjects2 = JsonHelper.toDetectedObjects(json);
 
-		assertThat(detectedObjects2.getClassNames()).isEqualTo(detectedObjects.getClassNames());
-		assertThat(detectedObjects2.getProbabilities()).isEqualTo(detectedObjects.getProbabilities());
+		assertThat(detectedObjects2.getClassNames()).containsAll(detectedObjects.getClassNames());
+		assertThat(detectedObjects2.getProbabilities()).containsAll(detectedObjects.getProbabilities());
 		assertThat(detectedObjects2.topK()).hasSize(3);
 
 		assertThat(detectedObjects2.getNumberOfObjects()).isEqualTo(3);

gradle.properties

@@ -1,4 +1,4 @@
-version=5.1.2-SNAPSHOT
+version=5.2.0-SNAPSHOT
 org.gradle.jvmargs=-Xmx1536M -Dfile.encoding=UTF-8
 org.gradle.caching=true
 org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.jar

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME