[kie-issues#995] Upgrade Spring Boot to 3.2.4 (apache#3463)

kiegroup · Apr 16, 2024 · 3902bea · 3902bea
1 parent 0275906
commit 3902bea
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 11 deletions.
diff --git a/kogito-build/kogito-dependencies-bom/pom.xml b/kogito-build/kogito-dependencies-bom/pom.xml
@@ -18,7 +18,7 @@
     <!-- this version property is used in plugins but also in dependencies too -->
     <version.io.quarkus>3.2.10.Final</version.io.quarkus>
     <version.io.quarkus.quarkus-test>${version.io.quarkus}</version.io.quarkus.quarkus-test>
-    <version.org.springframework.boot>3.0.5</version.org.springframework.boot>
+    <version.org.springframework.boot>3.2.4</version.org.springframework.boot>
     <version.org.apache.kafka>3.4.0</version.org.apache.kafka>
 
     <!-- dependencies versions -->
@@ -103,11 +103,11 @@
     <version.org.assertj>3.22.0</version.org.assertj>
     <version.org.json-unit-assertj>2.9.0</version.org.json-unit-assertj>
     <version.org.hamcrest>1.3</version.org.hamcrest> <!-- else old version coming from Mockito wins and breaks tests -->
-    <version.org.junit.minor>9.2</version.org.junit.minor> <!-- so that org.junit.platform and org.junit can share the same minor version -->
+    <version.org.junit.minor>10.2</version.org.junit.minor> <!-- so that org.junit.platform and org.junit can share the same minor version -->
     <version.org.junit>5.${version.org.junit.minor}</version.org.junit>
-    <version.org.junit.jupiter>5.9.3</version.org.junit.jupiter>
-    <version.org.junit.vintage>5.9.3</version.org.junit.vintage>
-    <version.org.junit.platform>1.9.3</version.org.junit.platform> <!-- otherwise Quarkus brings its own, silently disabling some tests -->
+    <version.org.junit.jupiter>5.10.2</version.org.junit.jupiter>
+    <version.org.junit.vintage>5.10.2</version.org.junit.vintage>
+    <version.org.junit.platform>1.10.2</version.org.junit.platform> <!-- otherwise Quarkus brings its own, silently disabling some tests -->
     <version.org.junit.pioneer>1.5.0</version.org.junit.pioneer>
     <version.org.mockito>4.11.0</version.org.mockito>
     <version.org.testcontainers>1.17.6</version.org.testcontainers>

diff --git a/springboot/bom/pom.xml b/springboot/bom/pom.xml
@@ -35,17 +35,17 @@
   <packaging>pom</packaging>
 
   <properties>
-    <version.io.swagger.core.v3>2.2.7</version.io.swagger.core.v3>
-    <version.org.springdoc>2.1.0</version.org.springdoc>
+    <version.io.swagger.core.v3>2.2.20</version.io.swagger.core.v3>
+    <version.org.springdoc>2.3.0</version.org.springdoc>
     <!-- Groovy -->
     <!-- must be aligned with the Archetype plugin: https://maven.apache.org/archetype/maven-archetype-plugin/dependencies.html -->
     <version.org.codehaus.groovy>2.4.16</version.org.codehaus.groovy>
     <version.org.spockframework>1.3-groovy-2.4</version.org.spockframework>
     <!-- Spring Boot Cloud aligned with Spring Boot Framework version. See: https://spring.io/projects/spring-cloud -->
     <!-- https://github.com/spring-cloud/spring-cloud-release/wiki/Spring-Cloud-2022.0-Release-Notes -->
-    <version.org.springframework.cloud>2022.0.3</version.org.springframework.cloud>
+    <version.org.springframework.cloud>2023.0.0</version.org.springframework.cloud>
     <!-- Aligned with Spring Boot Cloud -->
-    <version.io.fabric8>6.2.0</version.io.fabric8>
+    <version.io.fabric8>6.9.2</version.io.fabric8>
   </properties>
 
   <dependencyManagement>

diff --git a/...gboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/LinkTest.java b/...gboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/LinkTest.java
@@ -18,6 +18,8 @@
  */
 package org.kie.kogito.integrationtests.springboot;
 
+import java.util.HashMap;
+
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 import org.junit.jupiter.api.Test;
@@ -37,6 +39,7 @@ public void testLink() {
         given()
                 .contentType(ContentType.JSON)
             .when()
+                .body(new HashMap<>())
                 .post("/SimpleLinkTest")
             .then()
                 .statusCode(201);

diff --git a/...sses-it/src/test/java/org/kie/kogito/integrationtests/springboot/ManagementAddOnTest.java b/...sses-it/src/test/java/org/kie/kogito/integrationtests/springboot/ManagementAddOnTest.java
@@ -18,6 +18,7 @@
  */
 package org.kie.kogito.integrationtests.springboot;
 
+import java.util.HashMap;
 import java.util.List;
 
 import io.restassured.RestAssured;
@@ -129,6 +130,7 @@ void testReTriggerNode() {
     private String givenGreetingsProcess() {
         return given().contentType(ContentType.JSON)
                 .when()
+                    .body(new HashMap<>())
                     .post("/greetings")
                 .then()
                     .statusCode(201)

diff --git a/...processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/MonitoringTest.java b/...processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/MonitoringTest.java
@@ -18,14 +18,16 @@
  */
 package org.kie.kogito.integrationtests.springboot;
 
+import java.util.HashMap;
+
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.kie.kogito.KogitoGAV;
 import org.kie.kogito.config.ConfigBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.autoconfigure.actuate.metrics.AutoConfigureMetrics;
+import org.springframework.boot.test.autoconfigure.actuate.observability.AutoConfigureObservability;
 
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
@@ -38,7 +40,7 @@
 
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = KogitoSpringbootApplication.class)
-@AutoConfigureMetrics
+@AutoConfigureObservability
 public class MonitoringTest extends BaseRestTest {
 
     @Autowired
@@ -48,6 +50,7 @@ public class MonitoringTest extends BaseRestTest {
     public void test() {
         String pId = given().contentType(ContentType.JSON)
                 .when()
+                .body(new HashMap<>())
                 .post("/monitoring")
                 .then()
                 .statusCode(201)

diff --git a/...sses-it/src/test/java/org/kie/kogito/integrationtests/springboot/ProcessSvgAddonTest.java b/...sses-it/src/test/java/org/kie/kogito/integrationtests/springboot/ProcessSvgAddonTest.java
@@ -23,6 +23,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.HashMap;
 
 import org.kie.kogito.integrationtests.springboot.utils.DataIndexWireMockSpringBootTestResource;
 import org.kie.kogito.test.utils.CustomSVGMatcher;
@@ -72,6 +73,7 @@ void testGetSvgProcessInstances() throws Exception {
         String pId = given()
                 .contentType(ContentType.JSON)
                 .when()
+                .body(new HashMap<>())
                 .post("/approvals")
                 .then()
                 .statusCode(201)

diff --git a/...cesses-it/src/test/java/org/kie/kogito/integrationtests/springboot/SignalProcessTest.java b/...cesses-it/src/test/java/org/kie/kogito/integrationtests/springboot/SignalProcessTest.java
@@ -18,6 +18,8 @@
  */
 package org.kie.kogito.integrationtests.springboot;
 
+import java.util.HashMap;
+
 import io.restassured.http.ContentType;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -59,6 +61,7 @@ void testProcessSignals() {
         String pid = given()
                 .contentType(ContentType.JSON)
             .when()
+                .body(new HashMap<>())
                 .post("/greetings")
             .then()
                 .statusCode(201)

diff --git a/springboot/starters/pom.xml b/springboot/starters/pom.xml
@@ -59,6 +59,10 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-validation</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
       <artifactId>kogito-api</artifactId>