From 7f93061f899d3db045086b96655ea29a41d0d86e Mon Sep 17 00:00:00 2001
From: JothiKumar KuppaEkanath <jothikumar.kuppaekanath@nike.com>
Date: Tue, 5 Nov 2019 10:59:53 -0800
Subject: [PATCH] Changed made to successfully build the clients

---
 README.md                                        |  4 ++--
 .../metastore/AWSCatalogMetastoreClient.java     |  8 ++++++++
 aws-glue-datacatalog-spark-client/pom.xml        |  4 ++--
 shims/spark-hive-shims/pom.xml                   | 16 ++++++++++------
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 4771d27a..50391d93 100644
--- a/README.md
+++ b/README.md
@@ -19,13 +19,13 @@ To build the Hive client, you need to first apply this [patch](https://issues.ap
 	patch -p0 <HIVE-12679.branch-2.3.patch
 	mvn clean install -DskipTests
 
-If you are using the default Maven settings, this will install a new version of patched Hive in ~/.m2/repositories/, i.e. ~/.m2/repository/org/apache/hive/hive/2.3.4-SNAPSHOT/.  The specific version of Hive will depend on the current version in pom.xml.  Presently, the latest version in the 2.3 branch (branch-2.3) is "2.3.4-SNAPSHOT".  You will need this version to build the client.
+If you are using the default Maven settings, this will install a new version of patched Hive in ~/.m2/repositories/, i.e. ~/.m2/repository/org/apache/hive/hive/2.3.7-SNAPSHOT/.  The specific version of Hive will depend on the current version in pom.xml.  Presently, the latest version in the 2.3 branch (branch-2.3) is "2.3.7-SNAPSHOT".  You will need this version to build the client.
 
 ## Building the Hive Client
 
 Once you have successfully patched and installed Hive locally, move into the AWS Glue Data Catalog Client repository and update the following property in pom.xml.
 
-	<hive2.version>2.3.4-SNAPSHOT</hive2.version>
+	<hive2.version>2.3.7-SNAPSHOT</hive2.version>
 
 You are now ready to build the Hive client.
 
diff --git a/aws-glue-datacatalog-hive2-client/src/main/java/com/amazonaws/glue/catalog/metastore/AWSCatalogMetastoreClient.java b/aws-glue-datacatalog-hive2-client/src/main/java/com/amazonaws/glue/catalog/metastore/AWSCatalogMetastoreClient.java
index 7a793cba..5ee79cb0 100644
--- a/aws-glue-datacatalog-hive2-client/src/main/java/com/amazonaws/glue/catalog/metastore/AWSCatalogMetastoreClient.java
+++ b/aws-glue-datacatalog-hive2-client/src/main/java/com/amazonaws/glue/catalog/metastore/AWSCatalogMetastoreClient.java
@@ -101,6 +101,8 @@
 import org.apache.hadoop.hive.metastore.partition.spec.PartitionSpecProxy;
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
+import org.apache.hadoop.hive.metastore.api.PartitionValuesRequest;
+import org.apache.hadoop.hive.metastore.api.PartitionValuesResponse;
 
 import java.io.IOException;
 import java.net.URI;
@@ -1783,4 +1785,10 @@ private Path constructRenamedPath(Path defaultNewPath, Path currentPath) {
           defaultNewPath.toUri().getPath());
   }
 
+  @Override
+  public PartitionValuesResponse listPartitionValues(PartitionValuesRequest arg0)
+      throws MetaException, TException, NoSuchObjectException {
+    return null;
+  }
+
 }
diff --git a/aws-glue-datacatalog-spark-client/pom.xml b/aws-glue-datacatalog-spark-client/pom.xml
index ed8c8103..043c009e 100644
--- a/aws-glue-datacatalog-spark-client/pom.xml
+++ b/aws-glue-datacatalog-spark-client/pom.xml
@@ -13,13 +13,13 @@
     <artifactId>aws-glue-datacatalog-spark-client</artifactId>
     <dependencies>
         <dependency>
-            <groupId>org.spark-project.hive</groupId>
+            <groupId>org.apache.hive</groupId>
             <artifactId>hive-metastore</artifactId>
             <version>${spark-hive.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.spark-project.hive</groupId>
+            <groupId>org.apache.hive</groupId>
             <artifactId>hive-exec</artifactId>
             <version>${spark-hive.version}</version>
             <scope>provided</scope>
diff --git a/shims/spark-hive-shims/pom.xml b/shims/spark-hive-shims/pom.xml
index d88ee48f..db25301f 100644
--- a/shims/spark-hive-shims/pom.xml
+++ b/shims/spark-hive-shims/pom.xml
@@ -1,6 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
                       http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>com.amazonaws.glue</groupId>
@@ -16,13 +14,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.spark-project.hive</groupId>
+            <groupId>org.apache.hive</groupId>
             <artifactId>hive-exec</artifactId>
             <version>${spark-hive.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.spark-project.hive</groupId>
+            <groupId>org.apache.hive</groupId>
             <artifactId>hive-metastore</artifactId>
             <version>${spark-hive.version}</version>
             <scope>provided</scope>
@@ -32,5 +30,11 @@
             <artifactId>shims-common</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-common</artifactId>
+            <version>${hadoop.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
-</project>
+</project>
\ No newline at end of file