From 5df01b92ca8cbd7e594155a368f770d1cf92a821 Mon Sep 17 00:00:00 2001
From: Kousuke Saruta <sarutak@oss.nttdata.com>
Date: Sun, 14 Jun 2020 02:59:50 +0900
Subject: [PATCH 1/2] Specifid the version of ChromeDriver and its dependencies
 which can work with guava 14.0.1.

---
 core/pom.xml             | 10 ++++++++++
 pom.xml                  | 21 +++++++++++++++++++++
 project/SparkBuild.scala |  3 ++-
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/core/pom.xml b/core/pom.xml
index 14b217d7fb22e..e8e3b132affae 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -327,6 +327,16 @@
       <artifactId>oro</artifactId>
       <version>${oro.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.seleniumhq.selenium</groupId>
+      <artifactId>selenium-remote-driver</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.seleniumhq.selenium</groupId>
+      <artifactId>selenium-chrome-driver</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.seleniumhq.selenium</groupId>
       <artifactId>selenium-java</artifactId>
diff --git a/pom.xml b/pom.xml
index 8d552e08f0cd9..02f12e338c8fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -189,6 +189,7 @@
     <jpam.version>1.1</jpam.version>
     <selenium.version>3.141.59</selenium.version>
     <htmlunit.version>2.40.0</htmlunit.version>
+    <selenium-remote-driver.version>2.53.1</selenium-remote-driver.version>
     <!--
     Managed up from older version from Avro; sync with jackson-module-paranamer dependency version
     -->
@@ -577,6 +578,18 @@
         <artifactId>leveldbjni-all</artifactId>
         <version>1.8</version>
       </dependency>
+      <dependency>
+        <groupId>org.seleniumhq.selenium</groupId>
+        <artifactId>selenium-remote-driver</artifactId>
+        <version>${selenium-remote-driver.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.seleniumhq.selenium</groupId>
+        <artifactId>selenium-chrome-driver</artifactId>
+        <version>${selenium-remote-driver.version}</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.seleniumhq.selenium</groupId>
         <artifactId>selenium-java</artifactId>
@@ -595,6 +608,14 @@
             <groupId>net.bytebuddy</groupId>
             <artifactId>byte-buddy</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-remote-driver</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-chrome-driver</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index eb12f2f1f6ab7..c7c123aaf50a5 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -625,7 +625,8 @@ object DependencyOverrides {
     dependencyOverrides += "com.google.guava" % "guava" % "14.0.1",
     dependencyOverrides += "xerces" % "xercesImpl" % "2.12.0",
     dependencyOverrides += "jline" % "jline" % "2.14.6",
-    dependencyOverrides += "org.apache.avro" % "avro" % "1.8.2")
+    dependencyOverrides += "org.apache.avro" % "avro" % "1.8.2",
+    dependencyOverrides += "org.seleniumhq.selenium" % "selenium-api" % "2.53.1")
 }
 
 /**

From 6a1e8c0c4f861d52a7408d0f72373099a59455c0 Mon Sep 17 00:00:00 2001
From: Kousuke Saruta <sarutak@oss.nttdata.com>
Date: Sun, 14 Jun 2020 03:25:55 +0900
Subject: [PATCH 2/2] Added memorandum.

---
 pom.xml                  | 5 +++++
 project/SparkBuild.scala | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/pom.xml b/pom.xml
index 02f12e338c8fc..bb2aa44862f05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -189,6 +189,11 @@
     <jpam.version>1.1</jpam.version>
     <selenium.version>3.141.59</selenium.version>
     <htmlunit.version>2.40.0</htmlunit.version>
+    <!--
+    This version of selenium-chrome-driver and selenium-remote-driver can work with guava 14.0.1.
+    If guava is upgraded, and these artifacts can upgrade to a version which can work with the
+    newer guava, consider removing the explicit dependency and exclusion settngs for these artifacts.
+    -->
     <selenium-remote-driver.version>2.53.1</selenium-remote-driver.version>
     <!--
     Managed up from older version from Avro; sync with jackson-module-paranamer dependency version
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index c7c123aaf50a5..b5fb883744e79 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -626,6 +626,9 @@ object DependencyOverrides {
     dependencyOverrides += "xerces" % "xercesImpl" % "2.12.0",
     dependencyOverrides += "jline" % "jline" % "2.14.6",
     dependencyOverrides += "org.apache.avro" % "avro" % "1.8.2",
+    // This overridden version of selenium-api can work with guava 14.0.1.
+    // If guava is upgraded, and selenium-remote-driver and selenium-chrome-driver can
+    // upgrade to a version which can work with the newer guava, consider removing this setting.
     dependencyOverrides += "org.seleniumhq.selenium" % "selenium-api" % "2.53.1")
 }