From 883ce3505772604b0e371e695bdd3cf98543205c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Dec 2025 17:14:21 +0000 Subject: [PATCH 1/5] Bump org.springframework.boot:spring-boot-dependencies Bumps [org.springframework.boot:spring-boot-dependencies](https://github.com/spring-projects/spring-boot) from 3.5.7 to 4.0.0. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.5.7...v4.0.0) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-dependencies dependency-version: 4.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- integration-tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index c3df8bc73..2355ef080 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -26,7 +26,7 @@ org.springframework.boot spring-boot-dependencies - 3.5.7 + 4.0.0 pom import From c771da2397ff4baa8e8af2c61b07445708275b14 Mon Sep 17 00:00:00 2001 From: Marvin Lindner Date: Fri, 12 Dec 2025 15:22:03 +0100 Subject: [PATCH 2/5] fix --- integration-tests/srv/pom.xml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/integration-tests/srv/pom.xml b/integration-tests/srv/pom.xml index 6a5b6eada..ea92a47ad 100644 --- a/integration-tests/srv/pom.xml +++ b/integration-tests/srv/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 @@ -55,6 +57,18 @@ wiremock-spring-boot test + + + org.springframework.boot + spring-boot-test + test + + + org.springframework.boot + spring-boot-test-autoconfigure + test + + @@ -98,7 +112,7 @@ build --for java deploy --to h2 --dry > - "${project.basedir}/src/main/resources/schema.sql" + "${project.basedir}/src/main/resources/schema.sql" @@ -118,4 +132,4 @@ - + \ No newline at end of file From 23baccd7788f44986c6a660cf3d56365df107d50 Mon Sep 17 00:00:00 2001 From: Marvin Lindner Date: Fri, 12 Dec 2025 15:25:53 +0100 Subject: [PATCH 3/5] spotless --- integration-tests/srv/pom.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/integration-tests/srv/pom.xml b/integration-tests/srv/pom.xml index ea92a47ad..fc193bd30 100644 --- a/integration-tests/srv/pom.xml +++ b/integration-tests/srv/pom.xml @@ -1,7 +1,5 @@ - + 4.0.0 @@ -132,4 +130,4 @@ - \ No newline at end of file + From f58569f9e480f6b581cfb42b4f60fbe947fd0be2 Mon Sep 17 00:00:00 2001 From: Marvin Lindner Date: Fri, 12 Dec 2025 15:30:06 +0100 Subject: [PATCH 4/5] fix again --- integration-tests/srv/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/integration-tests/srv/pom.xml b/integration-tests/srv/pom.xml index fc193bd30..06cf7bef6 100644 --- a/integration-tests/srv/pom.xml +++ b/integration-tests/srv/pom.xml @@ -66,6 +66,11 @@ spring-boot-test-autoconfigure test + + org.springframework.boot + spring-boot-starter-test + test + From 482898b31b06770a1207bc54ce3d8286d345efd8 Mon Sep 17 00:00:00 2001 From: Marvin Lindner Date: Fri, 12 Dec 2025 15:40:22 +0100 Subject: [PATCH 5/5] migrated dependencies --- integration-tests/srv/pom.xml | 12 +----------- .../DraftOdataRequestValidationBase.java | 2 +- .../nondraftservice/OdataRequestValidationBase.java | 2 +- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/integration-tests/srv/pom.xml b/integration-tests/srv/pom.xml index 06cf7bef6..315b8dee3 100644 --- a/integration-tests/srv/pom.xml +++ b/integration-tests/srv/pom.xml @@ -58,17 +58,7 @@ org.springframework.boot - spring-boot-test - test - - - org.springframework.boot - spring-boot-test-autoconfigure - test - - - org.springframework.boot - spring-boot-starter-test + spring-boot-starter-webmvc-test test diff --git a/integration-tests/srv/src/test/java/com/sap/cds/feature/attachments/integrationtests/draftservice/DraftOdataRequestValidationBase.java b/integration-tests/srv/src/test/java/com/sap/cds/feature/attachments/integrationtests/draftservice/DraftOdataRequestValidationBase.java index 117726c4e..e5ab0ce37 100644 --- a/integration-tests/srv/src/test/java/com/sap/cds/feature/attachments/integrationtests/draftservice/DraftOdataRequestValidationBase.java +++ b/integration-tests/srv/src/test/java/com/sap/cds/feature/attachments/integrationtests/draftservice/DraftOdataRequestValidationBase.java @@ -32,8 +32,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc; import org.springframework.http.HttpStatus; import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.ResultMatcher; diff --git a/integration-tests/srv/src/test/java/com/sap/cds/feature/attachments/integrationtests/nondraftservice/OdataRequestValidationBase.java b/integration-tests/srv/src/test/java/com/sap/cds/feature/attachments/integrationtests/nondraftservice/OdataRequestValidationBase.java index 3757d976e..22f165102 100644 --- a/integration-tests/srv/src/test/java/com/sap/cds/feature/attachments/integrationtests/nondraftservice/OdataRequestValidationBase.java +++ b/integration-tests/srv/src/test/java/com/sap/cds/feature/attachments/integrationtests/nondraftservice/OdataRequestValidationBase.java @@ -37,8 +37,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MvcResult;