HIVE-20189: Separate metastore client code into its own module (#5924)

Author: deniskuzZ

hbase-handler/pom.xml

@@ -292,11 +292,6 @@
       <groupId>org.apache.avro</groupId>
       <artifactId>avro</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.hive</groupId>
-      <artifactId>hive-standalone-metastore-server</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.hive</groupId>
       <artifactId>hive-standalone-metastore-server</artifactId>

hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HCatUtil.java

@@ -114,7 +114,7 @@ public void testSequenceTableWriteReadMR() throws Exception {
       assertTrue(((InvocationTargetException)e.getCause().getCause().getCause()).getTargetException().getMessage().contains(
           "Could not connect to meta store using any of the URIs provided"));
       assertTrue(e.getCause().getMessage().contains(
-          "Unable to instantiate org.apache.hive.hcatalog.common.HiveClientCache$CacheableHiveMetaStoreClient"));
+          "Unable to instantiate org.apache.hadoop.hive.metastore.HiveClientCache$CacheableHiveMetaStoreClient"));
     }
     assertTrue(caughtException);
   }
@@ -132,7 +132,7 @@ public void map(LongWritable key, Text value, Context context) throws IOExceptio
   }
 
   private HCatSchema getSchema() throws HCatException {
-    HCatSchema schema = new HCatSchema(new ArrayList<HCatFieldSchema>());
+    HCatSchema schema = new HCatSchema(new ArrayList<>());
     schema.append(new HCatFieldSchema("a0", HCatFieldSchema.Type.INT,
         ""));
     schema.append(new HCatFieldSchema("a1",
@@ -142,5 +142,4 @@ private HCatSchema getSchema() throws HCatException {
     return schema;
   }
 
-
 }

hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HiveClientCache.java

@@ -39,7 +39,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hive</groupId>
-      <artifactId>hive-standalone-metastore-common</artifactId>
+      <artifactId>hive-standalone-metastore-client</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.hive</groupId>

hcatalog/core/src/test/java/org/apache/hive/hcatalog/common/TestHiveClientCache.java

@@ -48,7 +48,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hive</groupId>
-      <artifactId>hive-standalone-metastore-common</artifactId>
+      <artifactId>hive-standalone-metastore-client</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.avro</groupId>

hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestPassProperties.java

@@ -147,7 +147,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.hive</groupId>
-        <artifactId>hive-standalone-metastore-common</artifactId>
+        <artifactId>hive-standalone-metastore-client</artifactId>
         <version>${standalone-metastore.version}</version>
       </dependency>
       <dependency>

iceberg/iceberg-catalog/pom.xml

@@ -98,6 +98,10 @@
       <artifactId>druid-hdfs-storage</artifactId>
       <version>${druid.version}</version>
       <exclusions>
+        <exclusion>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-hdfs-client</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>com.sun.jersey</groupId>
           <artifactId>jersey-servlet</artifactId>

iceberg/iceberg-handler/pom.xml

@@ -46,7 +46,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hive</groupId>
-      <artifactId>hive-standalone-metastore-common</artifactId>
+      <artifactId>hive-standalone-metastore-client</artifactId>
       <version>${standalone-metastore.version}</version>
     </dependency>
     <dependency>
@@ -183,6 +183,12 @@
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-standalone-metastore-server</artifactId>
+      <version>${standalone-metastore.version}</version>
+      <scope>test</scope>
+    </dependency>
     <!-- test inter-project -->
     <dependency>
       <groupId>junit</groupId>