license and variable

Author: sunchao

LICENSE-binary

@@ -316,10 +316,14 @@ com.fasterxml.jackson.module:jackson-module-scala_2.12
 com.github.mifmif:generex
 com.google.code.findbugs:jsr305
 com.google.code.gson:gson
+com.google.errorprone:error_prone_annotations
 com.google.flatbuffers:flatbuffers-java
+com.google.guava:failureaccess
 com.google.guava:guava
+com.google.guava:listenablefuture
 com.google.inject:guice
 com.google.inject.extensions:guice-servlet
+com.google.j2objc:j2objc-annotations
 com.twitter:parquet-hadoop-bundle
 commons-cli:commons-cli
 commons-dbcp:commons-dbcp
@@ -471,6 +475,7 @@ MIT License
 -----------
 
 com.microsoft.sqlserver:mssql-jdbc
+org.checkerframework:checker-qual
 org.typelevel:spire_2.12
 org.typelevel:spire-macros_2.12
 org.typelevel:spire-platform_2.12

assembly/pom.xml

@@ -80,7 +80,7 @@
       that the libraries Spark depend on have it available. We'll package the version that Spark
       uses which is not the same as Hadoop dependencies, but works.
 
-      TODO: consider removing this. It's only required by a few libraries such as
+      TODO(SPARK-36676): consider removing this. It's only required by a few libraries such as
         curator-client. See https://cwiki.apache.org/confluence/display/CURATOR/TN13) on why
         curator imposes a hard dependency on Guava.
     -->

pom.xml

@@ -188,6 +188,7 @@
     <javax.jdo.version>3.0.1</javax.jdo.version>
     <stax-api.version>1.0.1</stax-api.version>
     <guava.version>30.1.1-jre</guava.version>
+    <hive.guava.version>14.0.1</hive.guava.version>
     <janino.version>3.0.16</janino.version>
     <jersey.version>2.34</jersey.version>
     <joda.version>2.10.10</joda.version>

sql/hive-shaded/pom.xml

@@ -82,7 +82,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>14.0.1</version>
+      <version>${hive.guava.version}</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>