From ae508a9540af3ee5b7294d15e53aff21f39f4d4a Mon Sep 17 00:00:00 2001
From: Oleksandr Porunov <alexandr.porunov@gmail.com>
Date: Sat, 27 Jun 2026 00:49:46 +0100
Subject: [PATCH] Upgrade Testcontainers from 1.20.1 to 2.0.5

Testcontainers 1.x bundles a docker-java client that defaults to Docker Engine
API version 1.32. Docker Engine 29 raised its minimum supported API version to
1.40 and rejects older clients, so every Testcontainers-based test fails to find
a valid Docker environment ("client version 1.32 is too old"). Pinning the API
version on 1.x is insufficient because 1.x's environment detection itself fails
against Docker 29. Testcontainers 2.0.x negotiates a compatible API version and
restores compatibility with current Docker.

Testcontainers 2.0 renamed its Maven modules with a `testcontainers-` prefix
(e.g. `org.testcontainers:cassandra` -> `org.testcontainers:testcontainers-cassandra`),
so the dependency artifactIds are updated accordingly. The Java packages are
unchanged in 2.0, so no test source changes are required. Testcontainers 2.0.0+
is compiled for Java 8 bytecode and therefore remains compatible with
JanusGraph's build.

Verified locally against Docker Engine 29 that the CQL, HBase, Elasticsearch and
Solr Testcontainers tests start their containers and pass.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Oleksandr Porunov <alexandr.porunov@gmail.com>
---
 janusgraph-cql/pom.xml    |  4 ++--
 janusgraph-dist/pom.xml   |  6 +++---
 janusgraph-driver/pom.xml |  2 +-
 janusgraph-es/pom.xml     |  6 +++---
 janusgraph-hadoop/pom.xml |  2 +-
 janusgraph-hbase/pom.xml  |  2 +-
 janusgraph-scylla/pom.xml |  4 ++--
 janusgraph-solr/pom.xml   |  6 +++---
 pom.xml                   | 10 +++++-----
 9 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/janusgraph-cql/pom.xml b/janusgraph-cql/pom.xml
index 810891194b..f1fb9dd364 100644
--- a/janusgraph-cql/pom.xml
+++ b/janusgraph-cql/pom.xml
@@ -166,12 +166,12 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>cassandra</artifactId>
+            <artifactId>testcontainers-cassandra</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <artifactId>testcontainers-junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/janusgraph-dist/pom.xml b/janusgraph-dist/pom.xml
index 01a02b0645..452cc438b8 100644
--- a/janusgraph-dist/pom.xml
+++ b/janusgraph-dist/pom.xml
@@ -158,17 +158,17 @@
         </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>cassandra</artifactId>
+            <artifactId>testcontainers-cassandra</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>elasticsearch</artifactId>
+            <artifactId>testcontainers-elasticsearch</artifactId>
             <scope>test</scope>
         </dependency>
         <!-- Logging backends. -->
diff --git a/janusgraph-driver/pom.xml b/janusgraph-driver/pom.xml
index ba553858be..5bd11ac2dd 100644
--- a/janusgraph-driver/pom.xml
+++ b/janusgraph-driver/pom.xml
@@ -96,7 +96,7 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <artifactId>testcontainers-junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
         <!-- Logging backends. -->
diff --git a/janusgraph-es/pom.xml b/janusgraph-es/pom.xml
index ead28d3252..8f2462669e 100644
--- a/janusgraph-es/pom.xml
+++ b/janusgraph-es/pom.xml
@@ -102,17 +102,17 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>cassandra</artifactId>
+            <artifactId>testcontainers-cassandra</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>elasticsearch</artifactId>
+            <artifactId>testcontainers-elasticsearch</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <artifactId>testcontainers-junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/janusgraph-hadoop/pom.xml b/janusgraph-hadoop/pom.xml
index 3c78a0d8ae..2b4cee1470 100644
--- a/janusgraph-hadoop/pom.xml
+++ b/janusgraph-hadoop/pom.xml
@@ -100,7 +100,7 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <artifactId>testcontainers-junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/janusgraph-hbase/pom.xml b/janusgraph-hbase/pom.xml
index 1ccd5c3cc7..a76e463ac2 100644
--- a/janusgraph-hbase/pom.xml
+++ b/janusgraph-hbase/pom.xml
@@ -96,7 +96,7 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <artifactId>testcontainers-junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/janusgraph-scylla/pom.xml b/janusgraph-scylla/pom.xml
index 4955589563..95c8098cc3 100644
--- a/janusgraph-scylla/pom.xml
+++ b/janusgraph-scylla/pom.xml
@@ -192,12 +192,12 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>cassandra</artifactId>
+            <artifactId>testcontainers-cassandra</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <artifactId>testcontainers-junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/janusgraph-solr/pom.xml b/janusgraph-solr/pom.xml
index 0c61e5a6ae..9f0fc88731 100644
--- a/janusgraph-solr/pom.xml
+++ b/janusgraph-solr/pom.xml
@@ -189,17 +189,17 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>cassandra</artifactId>
+            <artifactId>testcontainers-cassandra</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>solr</artifactId>
+            <artifactId>testcontainers-solr</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <artifactId>testcontainers-junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index 36b5188791..3e78c708d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,7 @@
         <cassandra-driver.version>4.19.1</cassandra-driver.version>
         <scylla-driver.version>4.19.0.1</scylla-driver.version>
         <scylladb.version>6.2.0</scylladb.version>
-        <testcontainers.version>1.20.1</testcontainers.version>
+        <testcontainers.version>2.0.5</testcontainers.version>
         <easymock.version>5.4.0</easymock.version>
         <protobuf.version>3.25.5</protobuf.version>
         <grpc.version>1.66.0</grpc.version>
@@ -1136,12 +1136,12 @@
             </dependency>
             <dependency>
                 <groupId>org.testcontainers</groupId>
-                <artifactId>elasticsearch</artifactId>
+                <artifactId>testcontainers-elasticsearch</artifactId>
                 <version>${testcontainers.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.testcontainers</groupId>
-                <artifactId>cassandra</artifactId>
+                <artifactId>testcontainers-cassandra</artifactId>
                 <version>${testcontainers.version}</version>
                 <exclusions>
                     <exclusion>
@@ -1152,12 +1152,12 @@
             </dependency>
             <dependency>
                 <groupId>org.testcontainers</groupId>
-                <artifactId>solr</artifactId>
+                <artifactId>testcontainers-solr</artifactId>
                 <version>${testcontainers.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.testcontainers</groupId>
-                <artifactId>junit-jupiter</artifactId>
+                <artifactId>testcontainers-junit-jupiter</artifactId>
                 <version>${testcontainers.version}</version>
             </dependency>
             <dependency>