Merge pull request #110 from sberyozkin/quarkus_3.15

Bump Quarkus version to 3.15.0
quarkiverse · Sep 19, 2024 · d4ddf10 · d4ddf10
2 parents d0c7c1a + b899ce5
commit d4ddf10
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 61 deletions.
diff --git a/file-vault-config-source/integration-tests/pom.xml b/file-vault-config-source/integration-tests/pom.xml
@@ -43,16 +43,6 @@
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-jdbc-postgresql</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.testcontainers</groupId>
-      <artifactId>junit-jupiter</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.testcontainers</groupId>
-      <artifactId>postgresql</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   <build>
     <plugins>

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
@@ -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/...source/integration-tests/src/test/java/io/quarkiverse/filevault/it/FileVaultTestCase.java b/...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
@@ -43,16 +43,6 @@
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-jdbc-postgresql</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.testcontainers</groupId>
-      <artifactId>junit-jupiter</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.testcontainers</groupId>
-      <artifactId>postgresql</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   <build>
     <plugins>

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
@@ -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/...ovider/integration-tests/src/test/java/io/quarkiverse/filevault/it/FileVaultTestCase.java b/...ovider/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
@@ -29,7 +29,7 @@
     <maven.compiler.target>11</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <quarkus.version>3.0.0.Final</quarkus.version>
+    <quarkus.version>3.15.0</quarkus.version>
   </properties>
   <dependencyManagement>
     <dependencies>