diff --git a/.env.template b/.env.template index 1a16761..a1e3ad5 100644 --- a/.env.template +++ b/.env.template @@ -8,3 +8,8 @@ LB_CHANGELOG=your_changelog_file.yaml LB_OUTPUT_CHANGELOG=your_output_changelog.yaml LB_DRIVER=your_jdbc_driver_class LB_SCHEMA=your_database_schema + +#H2 configuration +H2_URL=your_h2_url +H2_USERNAME=your_h2_username +H2_PASSWORD=your_h2_password diff --git a/docker-compose.yml b/docker-compose.yml index 1d9ab49..93fac5a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,6 @@ -version: '3.8' - services: postgres: - image: postgres:17.9-alpine + image: postgres:17-alpine container_name: xpeho_postgres environment: POSTGRES_USER: ${POSTGRES_USER} diff --git a/pom.xml b/pom.xml index 78935eb..4927ad8 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 25 - 1.19.8 + 2.0.4 false **/*Application.java **/feature/SpringIntegrationTest.java @@ -137,12 +137,12 @@ org.testcontainers - junit-jupiter + testcontainers-junit-jupiter test org.testcontainers - postgresql + testcontainers-postgresql test diff --git a/src/test/java/com/xpeho/spring_boot_java_random_user/presentation/UserGetByIdContainerTest.java b/src/test/java/com/xpeho/spring_boot_java_random_user/presentation/UserGetByIdContainerTest.java index 6cc7881..85d78bf 100644 --- a/src/test/java/com/xpeho/spring_boot_java_random_user/presentation/UserGetByIdContainerTest.java +++ b/src/test/java/com/xpeho/spring_boot_java_random_user/presentation/UserGetByIdContainerTest.java @@ -13,8 +13,8 @@ import org.springframework.boot.resttestclient.TestRestTemplate; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.test.context.ActiveProfiles; -import org.testcontainers.containers.PostgreSQLContainer; + +import org.testcontainers.postgresql.PostgreSQLContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; @@ -22,7 +22,6 @@ @Testcontainers @AutoConfigureTestRestTemplate -@ActiveProfiles("test") @SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = { @@ -34,7 +33,7 @@ class UserGetByIdContainerTest { @Container @ServiceConnection - static PostgreSQLContainer postgres = new PostgreSQLContainer<>("postgres:16-alpine"); + static PostgreSQLContainer postgres = new PostgreSQLContainer("postgres:17-alpine"); @Autowired private TestRestTemplate restTemplate;