From 286b9b80e0fbac7ef98e6c01eba26e20c853491c Mon Sep 17 00:00:00 2001
From: Nigel Liang <nigel@nigelliang.com>
Date: Fri, 28 Feb 2020 10:57:59 -0800
Subject: [PATCH] [6.0] CC-3543: Update Hadoop and Hive versions (#123)

* CC-3543: Update Hadoop and Hive versions

* Don't warn about annotation processing

* Explicitly include working version of xml-apis
---
 hive/pom.xml | 11 +++++++++++
 pom.xml      |  6 +++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/hive/pom.xml b/hive/pom.xml
index b3468f8f8..a7c0fdc8c 100644
--- a/hive/pom.xml
+++ b/hive/pom.xml
@@ -32,6 +32,7 @@
     <properties>
         <commons.lang3.version>3.1</commons.lang3.version>
         <kryo.version>2.22</kryo.version>
+        <xml-apis.version>1.4.01</xml-apis.version>
     </properties>
 
     <dependencies>
@@ -64,8 +65,18 @@
                     <groupId>org.apache.hive</groupId>
                     <artifactId>hive-exec</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>jdk.tools</groupId>
+                    <artifactId>jdk.tools</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <!-- Explicitly include working version of xml-apis -->
+        <dependency>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+            <version>${xml-apis.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-exec</artifactId>
diff --git a/pom.xml b/pom.xml
index d32de1901..332ed2dd8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,8 +67,8 @@
         <commons-io.version>2.4</commons-io.version>
         <confluent.maven.repo>http://packages.confluent.io/maven/</confluent.maven.repo>
         <confluent.version>6.0.0-SNAPSHOT</confluent.version>
-        <hadoop.version>2.7.3</hadoop.version>
-        <hive.version>1.2.2</hive.version>
+        <hadoop.version>2.10.0</hadoop.version>
+        <hive.version>2.3.6</hive.version>
         <joda.version>2.9.6</joda.version>
         <licenses.version>6.0.0-SNAPSHOT</licenses.version>
         <parquet.version>1.10.1</parquet.version>
@@ -174,7 +174,7 @@
                 <configuration>
                     <showWarnings>true</showWarnings>
                     <compilerArgs>
-                        <arg>-Xlint:all</arg>
+                        <arg>-Xlint:-processing</arg>
                         <arg>-Werror</arg>
                     </compilerArgs>
                 </configuration>