Support java starting from 11

Donutellko · Donutellko · commit 73ad8df636c0 · 2023-07-03T17:29:44.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
     name: "Build with ${{ matrix.version }}"
     strategy:
       matrix:
-        version: [ 17 ]
+        version: [ 11 ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,7 +11,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '11'
           distribution: 'temurin'
       - name: Publish package
         env:
diff --git a/.sdkmanrc b/.sdkmanrc
@@ -1,2 +1,2 @@
-java=17.0.4-tem
+java=11.0.19-tem
 maven=3.9.1
diff --git a/README.md b/README.md
@@ -23,11 +23,11 @@ by using [Testcontainers](https://www.testcontainers.org/) and applying database
 <project>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
         <testcontainers.version>1.18.3</testcontainers.version>
-        <testcontainers-jooq-codegen-maven-plugin.version>0.0.2</testcontainers-jooq-codegen-maven-plugin.version>
-        <jooq.version>3.18.3</jooq.version>
+        <testcontainers-jooq-codegen-maven-plugin.version>0.0.3</testcontainers-jooq-codegen-maven-plugin.version>
+        <jooq.version>3.16.20</jooq.version>
         <postgresql.version>42.6.0</postgresql.version>
     </properties>
 
diff --git a/examples/mariadb-flyway-example/pom.xml b/examples/mariadb-flyway-example/pom.xml
@@ -10,12 +10,12 @@
     <version>1.0-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</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>
         <testcontainers.version>1.18.3</testcontainers.version>
-        <testcontainers-jooq-codegen-maven-plugin.version>0.0.2</testcontainers-jooq-codegen-maven-plugin.version>
-        <jooq.version>3.18.3</jooq.version>
+        <testcontainers-jooq-codegen-maven-plugin.version>0.0.3</testcontainers-jooq-codegen-maven-plugin.version>
+        <jooq.version>3.16.20</jooq.version>
         <mariadb-java-client.version>3.1.2</mariadb-java-client.version>
     </properties>
 
diff --git a/examples/mysql-flyway-example/pom.xml b/examples/mysql-flyway-example/pom.xml
@@ -10,12 +10,12 @@
     <version>1.0-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</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>
         <testcontainers.version>1.18.3</testcontainers.version>
-        <testcontainers-jooq-codegen-maven-plugin.version>0.0.2</testcontainers-jooq-codegen-maven-plugin.version>
-        <jooq.version>3.18.3</jooq.version>
+        <testcontainers-jooq-codegen-maven-plugin.version>0.0.3</testcontainers-jooq-codegen-maven-plugin.version>
+        <jooq.version>3.16.20</jooq.version>
         <mysql-connector-j.version>8.0.32</mysql-connector-j.version>
     </properties>
 
diff --git a/examples/postgres-flyway-example/pom.xml b/examples/postgres-flyway-example/pom.xml
@@ -10,13 +10,13 @@
     <version>1.0-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</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>
         <testcontainers.version>1.18.3</testcontainers.version>
-        <testcontainers-jooq-codegen-maven-plugin.version>0.0.2
+        <testcontainers-jooq-codegen-maven-plugin.version>0.0.3
         </testcontainers-jooq-codegen-maven-plugin.version>
-        <jooq.version>3.18.3</jooq.version>
+        <jooq.version>3.16.20</jooq.version>
         <postgresql.version>42.6.0</postgresql.version>
     </properties>
 
diff --git a/examples/postgres-liquibase-example/pom.xml b/examples/postgres-liquibase-example/pom.xml
@@ -10,12 +10,12 @@
     <version>1.0-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</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>
         <testcontainers.version>1.18.3</testcontainers.version>
-        <testcontainers-jooq-codegen-maven-plugin.version>0.0.2</testcontainers-jooq-codegen-maven-plugin.version>
-        <jooq.version>3.18.3</jooq.version>
+        <testcontainers-jooq-codegen-maven-plugin.version>0.0.3</testcontainers-jooq-codegen-maven-plugin.version>
+        <jooq.version>3.16.20</jooq.version>
         <postgresql.version>42.6.0</postgresql.version>
     </properties>
 
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>org.testcontainers</groupId>
     <artifactId>testcontainers-jooq-codegen-maven-plugin</artifactId>
-    <version>0.0.2</version>
+    <version>0.0.3</version>
     <packaging>maven-plugin</packaging>
     <name>testcontainers-jooq-codegen-maven-plugin</name>
     <description>jOOQ code generator using Testcontainers</description>
@@ -46,7 +46,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>17</java.version>
+		<java.version>11</java.version>
 		<spotless-maven-plugin.version>2.36.0</spotless-maven-plugin.version>
 		<maven-plugin-api.version>3.9.0</maven-plugin-api.version>
 		<maven-plugin-annotations.version>3.8.1</maven-plugin-annotations.version>
@@ -61,7 +61,7 @@
 		<flyway-core.version>9.16.3</flyway-core.version>
 		<liquibase-core.version>4.22.0</liquibase-core.version>
 		<junit-jupiter.version>5.9.3</junit-jupiter.version>
-		<jooq.version>3.18.3</jooq.version>
+		<jooq.version>3.16.20</jooq.version>
 		<junit.version>4.13.2</junit.version>
 		<postgresql.version>42.6.0</postgresql.version>
 		<mysql-connector-j.version>8.0.32</mysql-connector-j.version>
diff --git a/src/main/java/org/testcontainers/jooq/codegen/Plugin.java b/src/main/java/org/testcontainers/jooq/codegen/Plugin.java
@@ -84,10 +84,8 @@ private void doExecute(URLClassLoader mavenClassloader, TargetDatasource targetD
         final var oFlyway = Optional.<MigrationRunner>ofNullable(flyway);
         final var oLiquibase = Optional.<MigrationRunner>ofNullable(liquibase);
         if (bothPresent(oFlyway, oLiquibase)) {
-            getLog().error(
-                            """
-                            Incorrect configuration is provided.Plugin supports only one migration tool.
-                            Please remain only flyway or liquibase.""");
+            getLog().error("Incorrect configuration is provided.Plugin supports only one migration tool.\n"
+                    + "Please remain only flyway or liquibase.");
             throw new MojoExecutionException(
                     "Both configurations for migration tool are provided, pick either flyway or liquibase");
         }
diff --git a/src/main/java/org/testcontainers/jooq/codegen/database/DatabaseProvider.java b/src/main/java/org/testcontainers/jooq/codegen/database/DatabaseProvider.java
@@ -13,12 +13,20 @@ public class DatabaseProvider {
     public static JdbcDatabaseContainer<?> getDatabaseContainer(DatabaseProps props) {
         DatabaseType dbType = props.getType();
         String image = Optional.ofNullable(props.getContainerImage()).orElse(dbType.getDefaultImage());
-        JdbcDatabaseContainer<?> container =
-                switch (dbType) {
-                    case POSTGRES -> new PostgreSQLContainer<>(image);
-                    case MARIADB -> new MariaDBContainer<>(image);
-                    case MYSQL -> new MySQLContainer<>(image);
-                };
+        JdbcDatabaseContainer<?> container;
+        switch (dbType) {
+            case POSTGRES:
+                container = new PostgreSQLContainer<>(image);
+                break;
+            case MARIADB:
+                container = new MariaDBContainer<>(image);
+                break;
+            case MYSQL:
+                container = new MySQLContainer<>(image);
+                break;
+            default:
+                throw new IllegalArgumentException(String.format("Unknown DatabaseType: %s.", dbType));
+        }
         if (isNotEmpty(props.getUsername())) {
             container.withUsername(props.getUsername());
         }
diff --git a/src/main/java/org/testcontainers/jooq/codegen/jooq/JooqGenerator.java b/src/main/java/org/testcontainers/jooq/codegen/jooq/JooqGenerator.java
@@ -64,13 +64,10 @@ private void checkGeneratorArguments(JooqProps jooq, Log log) throws MojoExecuti
         }
 
         log.error("Incorrect configuration of jOOQ code generation tool");
-        log.error(
-                """
-                        The jOOQ-codegen-maven module's generator configuration is not set up correctly.
-                        This can have a variety of reasons, among which:
-                        - Your pom.xml's <configuration> contains invalid XML according to %s
-                        - There is a version or artifact mismatch between your pom.xml and your commandline"""
-                        .formatted(XSD_CODEGEN));
+        log.error(String.format("The jOOQ-codegen-maven module's generator configuration is not set up correctly.\n"
+                + "This can have a variety of reasons, among which:\n"
+                + "- Your pom.xml's <configuration> contains invalid XML according to %s\n"
+                + "- There is a version or artifact mismatch between your pom.xml and your commandline\n", XSD_CODEGEN));
 
         throw new MojoExecutionException(
                 "Incorrect configuration of jOOQ code generation tool. See error above for details.");
diff --git a/src/test/java/org/testcontainers/jooq/codegen/PluginTest.java b/src/test/java/org/testcontainers/jooq/codegen/PluginTest.java
@@ -76,7 +76,7 @@ public void testMariadbLiquibase() throws Exception {
     }
 
     private MavenProject getMavenProject(String dirName) throws Exception {
-        var baseDir = getTestFile("src/test/resources/pom/%s".formatted(dirName));
+        var baseDir = getTestFile(String.format("src/test/resources/pom/%s", dirName));
         var mavenProject = mojoRule.readMavenProject(baseDir);
         mojoRule.getContainer().addComponent(mavenProject, MavenProject.class, "");
         return mavenProject;
diff --git a/src/test/resources/pom/mariadb-liquibase/pom.xml b/src/test/resources/pom/mariadb-liquibase/pom.xml
@@ -9,11 +9,11 @@
     <version>0.0.1-SNAPSHOT</version>
 
     <properties>
-        <java.version>17</java.version>
+        <java.version>11</java.version>
         <testcontainers.version>1.18.3</testcontainers.version>
-        <testcontainers-jooq-codegen-maven-plugin.version>0.0.2
+        <testcontainers-jooq-codegen-maven-plugin.version>0.0.3
         </testcontainers-jooq-codegen-maven-plugin.version>
-        <jooq.version>3.18.3</jooq.version>
+        <jooq.version>3.16.20</jooq.version>
         <postgresql.version>42.6.0</postgresql.version>
     </properties>
 
diff --git a/src/test/resources/pom/mysql-flyway/pom.xml b/src/test/resources/pom/mysql-flyway/pom.xml
@@ -9,11 +9,11 @@
     <version>0.0.1-SNAPSHOT</version>
 
     <properties>
-        <java.version>17</java.version>
+        <java.version>11</java.version>
         <testcontainers.version>1.18.3</testcontainers.version>
-        <testcontainers-jooq-codegen-maven-plugin.version>0.0.2
+        <testcontainers-jooq-codegen-maven-plugin.version>0.0.3
         </testcontainers-jooq-codegen-maven-plugin.version>
-        <jooq.version>3.18.3</jooq.version>
+        <jooq.version>3.16.20</jooq.version>
         <postgresql.version>42.6.0</postgresql.version>
     </properties>
 
diff --git a/src/test/resources/pom/postgres-flyway/pom.xml b/src/test/resources/pom/postgres-flyway/pom.xml
@@ -9,10 +9,10 @@
     <version>0.0.1-SNAPSHOT</version>
 
     <properties>
-        <java.version>17</java.version>
+        <java.version>11</java.version>
         <testcontainers.version>1.18.3</testcontainers.version>
-        <testcontainers-jooq-codegen-maven-plugin.version>0.0.2</testcontainers-jooq-codegen-maven-plugin.version>
-        <jooq.version>3.18.3</jooq.version>
+        <testcontainers-jooq-codegen-maven-plugin.version>0.0.3</testcontainers-jooq-codegen-maven-plugin.version>
+        <jooq.version>3.16.20</jooq.version>
         <postgresql.version>42.6.0</postgresql.version>
     </properties>
 
diff --git a/src/test/resources/pom/postgres-liquibase/pom.xml b/src/test/resources/pom/postgres-liquibase/pom.xml
@@ -9,10 +9,10 @@
     <version>0.0.1-SNAPSHOT</version>
 
     <properties>
-        <java.version>17</java.version>
+        <java.version>11</java.version>
         <testcontainers.version>1.18.3</testcontainers.version>
-        <testcontainers-jooq-codegen-maven-plugin.version>0.0.2</testcontainers-jooq-codegen-maven-plugin.version>
-        <jooq.version>3.18.3</jooq.version>
+        <testcontainers-jooq-codegen-maven-plugin.version>0.0.3</testcontainers-jooq-codegen-maven-plugin.version>
+        <jooq.version>3.16.20</jooq.version>
         <postgresql.version>42.6.0</postgresql.version>
     </properties>
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-java=17.0.4-tem`
	`1`	`+java=11.0.19-tem`
`2`	`2`	`maven=3.9.1`