This is an automated email from the ASF dual-hosted git repository.
gian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new b43ac57206a Update to testcontainers 2.x and update various images.
(#18945)
b43ac57206a is described below
commit b43ac57206a2e8b56e663890a71916dfc51cd3eb
Author: Gian Merlino <[email protected]>
AuthorDate: Fri Jan 23 08:43:45 2026 -0800
Update to testcontainers 2.x and update various images. (#18945)
This patch updates to testcontainers 2.x, which improves compatibility
with newer versions of Docker. It also updates most images to the latest
versions available. PostgreSQL and MariaDB remain on 16 and 11, however.
---
embedded-tests/pom.xml | 14 +++++++-------
.../druid/testing/embedded/auth/LdapAuthResource.java | 2 +-
.../druid/testing/embedded/azure/AzureStorageResource.java | 2 +-
.../embedded/indexing/KafkaSchemaRegistryResource.java | 2 +-
.../druid/testing/embedded/k8s/K3sClusterResource.java | 2 +-
.../testing/embedded/mariadb/MariaDBMetadataResource.java | 8 ++++----
.../testing/embedded/psql/PostgreSQLMetadataResource.java | 8 ++++----
extensions-core/kafka-indexing-service/pom.xml | 2 +-
.../druid/indexing/kafka/simulate/KafkaResource.java | 2 +-
extensions-core/s3-extensions/pom.xml | 4 ++--
licenses.yaml | 2 +-
pom.xml | 4 ++--
services/pom.xml | 4 ++--
.../druid/testing/embedded/TestcontainerResourceTest.java | 8 ++++----
14 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/embedded-tests/pom.xml b/embedded-tests/pom.xml
index e37426263aa..63782673dfe 100644
--- a/embedded-tests/pom.xml
+++ b/embedded-tests/pom.xml
@@ -416,25 +416,25 @@
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>mariadb</artifactId>
+ <artifactId>testcontainers-mariadb</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>postgresql</artifactId>
+ <artifactId>testcontainers-postgresql</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>kafka</artifactId>
+ <artifactId>testcontainers-kafka</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>k3s</artifactId>
+ <artifactId>testcontainers-k3s</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
@@ -446,19 +446,19 @@
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>minio</artifactId>
+ <artifactId>testcontainers-minio</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>redpanda</artifactId>
+ <artifactId>testcontainers-redpanda</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>azure</artifactId>
+ <artifactId>testcontainers-azure</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
diff --git
a/embedded-tests/src/test/java/org/apache/druid/testing/embedded/auth/LdapAuthResource.java
b/embedded-tests/src/test/java/org/apache/druid/testing/embedded/auth/LdapAuthResource.java
index ada03a80272..4bd58885321 100644
---
a/embedded-tests/src/test/java/org/apache/druid/testing/embedded/auth/LdapAuthResource.java
+++
b/embedded-tests/src/test/java/org/apache/druid/testing/embedded/auth/LdapAuthResource.java
@@ -36,7 +36,7 @@ import java.util.List;
*/
public class LdapAuthResource extends
TestcontainerResource<GenericContainer<?>>
{
- private static final String IMAGE_NAME = "osixia/openldap:1.4.0";
+ private static final String IMAGE_NAME = "osixia/openldap:1.5.0";
public static final String ADMIN_PASSWORD = "priest";
public static final String SYSTEM_PASSWORD = "warlock";
diff --git
a/embedded-tests/src/test/java/org/apache/druid/testing/embedded/azure/AzureStorageResource.java
b/embedded-tests/src/test/java/org/apache/druid/testing/embedded/azure/AzureStorageResource.java
index 5a27c825375..5459456b728 100644
---
a/embedded-tests/src/test/java/org/apache/druid/testing/embedded/azure/AzureStorageResource.java
+++
b/embedded-tests/src/test/java/org/apache/druid/testing/embedded/azure/AzureStorageResource.java
@@ -33,7 +33,7 @@ import org.testcontainers.utility.DockerImageName;
*/
public class AzureStorageResource extends
TestcontainerResource<AzuriteContainer>
{
- private static final String IMAGE_NAME =
"mcr.microsoft.com/azure-storage/azurite:3.33.0";
+ private static final String IMAGE_NAME =
"mcr.microsoft.com/azure-storage/azurite:3.35.0";
/**
* Default account name used by the {@link AzuriteContainer}.
diff --git
a/embedded-tests/src/test/java/org/apache/druid/testing/embedded/indexing/KafkaSchemaRegistryResource.java
b/embedded-tests/src/test/java/org/apache/druid/testing/embedded/indexing/KafkaSchemaRegistryResource.java
index 3583eeb5557..4416bc4180f 100644
---
a/embedded-tests/src/test/java/org/apache/druid/testing/embedded/indexing/KafkaSchemaRegistryResource.java
+++
b/embedded-tests/src/test/java/org/apache/druid/testing/embedded/indexing/KafkaSchemaRegistryResource.java
@@ -33,7 +33,7 @@ import org.testcontainers.redpanda.RedpandaContainer;
*/
public class KafkaSchemaRegistryResource extends
TestcontainerResource<RedpandaContainer>
{
- private static final String SCHEMA_REGISTRY_IMAGE =
"docker.redpanda.com/redpandadata/redpanda:v25.2.2";
+ private static final String SCHEMA_REGISTRY_IMAGE =
"docker.redpanda.com/redpandadata/redpanda:v25.3.5";
private static final int SCHEMA_REGISTRY_PORT = 8081;
private final KafkaResource kafkaResource;
diff --git
a/embedded-tests/src/test/java/org/apache/druid/testing/embedded/k8s/K3sClusterResource.java
b/embedded-tests/src/test/java/org/apache/druid/testing/embedded/k8s/K3sClusterResource.java
index 13c9201976b..d997a87f4a5 100644
---
a/embedded-tests/src/test/java/org/apache/druid/testing/embedded/k8s/K3sClusterResource.java
+++
b/embedded-tests/src/test/java/org/apache/druid/testing/embedded/k8s/K3sClusterResource.java
@@ -69,7 +69,7 @@ public class K3sClusterResource extends
TestcontainerResource<K3sContainer>
{
private static final Logger log = new Logger(K3sClusterResource.class);
- private static final String K3S_IMAGE_NAME = "rancher/k3s:v1.28.8-k3s1";
+ private static final String K3S_IMAGE_NAME = "rancher/k3s:v1.35.0-k3s1";
public static final String DRUID_NAMESPACE = "druid";
private static final String NAMESPACE_MANIFEST =
"manifests/druid-namespace.yaml";
diff --git
a/embedded-tests/src/test/java/org/apache/druid/testing/embedded/mariadb/MariaDBMetadataResource.java
b/embedded-tests/src/test/java/org/apache/druid/testing/embedded/mariadb/MariaDBMetadataResource.java
index f83b5de75fb..b67e74b4e7a 100644
---
a/embedded-tests/src/test/java/org/apache/druid/testing/embedded/mariadb/MariaDBMetadataResource.java
+++
b/embedded-tests/src/test/java/org/apache/druid/testing/embedded/mariadb/MariaDBMetadataResource.java
@@ -23,21 +23,21 @@ import org.apache.druid.java.util.common.StringUtils;
import org.apache.druid.metadata.storage.mysql.MySQLMetadataStorageModule;
import org.apache.druid.testing.embedded.EmbeddedDruidCluster;
import org.apache.druid.testing.embedded.TestcontainerResource;
-import org.testcontainers.containers.MariaDBContainer;
+import org.testcontainers.mariadb.MariaDBContainer;
/**
* Resource that creates a MariaDB metadata store.
*/
-public class MariaDBMetadataResource extends
TestcontainerResource<MariaDBContainer<?>>
+public class MariaDBMetadataResource extends
TestcontainerResource<MariaDBContainer>
{
private static final String DATABASE_NAME = "druid_test";
private static final String USERNAME = "sally";
private static final String PASSWORD = "diurd";
@Override
- protected MariaDBContainer<?> createContainer()
+ protected MariaDBContainer createContainer()
{
- return new MariaDBContainer<>("mariadb:11.8")
+ return new MariaDBContainer("mariadb:11")
.withDatabaseName(DATABASE_NAME)
.withUsername(USERNAME)
.withPassword(PASSWORD);
diff --git
a/embedded-tests/src/test/java/org/apache/druid/testing/embedded/psql/PostgreSQLMetadataResource.java
b/embedded-tests/src/test/java/org/apache/druid/testing/embedded/psql/PostgreSQLMetadataResource.java
index bb5aabaecd5..c6819bf614b 100644
---
a/embedded-tests/src/test/java/org/apache/druid/testing/embedded/psql/PostgreSQLMetadataResource.java
+++
b/embedded-tests/src/test/java/org/apache/druid/testing/embedded/psql/PostgreSQLMetadataResource.java
@@ -23,12 +23,12 @@ import org.apache.druid.java.util.common.StringUtils;
import
org.apache.druid.metadata.storage.postgresql.PostgreSQLMetadataStorageModule;
import org.apache.druid.testing.embedded.EmbeddedDruidCluster;
import org.apache.druid.testing.embedded.TestcontainerResource;
-import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.postgresql.PostgreSQLContainer;
/**
* Resource that creates a PostgreSQL metadata store.
*/
-public class PostgreSQLMetadataResource extends
TestcontainerResource<PostgreSQLContainer<?>>
+public class PostgreSQLMetadataResource extends
TestcontainerResource<PostgreSQLContainer>
{
private static final String DATABASE_NAME = "druid_test";
private static final String USERNAME = "sally";
@@ -37,9 +37,9 @@ public class PostgreSQLMetadataResource extends
TestcontainerResource<PostgreSQL
private String connectURI;
@Override
- protected PostgreSQLContainer<?> createContainer()
+ protected PostgreSQLContainer createContainer()
{
- return new PostgreSQLContainer<>("postgres:16-alpine")
+ return new PostgreSQLContainer("postgres:16-alpine")
.withDatabaseName(DATABASE_NAME)
.withUsername(USERNAME)
.withPassword(PASSWORD);
diff --git a/extensions-core/kafka-indexing-service/pom.xml
b/extensions-core/kafka-indexing-service/pom.xml
index ce8c853b1c1..fe98fa75460 100644
--- a/extensions-core/kafka-indexing-service/pom.xml
+++ b/extensions-core/kafka-indexing-service/pom.xml
@@ -223,7 +223,7 @@
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>kafka</artifactId>
+ <artifactId>testcontainers-kafka</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
diff --git
a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/simulate/KafkaResource.java
b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/simulate/KafkaResource.java
index 0b4bbfb978b..270e551a29c 100644
---
a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/simulate/KafkaResource.java
+++
b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/simulate/KafkaResource.java
@@ -52,7 +52,7 @@ public class KafkaResource extends
TestcontainerResource<KafkaContainer>
* defaults to {@code apache/kafka}. Environments that cannot run that
* image should set the system property to {@code apache/kafka-native}.
*/
- private static final String KAFKA_IMAGE =
System.getProperty("druid.testing.kafka.image", "apache/kafka:4.0.0");
+ private static final String KAFKA_IMAGE =
System.getProperty("druid.testing.kafka.image", "apache/kafka:4.1.1");
private EmbeddedDruidCluster cluster;
diff --git a/extensions-core/s3-extensions/pom.xml
b/extensions-core/s3-extensions/pom.xml
index a8378b36e7b..d8ca27eb1c1 100644
--- a/extensions-core/s3-extensions/pom.xml
+++ b/extensions-core/s3-extensions/pom.xml
@@ -166,7 +166,7 @@
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>junit-jupiter</artifactId>
+ <artifactId>testcontainers-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -176,7 +176,7 @@
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>minio</artifactId>
+ <artifactId>testcontainers-minio</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
diff --git a/licenses.yaml b/licenses.yaml
index b94b27687c8..43acfbf92a6 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -5110,7 +5110,7 @@ name: Testcontainers
license_category: binary
module: extensions-core/druid-testcontainers
license_name: MIT License
-version: 1.21.3
+version: 2.0.3
libraries:
- org.testcontainers: testcontainers
diff --git a/pom.xml b/pom.xml
index b31dbab0d10..b70c0ce4d4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
<aws.sdk.version>1.12.784</aws.sdk.version>
<caffeine.version>2.8.0</caffeine.version>
<jacoco.version>0.8.12</jacoco.version>
- <testcontainers.version>1.21.3</testcontainers.version>
+ <testcontainers.version>2.0.3</testcontainers.version>
<hibernate-validator.version>6.2.5.Final</hibernate-validator.version>
<httpclient.version>4.5.13</httpclient.version>
<!-- When upgrading ZK, edit docs and integration tests as well
(integration-tests/docker-base/setup.sh) -->
@@ -1430,7 +1430,7 @@
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>junit-jupiter</artifactId>
+ <artifactId>testcontainers-junit-jupiter</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
diff --git a/services/pom.xml b/services/pom.xml
index 98fa13e36a4..1cec8c5307f 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -337,12 +337,12 @@
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>junit-jupiter</artifactId>
+ <artifactId>testcontainers-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>nginx</artifactId>
+ <artifactId>testcontainers-nginx</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
diff --git
a/services/src/test/java/org/apache/druid/testing/embedded/TestcontainerResourceTest.java
b/services/src/test/java/org/apache/druid/testing/embedded/TestcontainerResourceTest.java
index 9dc355a18fd..1ba0aba7712 100644
---
a/services/src/test/java/org/apache/druid/testing/embedded/TestcontainerResourceTest.java
+++
b/services/src/test/java/org/apache/druid/testing/embedded/TestcontainerResourceTest.java
@@ -22,7 +22,7 @@ package org.apache.druid.testing.embedded;
import org.apache.druid.java.util.common.StringUtils;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
-import org.testcontainers.containers.NginxContainer;
+import org.testcontainers.nginx.NginxContainer;
import org.testcontainers.utility.MountableFile;
import java.io.IOException;
@@ -77,7 +77,7 @@ public class TestcontainerResourceTest
/**
* An {@link NginxContainer} wrapped as an {@link EmbeddedResource}.
*/
- private static class NginxTestcontainerResource extends
TestcontainerResource<NginxContainer<?>>
+ private static class NginxTestcontainerResource extends
TestcontainerResource<NginxContainer>
{
private final MountableFile indexHtml;
@@ -87,9 +87,9 @@ public class TestcontainerResourceTest
}
@Override
- protected NginxContainer<?> createContainer()
+ protected NginxContainer createContainer()
{
- return new NginxContainer<>("nginx:alpine")
+ return new NginxContainer("nginx:alpine")
.withCopyFileToContainer(
indexHtml,
"/usr/share/nginx/html/index.html"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
