address comments

Author: sunchao

pom.xml

@@ -187,6 +187,7 @@
     <datanucleus-javax.jdo-version>3.2.0-m3</datanucleus-javax.jdo-version>
     <javax.jdo.version>3.0.1</javax.jdo.version>
     <stax-api.version>1.0.1</stax-api.version>
+    <!-- NOTE: make sure to update SparkBuild.scala whenever Guava version changes -->
     <guava.version>30.1.1-jre</guava.version>
     <hive.guava.version>14.0.1</hive.guava.version>
     <janino.version>3.0.16</janino.version>

project/SparkBuild.scala

@@ -667,7 +667,7 @@ object KubernetesIntegrationTests {
  * Overrides to work around sbt's dependency resolution being different from Maven's.
  */
 object DependencyOverrides {
-  lazy val guavaVersion = sys.props.get("guava.version").getOrElse("14.0.1")
+  lazy val guavaVersion = sys.props.get("guava.version").getOrElse("30.1.1-jre")
   lazy val settings = Seq(
     dependencyOverrides += "com.google.guava" % "guava" % guavaVersion,
     dependencyOverrides += "xerces" % "xercesImpl" % "2.12.0",

sql/hive-shaded/pom.xml

@@ -34,57 +34,47 @@
     <sbt.project.name>hive-shaded</sbt.project.name>
   </properties>
 
-  <!-- dependencies in the following are optional because we don't want to leak them as
-    transitive dependencies, as they are already included in the shaded jar -->
   <dependencies>
     <dependency>
       <groupId>${hive.group}</groupId>
       <artifactId>hive-common</artifactId>
       <scope>${hive.common.scope}</scope>
-      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>${hive.group}</groupId>
       <artifactId>hive-exec</artifactId>
       <classifier>${hive.classifier}</classifier>
-      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>${hive.group}</groupId>
       <artifactId>hive-metastore</artifactId>
-      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>${hive.group}</groupId>
       <artifactId>hive-serde</artifactId>
       <scope>${hive.serde.scope}</scope>
-      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>${hive.group}</groupId>
       <artifactId>hive-shims</artifactId>
       <scope>${hive.shims.scope}</scope>
-      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.hive</groupId>
       <artifactId>hive-llap-common</artifactId>
       <scope>${hive.llap.scope}</scope>
-      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.hive</groupId>
       <artifactId>hive-llap-client</artifactId>
       <scope>${hive.llap.scope}</scope>
-      <optional>true</optional>
     </dependency>
     <!-- re-import guava here since it's declared as provided in parent pom -->
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
       <version>${hive.guava.version}</version>
       <scope>compile</scope>
-      <optional>true</optional>
     </dependency>
   </dependencies>
 
@@ -95,22 +85,18 @@
         <dependency>
           <groupId>${hive.group}</groupId>
           <artifactId>hive-cli</artifactId>
-          <optional>true</optional>
         </dependency>
         <dependency>
           <groupId>${hive.group}</groupId>
           <artifactId>hive-jdbc</artifactId>
-          <optional>true</optional>
         </dependency>
         <dependency>
           <groupId>${hive.group}</groupId>
           <artifactId>hive-beeline</artifactId>
-          <optional>true</optional>
         </dependency>
         <dependency>
           <groupId>${hive.group}</groupId>
           <artifactId>hive-service-rpc</artifactId>
-          <optional>true</optional>
         </dependency>
       </dependencies>
     </profile>

sql/hive/src/main/scala/org/apache/spark/sql/hive/client/IsolatedClientLoader.scala

@@ -202,7 +202,6 @@ private[hive] class IsolatedClientLoader(
     name.startsWith("org.apache.spark.") ||
     isHadoopClass ||
     name.startsWith("scala.") ||
-    (name.startsWith("com.google") && !name.startsWith("com.google.cloud")) ||
     name.startsWith("java.") ||
     name.startsWith("javax.sql.") ||
     sharedPrefixes.exists(name.startsWith)