Skip to content

Update testcontainers to 2.0.2 for Docker API 1.44 support #53

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.

Sign up for GitHub

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

Open
mattjohnson wants to merge 1 commit into
base: main
Choose a base branch
from
+40 −18
Open

Update testcontainers to 2.0.2 for Docker API 1.44 support #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>17</java.version>
<spotless-maven-plugin.version>2.36.0</spotless-maven-plugin.version>
<spotless-maven-plugin.version>2.44.5</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>
<maven-project.version>2.2.1</maven-project.version>
Expand All @@ -57,7 +57,7 @@
<maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
<maven-plugin-plugin.version>3.6.0</maven-plugin-plugin.version>
<maven-plugin-tools-annotations.version>3.6.1</maven-plugin-tools-annotations.version>
<testcontainers.version>1.19.1</testcontainers.version>
<testcontainers.version>2.0.2</testcontainers.version>
<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>
Expand All @@ -69,7 +69,7 @@
<assertj-core.version>3.24.2</assertj-core.version>
<maven-plugin-testing-harness.version>3.3.0</maven-plugin-testing-harness.version>
<junit-vintage-engine.version>5.9.3</junit-vintage-engine.version>
<lombok.version>1.18.26</lombok.version>
<lombok.version>1.18.38</lombok.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -118,7 +118,7 @@
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>jdbc</artifactId>
<artifactId>testcontainers-jdbc</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand All @@ -145,15 +145,15 @@

<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>postgresql</artifactId>
<artifactId>testcontainers-postgresql</artifactId>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>mysql</artifactId>
<artifactId>testcontainers-mysql</artifactId>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>mariadb</artifactId>
<artifactId>testcontainers-mariadb</artifactId>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
Expand Down Expand Up @@ -210,6 +210,16 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.18.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.17.0</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -258,7 +268,7 @@
<importOrder/>
<removeUnusedImports/>
<palantirJavaFormat>
<version>2.30.0</version>
<version>2.68.0</version>
</palantirJavaFormat>
<formatAnnotations/>
</java>
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/org/testcontainers/jooq/codegen/database/DatabaseProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ public static JdbcDatabaseContainer<?> getDatabaseContainer(DatabaseProps props)
String image = Optional.ofNullable(props.getContainerImage()).orElse(dbType.getDefaultImage());
JdbcDatabaseContainer<?> container =
switch (dbType) {
case POSTGRES -> new PostgreSQLContainer<>(
DockerImageName.parse(image).asCompatibleSubstituteFor("postgres"));
case MARIADB -> new MariaDBContainer<>(
DockerImageName.parse(image).asCompatibleSubstituteFor("mariadb"));
case MYSQL -> new MySQLContainer<>(
DockerImageName.parse(image).asCompatibleSubstituteFor("mysql"));
case POSTGRES ->
new PostgreSQLContainer<>(DockerImageName.parse(image).asCompatibleSubstituteFor("postgres"));
case MARIADB ->
new MariaDBContainer<>(DockerImageName.parse(image).asCompatibleSubstituteFor("mariadb"));
case MYSQL ->
new MySQLContainer<>(DockerImageName.parse(image).asCompatibleSubstituteFor("mysql"));
};
if (isNotEmpty(props.getUsername())) {
container.withUsername(props.getUsername());
Expand Down
20 changes: 16 additions & 4 deletions src/main/java/org/testcontainers/jooq/codegen/datasource/ContainerTargetDatasource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import java.sql.Driver;
import java.util.Objects;
import lombok.experimental.Delegate;
import org.testcontainers.containers.JdbcDatabaseContainer;
import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy;

Expand All @@ -11,10 +10,8 @@
*/
public final class ContainerTargetDatasource implements TargetDatasource {
/**
* Getting datasource properties from container, auto stopping container <br/>
* {@link AutoCloseable} is implemented by container and {@code close()} delegated to {@code container.stop()}
* Getting datasource properties from container, auto stopping container
*/
@Delegate
private final JdbcDatabaseContainer<?> container;

public ContainerTargetDatasource(JdbcDatabaseContainer<?> container) {
Expand All @@ -28,8 +25,23 @@ public String getUrl() {
return container.getJdbcUrl();
}

@Override
public String getUsername() {
return container.getUsername();
}

@Override
public String getPassword() {
return container.getPassword();
}

@Override
public Driver getDriverInstance() {
return container.getJdbcDriverInstance();
}

@Override
public void close() throws Exception {
container.stop();
}
}