Update testcontainers to 1.15.3

trinodb · Apr 19, 2021 · ebe0db7 · ebe0db7
1 parent 76d585b
commit ebe0db7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/plugin/trino-accumulo/pom.xml b/plugin/trino-accumulo/pom.xml
@@ -270,7 +270,7 @@
         <dependency>
             <groupId>com.github.docker-java</groupId>
             <artifactId>docker-java-api</artifactId>
-            <version>3.2.7</version>
+            <version>${dep.docker-java.version}</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/pom.xml b/pom.xml
@@ -59,8 +59,8 @@
         <dep.tempto.version>183</dep.tempto.version>
         <dep.gcs.version>2.0.0</dep.gcs.version>
         <dep.errorprone.version>2.5.1</dep.errorprone.version>
-        <dep.testcontainers.version>1.15.1</dep.testcontainers.version>
-        <dep.docker-java.version>3.2.7</dep.docker-java.version>
+        <dep.testcontainers.version>1.15.3</dep.testcontainers.version>
+        <dep.docker-java.version>3.2.8</dep.docker-java.version>
         <dep.coral.version>1.0.42</dep.coral.version>
         <dep.confluent.version>5.5.2</dep.confluent.version>
 
@@ -1264,7 +1264,7 @@
                 <!-- org.testcontainers:testcontainer's dependencies pull two different versions of this artifact and this is to negotiate the version -->
                 <groupId>net.java.dev.jna</groupId>
                 <artifactId>jna</artifactId>
-                <version>5.5.0</version>
+                <version>5.8.0</version>
             </dependency>
 
             <dependency>

diff --git a/testing/trino-test-jdbc-compatibility-old-server/pom.xml b/testing/trino-test-jdbc-compatibility-old-server/pom.xml
@@ -75,12 +75,13 @@
 
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>presto</artifactId>
+            <artifactId>testcontainers</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>testcontainers</artifactId>
+            <artifactId>trino</artifactId>
             <scope>test</scope>
         </dependency>
 

diff --git a/...patibility-old-server/src/test/java/io/trino/TestJdbcResultSetCompatibilityOldServer.java b/...patibility-old-server/src/test/java/io/trino/TestJdbcResultSetCompatibilityOldServer.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.Resources;
 import io.trino.jdbc.BaseTestJdbcResultSet;
-import org.testcontainers.containers.PrestoContainer;
+import org.testcontainers.containers.TrinoContainer;
 import org.testcontainers.utility.DockerImageName;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
@@ -50,7 +50,7 @@ public class TestJdbcResultSetCompatibilityOldServer
      * Empty means that we could not obtain current Trino version and tests defined here will be marked as failed.
      */
     private final Optional<String> testedTrinoVersion;
-    private PrestoContainer<?> trinoContainer;
+    private TrinoContainer trinoContainer;
 
     @Factory(dataProvider = "testedTrinoVersions")
     public TestJdbcResultSetCompatibilityOldServer(Optional<String> testedTrinoVersion)
@@ -97,11 +97,10 @@ public void setupTrinoContainer()
             throw new AssertionError("Could not determine current Trino version");
         }
 
-        // TODO: add TrinoContainer to Testcontainers
         DockerImageName image = DockerImageName.parse("trinodb/trino")
                 .withTag(testedTrinoVersion.get())
                 .asCompatibleSubstituteFor("prestosql/presto");
-        trinoContainer = new PrestoContainer<>(image);
+        trinoContainer = new TrinoContainer(image);
         trinoContainer.start();
 
         // verify that version reported by Trino server matches requested one.