Merge pull request #106 from Sirz3chs/main

Author: gastaldi

deployment/pom.xml

@@ -30,7 +30,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit5</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -67,5 +67,4 @@
             </plugin>
         </plugins>
     </build>
-
 </project>

deployment/src/test/java/io/quarkiverse/jooq/InjectTest.java

@@ -17,40 +17,31 @@
 import javax.inject.Singleton;
 
 import org.jboss.logging.Logger;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
 
-import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.junit.QuarkusTest;
 
 /**
  *
  * @author <a href="mailto:[email protected]">Leo Tu</a>
  */
 //@Disabled
+@QuarkusTest
 public class InjectTest {
     private static final Logger LOGGER = Logger.getLogger(InjectTest.class);
 
-    @RegisterExtension
-    static final QuarkusUnitTest config = new QuarkusUnitTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) //
-                    .addAsResource("application.properties", "application.properties") //
-                    .addClasses(
-                            TestServiceBean.class,
-                            MyCustomConfigurationFactory.class));
-
     @Inject
     TestServiceBean testBean;
 
     @Order(1)
     @Test
-    public void test1() {
+    public void test1() throws Exception {
         try {
             testBean.action();
         } catch (Exception e) {
             LOGGER.error("", e);
+            throw e;
         }
     }
 

deployment/src/test/java/io/quarkiverse/jooq/JooqTest.java

@@ -20,22 +20,20 @@
 
 import org.h2.tools.Server;
 import org.jboss.logging.Logger;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jooq.DSLContext;
 import org.jooq.impl.DSL;
 import org.junit.jupiter.api.*;
-import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.quarkus.runtime.ShutdownEvent;
 import io.quarkus.runtime.StartupEvent;
-import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.junit.QuarkusTest;
 
 /**
  *
  * @author <a href="mailto:[email protected]">Leo Tu</a>
  */
 //@Disabled
+@QuarkusTest
 public class JooqTest {
     private static final Logger LOGGER = Logger.getLogger(JooqTest.class);
 
@@ -49,7 +47,8 @@ public class JooqTest {
     static public void startDatabase() {
         LOGGER.debug("Start H2 server..." + server);
         try {
-            server = Server.createTcpServer(new String[] { "-trace", "-tcp", "-tcpAllowOthers", "-tcpPort", "19092" })
+            server = Server
+                    .createTcpServer(new String[] { "-ifNotExists", "-trace", "-tcp", "-tcpAllowOthers", "-tcpPort", "19092" })
                     .start();
             Thread.sleep(1000 * 1); // waiting for database to be ready
         } catch (Exception e) {
@@ -74,20 +73,6 @@ static public void stopDatabase() {
         // }
     }
 
-    @Order(10)
-    @RegisterExtension
-    static final QuarkusUnitTest config = new QuarkusUnitTest() //
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) //
-                    .addAsResource("application.properties", "application.properties") //
-                    .addClasses(
-                            TestBean.class,
-                            MyCustomConfigurationFactory.class,
-                            MyCustomConfiguration1.class,
-                            QDemo.class,
-                            RDemo.class,
-                            Public.class,
-                            Demo.class));
-
     @Inject
     TestBean testBean;
 
@@ -102,7 +87,7 @@ static public void stopDatabase() {
     // }
 
     @Test
-    public void test1() {
+    public void test1() throws Exception {
         LOGGER.info("BEGIN test1...");
         try {
             testBean.testConnection();
@@ -120,6 +105,7 @@ public void test1() {
             testBean.testAllService1();
         } catch (Exception e) {
             LOGGER.error("", e);
+            throw e;
         } finally {
             LOGGER.info("END test1.");
         }

deployment/src/test/resources/application.properties

@@ -29,20 +29,20 @@ quarkus.jooq.dsl2.configuration-inject=myCustomConfiguration2
 quarkus.datasource.db-kind=h2
 quarkus.datasource.username=username-default
 quarkus.datasource.password=username-default
-quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost:19092/mem:default;DATABASE_TO_UPPER=FALSE;
+quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost:19092/mem:default;CASE_INSENSITIVE_IDENTIFIERS=TRUE;DATABASE_TO_UPPER=FALSE;
 quarkus.datasource.jdbc.min-size=1
 quarkus.datasource.jdbc.max-size=2
 
 quarkus.datasource.datasource1.db-kind=h2
 quarkus.datasource.datasource1.username=username1
 quarkus.datasource.datasource1.password=username1
-quarkus.datasource.datasource1.jdbc.url=jdbc:h2:tcp://localhost:19092/mem:datasource1;DATABASE_TO_UPPER=FALSE;
+quarkus.datasource.datasource1.jdbc.url=jdbc:h2:tcp://localhost:19092/mem:datasource1;CASE_INSENSITIVE_IDENTIFIERS=TRUE;DATABASE_TO_UPPER=FALSE;
 quarkus.datasource.datasource1.jdbc.min-size=1
 quarkus.datasource.datasource1.jdbc.max-size=2
 
 quarkus.datasource.datasource2.db-kind=h2
 quarkus.datasource.datasource2.username=username2
 quarkus.datasource.datasource2.password=username2
-quarkus.datasource.datasource2.jdbc.url=jdbc:h2:tcp://localhost:19092/mem:datasource2;DATABASE_TO_UPPER=FALSE;
+quarkus.datasource.datasource2.jdbc.url=jdbc:h2:tcp://localhost:19092/mem:datasource2;CASE_INSENSITIVE_IDENTIFIERS=TRUE;DATABASE_TO_UPPER=FALSE;
 quarkus.datasource.datasource2.jdbc.min-size=1
 quarkus.datasource.datasource2.jdbc.max-size=2

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.quarkiverse</groupId>
         <artifactId>quarkiverse-parent</artifactId>
-        <version>8</version>
+        <version>11</version>
     </parent>
 
     <groupId>io.quarkiverse.jooq</groupId>
@@ -18,12 +18,12 @@
     <properties>
         <compiler-plugin.version>3.8.1</compiler-plugin.version>
         <maven.compiler.parameters>true</maven.compiler.parameters>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <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>2.5.1.Final</quarkus.version>
-        <org.jooq.version>3.15.5</org.jooq.version>
+        <quarkus.version>2.14.3.Final</quarkus.version>
+        <org.jooq.version>3.16.11</org.jooq.version>
     </properties>
 
     <scm>

runtime/pom.xml

@@ -47,7 +47,7 @@
         <plugins>
             <plugin>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <artifactId>quarkus-extension-maven-plugin</artifactId>
                 <version>${quarkus.version}</version>
                 <executions>
                     <execution>