Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

migrate to java 11 #22

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .sdkmanrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
java=17.0.4-tem
java=11.0.19-tem
maven=3.9.1
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
8 changes: 4 additions & 4 deletions examples/mariadb-flyway-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
8 changes: 4 additions & 4 deletions examples/mysql-flyway-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
8 changes: 4 additions & 4 deletions examples/postgres-flyway-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
8 changes: 4 additions & 4 deletions examples/postgres-liquibase-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/org/testcontainers/jooq/codegen/Plugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/test/resources/pom/mariadb-liquibase/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 3 additions & 3 deletions src/test/resources/pom/mysql-flyway/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 3 additions & 3 deletions src/test/resources/pom/postgres-flyway/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 3 additions & 3 deletions src/test/resources/pom/postgres-liquibase/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down