From b899ce55fc6044ff0250354e478dc3048e43b8da Mon Sep 17 00:00:00 2001 From: Sergey Beryozkin Date: Thu, 19 Sep 2024 13:38:59 +0100 Subject: [PATCH] Bump Quarkus version to 3.15.0 --- .../integration-tests/pom.xml | 10 ---------- .../src/main/resources/application.properties | 5 +++-- .../filevault/it/FileVaultTestCase.java | 18 ------------------ .../integration-tests/pom.xml | 10 ---------- .../src/main/resources/application.properties | 4 ++-- .../filevault/it/FileVaultTestCase.java | 18 ------------------ pom.xml | 2 +- 7 files changed, 6 insertions(+), 61 deletions(-) diff --git a/file-vault-config-source/integration-tests/pom.xml b/file-vault-config-source/integration-tests/pom.xml index 237bada..426d00b 100644 --- a/file-vault-config-source/integration-tests/pom.xml +++ b/file-vault-config-source/integration-tests/pom.xml @@ -43,16 +43,6 @@ io.quarkus quarkus-jdbc-postgresql - - org.testcontainers - junit-jupiter - test - - - org.testcontainers - postgresql - test - diff --git a/file-vault-config-source/integration-tests/src/main/resources/application.properties b/file-vault-config-source/integration-tests/src/main/resources/application.properties index 17d28c0..ce04d89 100644 --- a/file-vault-config-source/integration-tests/src/main/resources/application.properties +++ b/file-vault-config-source/integration-tests/src/main/resources/application.properties @@ -1,5 +1,6 @@ -quarkus.datasource.db-kind=postgresql -quarkus.datasource.jdbc.url=jdbc:postgresql://localhost/quarkus_test +quarkus.datasource.devservices.username=quarkus_test +quarkus.datasource.devservices.password=quarkus_test + quarkus.datasource.username=quarkus_test quarkus.datasource.password=${quarkus_test} diff --git a/file-vault-config-source/integration-tests/src/test/java/io/quarkiverse/filevault/it/FileVaultTestCase.java b/file-vault-config-source/integration-tests/src/test/java/io/quarkiverse/filevault/it/FileVaultTestCase.java index 44e66dd..21dbf7d 100644 --- a/file-vault-config-source/integration-tests/src/test/java/io/quarkiverse/filevault/it/FileVaultTestCase.java +++ b/file-vault-config-source/integration-tests/src/test/java/io/quarkiverse/filevault/it/FileVaultTestCase.java @@ -5,30 +5,12 @@ import static org.hamcrest.core.IsNot.not; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.PostgreSQLContainer; -import org.testcontainers.junit.jupiter.Container; -import org.testcontainers.junit.jupiter.Testcontainers; - -import com.github.dockerjava.api.model.ExposedPort; -import com.github.dockerjava.api.model.PortBinding; -import com.github.dockerjava.api.model.Ports; import io.quarkus.test.junit.QuarkusTest; -@Testcontainers @QuarkusTest public class FileVaultTestCase { - @Container - public static final PostgreSQLContainer DATABASE = new PostgreSQLContainer<>() - .withDatabaseName("quarkus_test") - .withUsername("quarkus_test") - .withPassword("quarkus_test") - .withExposedPorts(5432) - .withCreateContainerCmdModifier(cmd -> cmd - .withHostName("localhost") - .withPortBindings(new PortBinding(Ports.Binding.bindPort(5432), new ExposedPort(5432)))); - @Test public void testListAllFruits() { //List all, should have all 3 fruits the database has initially: diff --git a/file-vault-credentials-provider/integration-tests/pom.xml b/file-vault-credentials-provider/integration-tests/pom.xml index 9e308bb..924b19b 100644 --- a/file-vault-credentials-provider/integration-tests/pom.xml +++ b/file-vault-credentials-provider/integration-tests/pom.xml @@ -43,16 +43,6 @@ io.quarkus quarkus-jdbc-postgresql - - org.testcontainers - junit-jupiter - test - - - org.testcontainers - postgresql - test - diff --git a/file-vault-credentials-provider/integration-tests/src/main/resources/application.properties b/file-vault-credentials-provider/integration-tests/src/main/resources/application.properties index 2d9e16a..9e932a8 100644 --- a/file-vault-credentials-provider/integration-tests/src/main/resources/application.properties +++ b/file-vault-credentials-provider/integration-tests/src/main/resources/application.properties @@ -1,5 +1,5 @@ -quarkus.datasource.db-kind=postgresql -quarkus.datasource.jdbc.url=jdbc:postgresql://localhost/quarkus_test +quarkus.datasource.devservices.username=quarkus_test +quarkus.datasource.devservices.password=quarkus_test quarkus.datasource.credentials-provider=quarkus.file.vault.provider.db1 quarkus.file.vault.provider.db1.path=dbpasswords.p12 diff --git a/file-vault-credentials-provider/integration-tests/src/test/java/io/quarkiverse/filevault/it/FileVaultTestCase.java b/file-vault-credentials-provider/integration-tests/src/test/java/io/quarkiverse/filevault/it/FileVaultTestCase.java index 44e66dd..21dbf7d 100644 --- a/file-vault-credentials-provider/integration-tests/src/test/java/io/quarkiverse/filevault/it/FileVaultTestCase.java +++ b/file-vault-credentials-provider/integration-tests/src/test/java/io/quarkiverse/filevault/it/FileVaultTestCase.java @@ -5,30 +5,12 @@ import static org.hamcrest.core.IsNot.not; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.PostgreSQLContainer; -import org.testcontainers.junit.jupiter.Container; -import org.testcontainers.junit.jupiter.Testcontainers; - -import com.github.dockerjava.api.model.ExposedPort; -import com.github.dockerjava.api.model.PortBinding; -import com.github.dockerjava.api.model.Ports; import io.quarkus.test.junit.QuarkusTest; -@Testcontainers @QuarkusTest public class FileVaultTestCase { - @Container - public static final PostgreSQLContainer DATABASE = new PostgreSQLContainer<>() - .withDatabaseName("quarkus_test") - .withUsername("quarkus_test") - .withPassword("quarkus_test") - .withExposedPorts(5432) - .withCreateContainerCmdModifier(cmd -> cmd - .withHostName("localhost") - .withPortBindings(new PortBinding(Ports.Binding.bindPort(5432), new ExposedPort(5432)))); - @Test public void testListAllFruits() { //List all, should have all 3 fruits the database has initially: diff --git a/pom.xml b/pom.xml index b4a1579..09bd019 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 11 UTF-8 UTF-8 - 3.0.0.Final + 3.15.0