refactor: update imports for Spring Boot 4.0.0 compatibility

Author: paul58914080

example/acceptance-test/pom.xml

@@ -37,6 +37,11 @@
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-resttestclient</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>

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;

example/acceptance-test/src/test/java/packagename/cucumber/SpringCucumberTestConfig.java

@@ -3,11 +3,13 @@
 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;
 
 @SpringBootTest(classes = ExampleApplication.class, webEnvironment = RANDOM_PORT)
 @CucumberContextConfiguration
 @ActiveProfiles("test")
+@AutoConfigureTestRestTemplate
 public class SpringCucumberTestConfig {}

example/jpa-adapter/pom.xml

@@ -21,12 +21,12 @@
       <artifactId>spring-boot-starter-data-jpa</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.liquibase</groupId>
-      <artifactId>liquibase-core</artifactId>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-liquibase</artifactId>
       <exclusions>
         <exclusion>
-          <artifactId>commons-text</artifactId>
           <groupId>org.apache.commons</groupId>
+          <artifactId>commons-text</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -53,6 +53,11 @@
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-data-jpa-test</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>

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;

…/main/resources/preliquibase/default.sql …r/src/main/resources/preliquibase/h2.sqlexample/jpa-adapter/src/main/resources/preliquibase/default.sql renamed to example/jpa-adapter/src/main/resources/preliquibase/h2.sql example/jpa-adapter/src/main/resources/preliquibase/default.sql renamed to example/jpa-adapter/src/main/resources/preliquibase/h2.sql

@@ -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 {}
 }

example/jpa-adapter/src/test/java/packagename/repository/ExampleJpaAdapterApplication.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;

example/jpa-adapter/src/test/java/packagename/repository/ExampleJpaTest.java

@@ -35,6 +35,11 @@
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-resttestclient</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

example/rest-adapter/pom.xml

@@ -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:";