Workaround for docker issue in github actions (#1396)

Author: tommystendahl

.github/workflows/actions.yml

@@ -73,10 +73,6 @@ jobs:
             artifacts_dir: "ecchronos-binary/target"
 
           # Java 17 Jolokia tests
-          - name: "Jolokia Standalone integration 4.1 - Java 17"
-            java_version: 17
-            test_suite: 'verify -P standalone-integration-tests -Dit.cassandra.version=4.1 -Djava.version=17 -Dit.jolokia.enabled=true -DskipUTs'
-            artifacts_dir: "standalone-integration/target"
           - name: "Jolokia Standalone integration 5.0 - Java 17"
             java_version: 17
             test_suite: 'verify -P standalone-integration-tests -Dit.cassandra.version=5.0.4 -Djava.version=17 -Dit.jolokia.enabled=true -DskipUTs'
@@ -99,10 +95,6 @@ jobs:
             artifacts_dir: "ecchronos-binary/target"
 
           # Java 21 Jolokia tests
-          - name: "Jolokia Standalone integration 4.1 - Java 21"
-            java_version: 21
-            test_suite: 'verify -P standalone-integration-tests -Dit.cassandra.version=4.1 -Djava.version=21 -Dit.jolokia.enabled=true -DskipUTs'
-            artifacts_dir: "standalone-integration/target"
           - name: "Jolokia Standalone integration 5.0 - Java 21"
             java_version: 21
             test_suite: 'verify -P standalone-integration-tests -Dit.cassandra.version=5.0.4 -Djava.version=21 -Dit.jolokia.enabled=true -DskipUTs'
@@ -162,6 +154,11 @@ jobs:
           echo "MAX_HEAP_SIZE=1536M" >> $GITHUB_ENV
           echo "HEAP_NEWSIZE=200M" >> $GITHUB_ENV
 
+      - name: Set up Docker Compose
+        uses: KengoTODA/actions-setup-docker-compose@477353946803dd64eaa44008b865b6bfc88cab4e # v1.2.4
+        with:
+          version: '2.31.0'
+
       - run: mvn $TEST_SUITE -B
         id: tests
         env:

pom.xml

@@ -153,7 +153,8 @@
         <org.apache.commons.commons-compress.version>1.28.0</org.apache.commons.commons-compress.version>
         <equalsverifier.version>4.3.1</equalsverifier.version>
         <jcip.version>1.0</jcip.version>
-        <testcontainers.version>1.21.4</testcontainers.version>
+        <testcontainers.version>2.0.3</testcontainers.version>
+        <testcontainers-cassandra.version>1.21.4</testcontainers-cassandra.version>
         <org.bouncycastle.bcpkix-jdk18on.version>1.83</org.bouncycastle.bcpkix-jdk18on.version>
         <org.apache.httpcomponents.client5.httpclient5.version>5.6</org.apache.httpcomponents.client5.httpclient5.version>
 
@@ -199,14 +200,22 @@
 
             <!-- Temporary override versions of indirect dependencies (not yet stepped by the direct dependency) -->
 
-            <!-- Used by testcontainers, steped due to CVE-2024-25710 -->
+            <!-- Used by testcontainers-cassandra, steped due to CVE-2024-25710 -->
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-compress</artifactId>
                 <version>${org.apache.commons.commons-compress.version}</version>
                 <scope>test</scope>
             </dependency>
 
+            <!-- Used by testcontainers-cassandra, steped due to docker issue in github actions -->
+            <dependency>
+                <groupId>org.testcontainers</groupId>
+                <artifactId>testcontainers</artifactId>
+                <version>${testcontainers.version}</version>
+                <scope>test</scope>
+            </dependency>
+
             <!-- Used by java-driver -->
             <dependency>
                 <groupId>com.typesafe</groupId>
@@ -518,7 +527,7 @@
             <dependency>
                 <groupId>org.testcontainers</groupId>
                 <artifactId>cassandra</artifactId>
-                <version>${testcontainers.version}</version>
+                <version>${testcontainers-cassandra.version}</version>
                 <scope>test</scope>
             </dependency>