This is an automated email from the ASF dual-hosted git repository.
tzimanyi pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-runtimes.git
The following commit(s) were added to refs/heads/main by this push:
new 2e96c76330 [kie-issues#995] Upgrade Spring Boot to 3.2.4 (#3463)
2e96c76330 is described below
commit 2e96c763307825d9710969d0bccd26534ad168d5
Author: Tibor Zimányi <[email protected]>
AuthorDate: Fri Apr 12 06:26:17 2024 +0200
[kie-issues#995] Upgrade Spring Boot to 3.2.4 (#3463)
---
kogito-build/kogito-dependencies-bom/pom.xml | 10 +++++-----
springboot/bom/pom.xml | 8 ++++----
.../org/kie/kogito/integrationtests/springboot/LinkTest.java | 3 +++
.../integrationtests/springboot/ManagementAddOnTest.java | 2 ++
.../kie/kogito/integrationtests/springboot/MonitoringTest.java | 7 +++++--
.../integrationtests/springboot/ProcessSvgAddonTest.java | 2 ++
.../kogito/integrationtests/springboot/SignalProcessTest.java | 3 +++
springboot/starters/pom.xml | 4 ++++
8 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/kogito-build/kogito-dependencies-bom/pom.xml
b/kogito-build/kogito-dependencies-bom/pom.xml
index 20c8932ea8..ecef33f4b0 100644
--- 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
index 43fe72cf67..f314e002ea 100644
--- 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/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/LinkTest.java
b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/LinkTest.java
index 7970e60aaf..bc87198ab6 100644
---
a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/LinkTest.java
+++
b/springboot/integration-tests/src/it/integration-tests-springboot-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 @@ class LinkTest extends BaseRestTest {
given()
.contentType(ContentType.JSON)
.when()
+ .body(new HashMap<>())
.post("/SimpleLinkTest")
.then()
.statusCode(201);
diff --git
a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/ManagementAddOnTest.java
b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/ManagementAddOnTest.java
index ad428aa562..3c45dbf9f7 100644
---
a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/ManagementAddOnTest.java
+++
b/springboot/integration-tests/src/it/integration-tests-springboot-processes-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 @@ class ManagementAddOnTest extends BaseRestTest {
private String givenGreetingsProcess() {
return given().contentType(ContentType.JSON)
.when()
+ .body(new HashMap<>())
.post("/greetings")
.then()
.statusCode(201)
diff --git
a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/MonitoringTest.java
b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/MonitoringTest.java
index c557ed52db..c055fc55f4 100644
---
a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/MonitoringTest.java
+++
b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/MonitoringTest.java
@@ -18,6 +18,8 @@
*/
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;
@@ -25,7 +27,7 @@ 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 @@ import static org.hamcrest.Matchers.emptyOrNullString;
@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/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/ProcessSvgAddonTest.java
b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/ProcessSvgAddonTest.java
index 3100b91c65..656fa2396f 100644
---
a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/ProcessSvgAddonTest.java
+++
b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/ProcessSvgAddonTest.java
@@ -23,6 +23,7 @@ import java.net.URISyntaxException;
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 @@ public class ProcessSvgAddonTest extends BaseRestTest {
String pId = given()
.contentType(ContentType.JSON)
.when()
+ .body(new HashMap<>())
.post("/approvals")
.then()
.statusCode(201)
diff --git
a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/SignalProcessTest.java
b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/SignalProcessTest.java
index ba7515c73b..e188c5b9ff 100644
---
a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/SignalProcessTest.java
+++
b/springboot/integration-tests/src/it/integration-tests-springboot-processes-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 @@ class SignalProcessTest extends BaseRestTest {
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
index 78e4c2118f..7e0d674f3e 100644
--- 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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
