Skip to content

Commit 73ad8df

Browse files
DonutellkoDonutellko
committed
Support java starting from 11
1 parent 7bc9033 commit 73ad8df

File tree

17 files changed

+59
-56
lines changed

17 files changed

+59
-56
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
name: "Build with ${{ matrix.version }}"
1515
strategy:
1616
matrix:
17-
version: [ 17 ]
17+
version: [ 11 ]
1818
runs-on: ubuntu-latest
1919
steps:
2020
- uses: actions/checkout@v3

‎.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- name: Set up Java
1212
uses: actions/setup-java@v3
1313
with:
14-
java-version: '17'
14+
java-version: '11'
1515
distribution: 'temurin'
1616
- name: Publish package
1717
env:

‎.sdkmanrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
java=17.0.4-tem
1+
java=11.0.19-tem
22
maven=3.9.1

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ by using [Testcontainers](https://www.testcontainers.org/) and applying database
2323
<project>
2424
<properties>
2525
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
26-
<maven.compiler.source>17</maven.compiler.source>
27-
<maven.compiler.target>17</maven.compiler.target>
26+
<maven.compiler.source>11</maven.compiler.source>
27+
<maven.compiler.target>11</maven.compiler.target>
2828
<testcontainers.version>1.18.3</testcontainers.version>
29-
<testcontainers-jooq-codegen-maven-plugin.version>0.0.2</testcontainers-jooq-codegen-maven-plugin.version>
30-
<jooq.version>3.18.3</jooq.version>
29+
<testcontainers-jooq-codegen-maven-plugin.version>0.0.3</testcontainers-jooq-codegen-maven-plugin.version>
30+
<jooq.version>3.16.20</jooq.version>
3131
<postgresql.version>42.6.0</postgresql.version>
3232
</properties>
3333

‎examples/mariadb-flyway-example/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
<version>1.0-SNAPSHOT</version>
1111

1212
<properties>
13-
<maven.compiler.source>17</maven.compiler.source>
14-
<maven.compiler.target>17</maven.compiler.target>
13+
<maven.compiler.source>11</maven.compiler.source>
14+
<maven.compiler.target>11</maven.compiler.target>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
<testcontainers.version>1.18.3</testcontainers.version>
17-
<testcontainers-jooq-codegen-maven-plugin.version>0.0.2</testcontainers-jooq-codegen-maven-plugin.version>
18-
<jooq.version>3.18.3</jooq.version>
17+
<testcontainers-jooq-codegen-maven-plugin.version>0.0.3</testcontainers-jooq-codegen-maven-plugin.version>
18+
<jooq.version>3.16.20</jooq.version>
1919
<mariadb-java-client.version>3.1.2</mariadb-java-client.version>
2020
</properties>
2121

‎examples/mysql-flyway-example/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
<version>1.0-SNAPSHOT</version>
1111

1212
<properties>
13-
<maven.compiler.source>17</maven.compiler.source>
14-
<maven.compiler.target>17</maven.compiler.target>
13+
<maven.compiler.source>11</maven.compiler.source>
14+
<maven.compiler.target>11</maven.compiler.target>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
<testcontainers.version>1.18.3</testcontainers.version>
17-
<testcontainers-jooq-codegen-maven-plugin.version>0.0.2</testcontainers-jooq-codegen-maven-plugin.version>
18-
<jooq.version>3.18.3</jooq.version>
17+
<testcontainers-jooq-codegen-maven-plugin.version>0.0.3</testcontainers-jooq-codegen-maven-plugin.version>
18+
<jooq.version>3.16.20</jooq.version>
1919
<mysql-connector-j.version>8.0.32</mysql-connector-j.version>
2020
</properties>
2121

‎examples/postgres-flyway-example/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
<version>1.0-SNAPSHOT</version>
1111

1212
<properties>
13-
<maven.compiler.source>17</maven.compiler.source>
14-
<maven.compiler.target>17</maven.compiler.target>
13+
<maven.compiler.source>11</maven.compiler.source>
14+
<maven.compiler.target>11</maven.compiler.target>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
<testcontainers.version>1.18.3</testcontainers.version>
17-
<testcontainers-jooq-codegen-maven-plugin.version>0.0.2
17+
<testcontainers-jooq-codegen-maven-plugin.version>0.0.3
1818
</testcontainers-jooq-codegen-maven-plugin.version>
19-
<jooq.version>3.18.3</jooq.version>
19+
<jooq.version>3.16.20</jooq.version>
2020
<postgresql.version>42.6.0</postgresql.version>
2121
</properties>
2222

‎examples/postgres-liquibase-example/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
<version>1.0-SNAPSHOT</version>
1111

1212
<properties>
13-
<maven.compiler.source>17</maven.compiler.source>
14-
<maven.compiler.target>17</maven.compiler.target>
13+
<maven.compiler.source>11</maven.compiler.source>
14+
<maven.compiler.target>11</maven.compiler.target>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
<testcontainers.version>1.18.3</testcontainers.version>
17-
<testcontainers-jooq-codegen-maven-plugin.version>0.0.2</testcontainers-jooq-codegen-maven-plugin.version>
18-
<jooq.version>3.18.3</jooq.version>
17+
<testcontainers-jooq-codegen-maven-plugin.version>0.0.3</testcontainers-jooq-codegen-maven-plugin.version>
18+
<jooq.version>3.16.20</jooq.version>
1919
<postgresql.version>42.6.0</postgresql.version>
2020
</properties>
2121

‎pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<groupId>org.testcontainers</groupId>
99
<artifactId>testcontainers-jooq-codegen-maven-plugin</artifactId>
10-
<version>0.0.2</version>
10+
<version>0.0.3</version>
1111
<packaging>maven-plugin</packaging>
1212
<name>testcontainers-jooq-codegen-maven-plugin</name>
1313
<description>jOOQ code generator using Testcontainers</description>
@@ -46,7 +46,7 @@
4646
<properties>
4747
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4848
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
49-
<java.version>17</java.version>
49+
<java.version>11</java.version>
5050
<spotless-maven-plugin.version>2.36.0</spotless-maven-plugin.version>
5151
<maven-plugin-api.version>3.9.0</maven-plugin-api.version>
5252
<maven-plugin-annotations.version>3.8.1</maven-plugin-annotations.version>
@@ -61,7 +61,7 @@
6161
<flyway-core.version>9.16.3</flyway-core.version>
6262
<liquibase-core.version>4.22.0</liquibase-core.version>
6363
<junit-jupiter.version>5.9.3</junit-jupiter.version>
64-
<jooq.version>3.18.3</jooq.version>
64+
<jooq.version>3.16.20</jooq.version>
6565
<junit.version>4.13.2</junit.version>
6666
<postgresql.version>42.6.0</postgresql.version>
6767
<mysql-connector-j.version>8.0.32</mysql-connector-j.version>

‎src/main/java/org/testcontainers/jooq/codegen/Plugin.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,8 @@ private void doExecute(URLClassLoader mavenClassloader, TargetDatasource targetD
8484
final var oFlyway = Optional.<MigrationRunner>ofNullable(flyway);
8585
final var oLiquibase = Optional.<MigrationRunner>ofNullable(liquibase);
8686
if (bothPresent(oFlyway, oLiquibase)) {
87-
getLog().error(
88-
"""
89-
Incorrect configuration is provided.Plugin supports only one migration tool.
90-
Please remain only flyway or liquibase.""");
87+
getLog().error("Incorrect configuration is provided.Plugin supports only one migration tool.\n"
88+
+ "Please remain only flyway or liquibase.");
9189
throw new MojoExecutionException(
9290
"Both configurations for migration tool are provided, pick either flyway or liquibase");
9391
}

‎src/main/java/org/testcontainers/jooq/codegen/database/DatabaseProvider.java

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,20 @@ public class DatabaseProvider {
1313
public static JdbcDatabaseContainer<?> getDatabaseContainer(DatabaseProps props) {
1414
DatabaseType dbType = props.getType();
1515
String image = Optional.ofNullable(props.getContainerImage()).orElse(dbType.getDefaultImage());
16-
JdbcDatabaseContainer<?> container =
17-
switch (dbType) {
18-
case POSTGRES -> new PostgreSQLContainer<>(image);
19-
case MARIADB -> new MariaDBContainer<>(image);
20-
case MYSQL -> new MySQLContainer<>(image);
21-
};
16+
JdbcDatabaseContainer<?> container;
17+
switch (dbType) {
18+
case POSTGRES:
19+
container = new PostgreSQLContainer<>(image);
20+
break;
21+
case MARIADB:
22+
container = new MariaDBContainer<>(image);
23+
break;
24+
case MYSQL:
25+
container = new MySQLContainer<>(image);
26+
break;
27+
default:
28+
throw new IllegalArgumentException(String.format("Unknown DatabaseType: %s.", dbType));
29+
}
2230
if (isNotEmpty(props.getUsername())) {
2331
container.withUsername(props.getUsername());
2432
}

‎src/main/java/org/testcontainers/jooq/codegen/jooq/JooqGenerator.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,10 @@ private void checkGeneratorArguments(JooqProps jooq, Log log) throws MojoExecuti
6464
}
6565

6666
log.error("Incorrect configuration of jOOQ code generation tool");
67-
log.error(
68-
"""
69-
The jOOQ-codegen-maven module's generator configuration is not set up correctly.
70-
This can have a variety of reasons, among which:
71-
- Your pom.xml's <configuration> contains invalid XML according to %s
72-
- There is a version or artifact mismatch between your pom.xml and your commandline"""
73-
.formatted(XSD_CODEGEN));
67+
log.error(String.format("The jOOQ-codegen-maven module's generator configuration is not set up correctly.\n"
68+
+ "This can have a variety of reasons, among which:\n"
69+
+ "- Your pom.xml's <configuration> contains invalid XML according to %s\n"
70+
+ "- There is a version or artifact mismatch between your pom.xml and your commandline\n", XSD_CODEGEN));
7471

7572
throw new MojoExecutionException(
7673
"Incorrect configuration of jOOQ code generation tool. See error above for details.");

‎src/test/java/org/testcontainers/jooq/codegen/PluginTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public void testMariadbLiquibase() throws Exception {
7676
}
7777

7878
private MavenProject getMavenProject(String dirName) throws Exception {
79-
var baseDir = getTestFile("src/test/resources/pom/%s".formatted(dirName));
79+
var baseDir = getTestFile(String.format("src/test/resources/pom/%s", dirName));
8080
var mavenProject = mojoRule.readMavenProject(baseDir);
8181
mojoRule.getContainer().addComponent(mavenProject, MavenProject.class, "");
8282
return mavenProject;

‎src/test/resources/pom/mariadb-liquibase/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
<version>0.0.1-SNAPSHOT</version>
1010

1111
<properties>
12-
<java.version>17</java.version>
12+
<java.version>11</java.version>
1313
<testcontainers.version>1.18.3</testcontainers.version>
14-
<testcontainers-jooq-codegen-maven-plugin.version>0.0.2
14+
<testcontainers-jooq-codegen-maven-plugin.version>0.0.3
1515
</testcontainers-jooq-codegen-maven-plugin.version>
16-
<jooq.version>3.18.3</jooq.version>
16+
<jooq.version>3.16.20</jooq.version>
1717
<postgresql.version>42.6.0</postgresql.version>
1818
</properties>
1919

‎src/test/resources/pom/mysql-flyway/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
<version>0.0.1-SNAPSHOT</version>
1010

1111
<properties>
12-
<java.version>17</java.version>
12+
<java.version>11</java.version>
1313
<testcontainers.version>1.18.3</testcontainers.version>
14-
<testcontainers-jooq-codegen-maven-plugin.version>0.0.2
14+
<testcontainers-jooq-codegen-maven-plugin.version>0.0.3
1515
</testcontainers-jooq-codegen-maven-plugin.version>
16-
<jooq.version>3.18.3</jooq.version>
16+
<jooq.version>3.16.20</jooq.version>
1717
<postgresql.version>42.6.0</postgresql.version>
1818
</properties>
1919

‎src/test/resources/pom/postgres-flyway/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
<version>0.0.1-SNAPSHOT</version>
1010

1111
<properties>
12-
<java.version>17</java.version>
12+
<java.version>11</java.version>
1313
<testcontainers.version>1.18.3</testcontainers.version>
14-
<testcontainers-jooq-codegen-maven-plugin.version>0.0.2</testcontainers-jooq-codegen-maven-plugin.version>
15-
<jooq.version>3.18.3</jooq.version>
14+
<testcontainers-jooq-codegen-maven-plugin.version>0.0.3</testcontainers-jooq-codegen-maven-plugin.version>
15+
<jooq.version>3.16.20</jooq.version>
1616
<postgresql.version>42.6.0</postgresql.version>
1717
</properties>
1818

‎src/test/resources/pom/postgres-liquibase/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
<version>0.0.1-SNAPSHOT</version>
1010

1111
<properties>
12-
<java.version>17</java.version>
12+
<java.version>11</java.version>
1313
<testcontainers.version>1.18.3</testcontainers.version>
14-
<testcontainers-jooq-codegen-maven-plugin.version>0.0.2</testcontainers-jooq-codegen-maven-plugin.version>
15-
<jooq.version>3.18.3</jooq.version>
14+
<testcontainers-jooq-codegen-maven-plugin.version>0.0.3</testcontainers-jooq-codegen-maven-plugin.version>
15+
<jooq.version>3.16.20</jooq.version>
1616
<postgresql.version>42.6.0</postgresql.version>
1717
</properties>
1818

0 commit comments

Comments
 (0)