Upgrade

jpa/boot-jpa-locks/docker/docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.8'
 services:
 
   postgresqldb:
-    image: postgres:16.4-alpine
+    image: postgres:17.0-alpine
     environment:
       - POSTGRES_USER=appuser
       - POSTGRES_PASSWORD=secret

jpa/boot-jpa-locks/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.5</version>
+        <version>3.4.0-RC1</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.example.locks</groupId>
@@ -272,7 +272,7 @@
                 <configuration>
                     <java>
                         <palantirJavaFormat>
-                            <version>2.47.0</version>
+                            <version>2.50.0</version>
                         </palantirJavaFormat>
                         <importOrder />
                         <removeUnusedImports />
@@ -385,4 +385,25 @@
         </plugins>
     </build>
 
+    <repositories>
+        <repository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+
 </project>

jpa/boot-jpa-locks/src/main/java/com/example/locks/utils/AppConstants.java

@@ -4,6 +4,7 @@
 
 @UtilityClass
 public final class AppConstants {
+    public static final String PROFILE_LOCAL = "local";
     public static final String PROFILE_PROD = "prod";
     public static final String PROFILE_NOT_PROD = "!" + PROFILE_PROD;
     public static final String PROFILE_TEST = "test";

jpa/boot-jpa-locks/src/main/resources/application.properties

@@ -14,6 +14,8 @@ spring.jpa.show-sql=false
 spring.jpa.open-in-view=false
 spring.data.jpa.repositories.bootstrap-mode=deferred
 spring.datasource.hikari.auto-commit=false
+spring.datasource.hikari.pool-name=HikariPool-${spring.application.name}
+spring.datasource.hikari.data-source-properties.ApplicationName=${spring.application.name}
 spring.jpa.hibernate.ddl-auto=none
 #spring.jpa.properties.hibernate.format_sql=true
 spring.jpa.properties.hibernate.jdbc.time_zone=UTC

jpa/boot-jpa-locks/src/test/java/com/example/locks/SchemaValidationTest.java

@@ -1,14 +1,26 @@
 package com.example.locks;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import com.example.locks.common.ContainersConfig;
+import com.zaxxer.hikari.HikariDataSource;
+import javax.sql.DataSource;
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.boot.testcontainers.context.ImportTestcontainers;
+import org.springframework.context.annotation.Import;
 
-@DataJpaTest(properties = {"spring.jpa.hibernate.ddl-auto=validate", "spring.test.database.replace=none"})
-@ImportTestcontainers(ContainersConfig.class)
+@DataJpaTest(properties = {"spring.jpa.hibernate.ddl-auto=validate"})
+@AutoConfigureTestDatabase
+@Import(ContainersConfig.class)
 class SchemaValidationTest {
 
+    @Autowired
+    private DataSource dataSource;
+
     @Test
-    void validateJpaMappingsWithDbSchema() {}
+    void validateJpaMappingsWithDbSchema() {
+        assertThat(dataSource).isInstanceOf(HikariDataSource.class);
+    }
 }

jpa/boot-jpa-locks/src/test/java/com/example/locks/TestApplication.java

@@ -1,12 +1,15 @@
 package com.example.locks;
 
 import com.example.locks.common.ContainersConfig;
+import com.example.locks.utils.AppConstants;
 import org.springframework.boot.SpringApplication;
 
 public class TestApplication {
 
     public static void main(String[] args) {
-        System.setProperty("spring.profiles.active", "local");
-        SpringApplication.from(Application::main).with(ContainersConfig.class).run(args);
+        SpringApplication.from(Application::main)
+                .with(ContainersConfig.class)
+                .withAdditionalProfiles(AppConstants.PROFILE_LOCAL)
+                .run(args);
     }
 }

jpa/boot-jpa-locks/src/test/java/com/example/locks/common/ContainersConfig.java

@@ -12,6 +12,6 @@ public class ContainersConfig {
     @Bean
     @ServiceConnection
     PostgreSQLContainer<?> postgreSQLContainer() {
-        return new PostgreSQLContainer<>(DockerImageName.parse("postgres").withTag("16.3-alpine"));
+        return new PostgreSQLContainer<>(DockerImageName.parse("postgres").withTag("17.0-alpine"));
     }
 }

jpa/boot-jpa-locks/src/test/java/com/example/locks/web/controllers/MovieControllerTest.java

@@ -33,12 +33,12 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 
 @WebMvcTest(controllers = MovieController.class)
@@ -48,7 +48,7 @@ class MovieControllerTest {
     @Autowired
     private MockMvc mockMvc;
 
-    @MockBean
+    @MockitoBean
     private MovieService movieService;
 
     @Autowired