From 09073057df2cff41b7a62f56dc0cf57ed62f4801 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 19 Aug 2024 14:21:24 +0200
Subject: [PATCH] deps: update dependency org.testcontainers:testcontainers to
 v1.20.1 (#1684)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* deps: update dependency org.testcontainers:testcontainers to v1.20.1

* chore: ignore errors during availability check

---------

Co-authored-by: Knut Olav Løite <koloite@gmail.com>
---
 pom.xml                                                   | 2 +-
 samples/snippets/pom.xml                                  | 2 +-
 samples/spring-data-jdbc/pom.xml                          | 2 +-
 .../spanner/jdbc/ConcurrentTransactionOnEmulatorTest.java | 8 +++++++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4ab18c747..97c020916 100644
--- a/pom.xml
+++ b/pom.xml
@@ -166,7 +166,7 @@
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>testcontainers</artifactId>
-      <version>1.19.8</version>
+      <version>1.20.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 3260b2985..2d0ed2811 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -48,7 +48,7 @@
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>testcontainers</artifactId>
-      <version>1.19.8</version>
+      <version>1.20.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/samples/spring-data-jdbc/pom.xml b/samples/spring-data-jdbc/pom.xml
index 0cb0aaa7c..b6ea7780b 100644
--- a/samples/spring-data-jdbc/pom.xml
+++ b/samples/spring-data-jdbc/pom.xml
@@ -109,7 +109,7 @@
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>testcontainers</artifactId>
-      <version>1.19.8</version>
+      <version>1.20.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/src/test/java/com/google/cloud/spanner/jdbc/ConcurrentTransactionOnEmulatorTest.java b/src/test/java/com/google/cloud/spanner/jdbc/ConcurrentTransactionOnEmulatorTest.java
index 887412048..74a005038 100644
--- a/src/test/java/com/google/cloud/spanner/jdbc/ConcurrentTransactionOnEmulatorTest.java
+++ b/src/test/java/com/google/cloud/spanner/jdbc/ConcurrentTransactionOnEmulatorTest.java
@@ -45,7 +45,13 @@ public class ConcurrentTransactionOnEmulatorTest {
 
   @BeforeClass
   public static void startEmulator() {
-    assumeTrue(DockerClientFactory.instance().isDockerAvailable());
+    boolean dockerAvailable = false;
+    try {
+      dockerAvailable = DockerClientFactory.instance().isDockerAvailable();
+    } catch (Exception ignore) {
+      // Ignore, and just skip the test.
+    }
+    assumeTrue(dockerAvailable);
 
     emulator =
         new GenericContainer<>(