diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..49a2f1e0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+.idea
+target
+bin
+classes
+*.iml
\ No newline at end of file
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 a1871c3c..fc65840a 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
@@ -1250,6 +1250,17 @@ public List<String> listPartitionNames(String databaseName, String tableName,
     return glueMetastoreClientDelegate.listPartitionNames(databaseName, tableName, values, max);
   }
 
+  @Override
+  public PartitionValuesResponse listPartitionValues(PartitionValuesRequest partitionValuesRequest) throws MetaException, TException, NoSuchObjectException {
+    List<org.apache.hadoop.hive.metastore.api.Partition> partitions = glueMetastoreClientDelegate.getPartitions(partitionValuesRequest.getDbName(), partitionValuesRequest.getTblName(), partitionValuesRequest.getFilter(), partitionValuesRequest.getMaxParts());
+    List<PartitionValuesRow> partitionRows = new ArrayList<>();
+    for(org.apache.hadoop.hive.metastore.api.Partition p: partitions) {
+      partitionRows.add(new PartitionValuesRow(p.getValues()));
+    }
+    PartitionValuesResponse response = new PartitionValuesResponse(partitionRows);
+    return response;
+  }
+
   @Override
   public int getNumPartitionsByFilter(String dbName, String tableName, String filter)
       throws MetaException, NoSuchObjectException, TException {
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/pom.xml b/pom.xml
index d32a20f5..f83e40a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,8 +19,8 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <guava.version>14.0.1</guava.version>
-    <hive2.version>2.3.3</hive2.version>
-    <spark-hive.version>1.2.1</spark-hive.version>
+    <hive2.version>2.3.9</hive2.version>
+    <spark-hive.version>1.2.3-SNAPSHOT</spark-hive.version>
     <aws.sdk.version>1.11.267</aws.sdk.version>
     <junit.version>4.11</junit.version>
     <mockito.version>1.10.19</mockito.version>
diff --git a/shims/spark-hive-shims/pom.xml b/shims/spark-hive-shims/pom.xml
index d88ee48f..03591e0d 100644
--- a/shims/spark-hive-shims/pom.xml
+++ b/shims/spark-hive-shims/pom.xml
@@ -16,13 +16,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 +32,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>