From 03d4b6f341c0e92da7f682bd8de46a5db80ddcb5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Nov 2025 14:16:30 +0000 Subject: [PATCH 1/3] build(deps): bump spring-boot.version from 3.5.7 to 4.0.0 in /example Bumps `spring-boot.version` from 3.5.7 to 4.0.0. Updates `org.springframework.boot:spring-boot-dependencies` 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) Updates `org.springframework.boot:spring-boot-maven-plugin` 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 - dependency-name: org.springframework.boot:spring-boot-maven-plugin dependency-version: 4.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- example/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/pom.xml b/example/pom.xml index 98ce3ee..31a609e 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -13,7 +13,7 @@ ${java.version} ${java.version} 6.0.1 - 3.5.7 + 4.0.0 7.32.0 2.8.14 1.6.1 From dddb6c1642fa8094a7c53e68520a0e7f61bd8a1f Mon Sep 17 00:00:00 2001 From: Paul Williams Date: Wed, 26 Nov 2025 08:31:45 +0530 Subject: [PATCH 2/3] build: upgrade springdoc-openapi-starter and pre-liquibase --- example/pom.xml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/example/pom.xml b/example/pom.xml index 31a609e..73888e0 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -15,11 +15,9 @@ 6.0.1 4.0.0 7.32.0 - 2.8.14 - 1.6.1 + 3.0.0 + 2.0.0 1.1.1 - 2.4 - 2.3.232 1.14.0 3.9.0 @@ -153,6 +151,12 @@ ${java.version} ${java.version} + + + org.projectlombok + lombok + + From 196251123abb6f4e23f9966d18ee68d8d02ccf35 Mon Sep 17 00:00:00 2001 From: Paul Williams Date: Wed, 26 Nov 2025 08:32:02 +0530 Subject: [PATCH 3/3] refactor: update imports for Spring Boot 4.0.0 compatibility --- example/acceptance-test/pom.xml | 5 +++++ .../java/packagename/cucumber/ExampleStepDef.java | 2 +- .../cucumber/SpringCucumberTestConfig.java | 2 ++ example/jpa-adapter/pom.xml | 11 ++++++++--- .../repository/config/JpaAdapterConfig.java | 2 +- .../resources/preliquibase/{default.sql => h2.sql} | 0 .../repository/ExampleJpaAdapterApplication.java | 3 --- .../java/packagename/repository/ExampleJpaTest.java | 2 +- example/rest-adapter/pom.xml | 5 +++++ .../java/packagename/rest/ExampleResourceTest.java | 7 +++---- 10 files changed, 26 insertions(+), 13 deletions(-) rename example/jpa-adapter/src/main/resources/preliquibase/{default.sql => h2.sql} (100%) diff --git a/example/acceptance-test/pom.xml b/example/acceptance-test/pom.xml index 2b8f16a..0313261 100644 --- a/example/acceptance-test/pom.xml +++ b/example/acceptance-test/pom.xml @@ -37,6 +37,11 @@ spring-boot-starter-test test + + org.springframework.boot + spring-boot-resttestclient + test + com.h2database h2 diff --git a/example/acceptance-test/src/test/java/packagename/cucumber/ExampleStepDef.java b/example/acceptance-test/src/test/java/packagename/cucumber/ExampleStepDef.java index b147779..e0b2fb1 100644 --- a/example/acceptance-test/src/test/java/packagename/cucumber/ExampleStepDef.java +++ b/example/acceptance-test/src/test/java/packagename/cucumber/ExampleStepDef.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.boot.resttestclient.TestRestTemplate; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/example/acceptance-test/src/test/java/packagename/cucumber/SpringCucumberTestConfig.java b/example/acceptance-test/src/test/java/packagename/cucumber/SpringCucumberTestConfig.java index 76bbd96..e39d865 100644 --- a/example/acceptance-test/src/test/java/packagename/cucumber/SpringCucumberTestConfig.java +++ b/example/acceptance-test/src/test/java/packagename/cucumber/SpringCucumberTestConfig.java @@ -3,6 +3,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; import io.cucumber.spring.CucumberContextConfiguration; +import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; import packagename.boot.ExampleApplication; @@ -10,4 +11,5 @@ @SpringBootTest(classes = ExampleApplication.class, webEnvironment = RANDOM_PORT) @CucumberContextConfiguration @ActiveProfiles("test") +@AutoConfigureTestRestTemplate public class SpringCucumberTestConfig {} diff --git a/example/jpa-adapter/pom.xml b/example/jpa-adapter/pom.xml index bd1e1f2..7522a2c 100644 --- a/example/jpa-adapter/pom.xml +++ b/example/jpa-adapter/pom.xml @@ -21,12 +21,12 @@ spring-boot-starter-data-jpa - org.liquibase - liquibase-core + org.springframework.boot + spring-boot-starter-liquibase - commons-text org.apache.commons + commons-text @@ -53,6 +53,11 @@ spring-boot-starter-test test + + org.springframework.boot + spring-boot-starter-data-jpa-test + test + com.h2database h2 diff --git a/example/jpa-adapter/src/main/java/packagename/repository/config/JpaAdapterConfig.java b/example/jpa-adapter/src/main/java/packagename/repository/config/JpaAdapterConfig.java index 877bcbb..6da4c59 100644 --- a/example/jpa-adapter/src/main/java/packagename/repository/config/JpaAdapterConfig.java +++ b/example/jpa-adapter/src/main/java/packagename/repository/config/JpaAdapterConfig.java @@ -1,6 +1,6 @@ package packagename.repository.config; -import org.springframework.boot.autoconfigure.domain.EntityScan; +import org.springframework.boot.persistence.autoconfigure.EntityScan; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.envers.repository.support.EnversRevisionRepositoryFactoryBean; diff --git a/example/jpa-adapter/src/main/resources/preliquibase/default.sql b/example/jpa-adapter/src/main/resources/preliquibase/h2.sql similarity index 100% rename from example/jpa-adapter/src/main/resources/preliquibase/default.sql rename to example/jpa-adapter/src/main/resources/preliquibase/h2.sql diff --git a/example/jpa-adapter/src/test/java/packagename/repository/ExampleJpaAdapterApplication.java b/example/jpa-adapter/src/test/java/packagename/repository/ExampleJpaAdapterApplication.java index 24c7bf0..0aa095b 100644 --- a/example/jpa-adapter/src/test/java/packagename/repository/ExampleJpaAdapterApplication.java +++ b/example/jpa-adapter/src/test/java/packagename/repository/ExampleJpaAdapterApplication.java @@ -1,8 +1,6 @@ package packagename.repository; -import net.lbruun.springboot.preliquibase.PreLiquibaseAutoConfiguration; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.context.annotation.Import; @@ -17,6 +15,5 @@ public static void main(String[] args) { @TestConfiguration @Import(JpaAdapterConfig.class) - @ImportAutoConfiguration({PreLiquibaseAutoConfiguration.class}) static class ExampleJpaTestConfig {} } diff --git a/example/jpa-adapter/src/test/java/packagename/repository/ExampleJpaTest.java b/example/jpa-adapter/src/test/java/packagename/repository/ExampleJpaTest.java index df884f4..0c24adb 100644 --- a/example/jpa-adapter/src/test/java/packagename/repository/ExampleJpaTest.java +++ b/example/jpa-adapter/src/test/java/packagename/repository/ExampleJpaTest.java @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.boot.data.jpa.test.autoconfigure.DataJpaTest; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.jdbc.Sql; import org.springframework.test.context.junit.jupiter.SpringExtension; diff --git a/example/rest-adapter/pom.xml b/example/rest-adapter/pom.xml index 1eb3b7a..0a6a86f 100644 --- a/example/rest-adapter/pom.xml +++ b/example/rest-adapter/pom.xml @@ -35,6 +35,11 @@ spring-boot-starter-test test + + org.springframework.boot + spring-boot-resttestclient + test + diff --git a/example/rest-adapter/src/test/java/packagename/rest/ExampleResourceTest.java b/example/rest-adapter/src/test/java/packagename/rest/ExampleResourceTest.java index 22ef19f..02790f5 100644 --- a/example/rest-adapter/src/test/java/packagename/rest/ExampleResourceTest.java +++ b/example/rest-adapter/src/test/java/packagename/rest/ExampleResourceTest.java @@ -13,10 +13,9 @@ import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.boot.resttestclient.TestRestTemplate; +import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.http.HttpStatus; import org.springframework.test.context.bean.override.mockito.MockitoBean; @@ -28,7 +27,7 @@ @ExtendWith(MockitoExtension.class) @SpringBootTest(classes = ExampleRestAdapterApplication.class, webEnvironment = RANDOM_PORT) -@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class}) +@AutoConfigureTestRestTemplate public class ExampleResourceTest { private static final String LOCALHOST = "http://localhost:";