From ec18e6f47ebe4308495052afb4a2fd6f9ad0102d Mon Sep 17 00:00:00 2001
From: Boglarka Egyed <bogi@apache.org>
Date: Fri, 10 Aug 2018 10:23:48 +0200
Subject: [PATCH] SQOOP-3360: Fix hive-exec dependency issues in Gradle

(Szabolcs Vasas via Boglarka Egyed)
---
 build.gradle             | 5 +++++
 gradle.properties        | 2 ++
 ivy.xml                  | 5 +++++
 ivy/libraries.properties | 1 +
 4 files changed, 13 insertions(+)

diff --git a/build.gradle b/build.gradle
index e2c4479d..99a4e24f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -80,6 +80,7 @@ configurations.all {
     resolutionStrategy {
         force group: 'org.apache.avro', name: 'avro', version: avroVersion
         force group: 'org.apache.avro', name: 'avro-mapred', version: avroVersion
+        force group: 'com.google.guava', name: 'guava', version: guavaVersion
     }
     exclude group: 'org.apache.hadoop', module: 'avro'
 }
@@ -106,7 +107,11 @@ dependencies {
     common group: 'org.apache.hbase', name: 'hbase-common', version: hbaseVersion
     common (group: 'org.apache.hive.hcatalog', name: 'hive-hcatalog-core', version: hcatalogVersion) {
         exclude  group: 'org.apache.avro', module: 'avro'
+        exclude  group: 'org.apache.hive', module: 'hive-exec'
     }
+    common group: 'org.apache.hive', name: 'hive-exec', version: hcatalogVersion, classifier: 'core'
+    // Kryo is a dependency of hive-exec:core
+    common group: 'com.esotericsoftware.kryo', name: 'kryo', version: kryoVersion
     common (group: 'org.apache.hive', name: 'hive-jdbc', version: hcatalogVersion) {
         exclude  group: 'org.apache.avro', module: 'avro'
     }
diff --git a/gradle.properties b/gradle.properties
index 2d6c259f..a71729e1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,6 +26,8 @@ aspectjVersion=1.7.4
 zookeeperVersion=3.4.6
 hbaseVersion=1.2.4
 hcatalogVersion=1.2.1
+kryoVersion=2.22
+guavaVersion=14.0.1
 
 accumuloVersion=1.6.2
 
diff --git a/ivy.xml b/ivy.xml
index 796ef70a..e55172e1 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -204,8 +204,13 @@ under the License.
       rev="${hcatalog.version}" conf="common->default">
       <artifact name="hive-hcatalog-core" type="jar"/>
       <exclude org="org.apache.avro" module="avro" />
+      <exclude org="org.apache.hive" module="hive-exec" />
     </dependency>
 
+    <dependency org="org.apache.hive" name="hive-exec" rev="${hcatalog.version}" conf="common->default" m:classifier="core" />
+    <!-- Kryo is a dependency of hive-exec:core -->
+    <dependency org="com.esotericsoftware.kryo" name="kryo" rev="${kryo.version}" conf="common->default" />
+
     <dependency org="org.postgresql" name="postgresql"
       rev="${postgresql.version}" conf="common->default" />
 
diff --git a/ivy/libraries.properties b/ivy/libraries.properties
index d679b125..2f1ec9e5 100644
--- a/ivy/libraries.properties
+++ b/ivy/libraries.properties
@@ -58,6 +58,7 @@ slf4j.version=1.7.7
 hadoop.version=2.8.0
 hbase.version=1.2.4
 hcatalog.version=1.2.1
+kryo.version=2.22
 
 jackson-databind.version=2.9.5
 parquet.version=1.6.0