You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by th...@apache.org on 2017/02/19 05:12:39 UTC

hive git commit: HIVE-15846 : Relocate more dependencies (e.g. org.apache.zookeeper) for JDBC uber jar (Tao Li via Thejas Nair)

Repository: hive
Updated Branches:
  refs/heads/master 1a6902ce8 -> 56f6c9dd5


HIVE-15846 : Relocate more dependencies (e.g. org.apache.zookeeper) for JDBC uber jar (Tao Li via Thejas Nair)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/56f6c9dd
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/56f6c9dd
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/56f6c9dd

Branch: refs/heads/master
Commit: 56f6c9dd56e839a57dc93f7ae3c27866d62eb9fc
Parents: 1a6902c
Author: Tao Li <tl...@hortonworks.com>
Authored: Sat Feb 18 21:12:33 2017 -0800
Committer: Thejas M Nair <th...@hortonworks.com>
Committed: Sat Feb 18 21:12:38 2017 -0800

----------------------------------------------------------------------
 jdbc/pom.xml | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/56f6c9dd/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index b68f207..25430c6 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -173,19 +173,18 @@
                     <exclude>META-INF/*.SF</exclude>
                     <exclude>META-INF/*.DSA</exclude>
                     <exclude>META-INF/*.RSA</exclude>
+                    <exclude>core-default.xml</exclude>
                   </excludes>
                 </filter>
               </filters>
               <artifactSet>
                 <excludes>
                   <exclude>org.apache.commons:commons-compress</exclude>
-                  <exclude>commons-configuration:commons-configuration</exclude>
                   <exclude>org.apache.hadoop:hadoop-yarn*</exclude>
                   <exclude>org.apache.hadoop:hadoop-mapreduce*</exclude>
                   <exclude>org.apache.hadoop:hadoop-hdfs</exclude>
                   <exclude>org.apache.hadoop:hadoop-client</exclude>
                   <exclude>org.apache.hadoop:hadoop-annotations</exclude>
-                  <exclude>org.apache.hadoop:hadoop-auth</exclude>
                   <exclude>org.apache.hive:hive-vector-code-gen</exclude>
                   <exclude>org.apache.ant:*</exclude>
                   <exclude>junit:*</exclude>
@@ -197,6 +196,7 @@
                   <exclude>org.eclipse.jetty.aggregate:*</exclude>
                   <exclude>org.tukaani:*</exclude>
                   <exclude>io.airlift:*</exclude>
+                  <exclude>io.dropwizard.metrics:*</exclude>
                   <exclude>org.apache.velocity:*</exclude>
                   <exclude>net.sf.jpam:*</exclude>
                   <exclude>org.apache.avro:*</exclude>
@@ -228,6 +228,7 @@
                   <exclude>com.sun.xml.bind:*</exclude>
                   <exclude>com.thoughtworks.paranamer:*</exclude>
                   <exclude>com.twitter:*</exclude>
+                  <exclude>com.zaxxer:*</exclude>
                   <exclude>io.netty:*</exclude>
                   <exclude>javax.activation:*</exclude>
                   <exclude>javax.inject:*</exclude>
@@ -236,8 +237,7 @@
                   <exclude>javax.servlet:*</exclude>
                   <exclude>javax.servlet.jsp:*</exclude>
                   <exclude>javax.transaction:*</exclude>
-                  <exclude>javax.xml.bind:*</exclude>
-                  <exclude>javax.xml.stream:*</exclude>
+                  <exclude>javax.xml.*:*</exclude>
                   <exclude>jline:*</exclude>
                   <exclude>joda-time:*</exclude>
                   <exclude>net.java.dev.jets3t:*</exclude>
@@ -246,6 +246,8 @@
                   <exclude>org.apache.directory.api:*</exclude>
                   <exclude>org.apache.directory.server:*</exclude>
                   <exclude>org.apache.geronimo.specs:*</exclude>
+                  <exclude>org.apache.htrace:*</exclude>
+                  <exclude>org.apache.slider:*</exclude>
                   <exclude>org.codehaus.jackson:*</exclude>
                   <exclude>org.codehaus.jettison:*</exclude>
                   <exclude>org.datanucleus:*</exclude>
@@ -253,8 +255,11 @@
                   <exclude>org.htrace:*</exclude>
                   <exclude>org.mortbay.jetty:*</exclude>
                   <exclude>org.xerial.snappy:*</exclude>
+                  <exclude>org.json:*</exclude>
                   <exclude>tomcat:*</exclude>
                   <exclude>xmlenc:*</exclude>
+                  <exclude>xerces:*</exclude>
+                  <exclude>xml-apis:*</exclude>
                 </excludes>
               </artifactSet>
               <relocations>
@@ -291,6 +296,14 @@
                   <shadedPattern>org.apache.hive.org.apache.hadoop</shadedPattern>
                 </relocation>
                 <relocation>
+                  <pattern>org.apache.zookeeper</pattern>
+                  <shadedPattern>org.apache.hive.org.apache.zookeeper</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>org.apache.curator</pattern>
+                  <shadedPattern>org.apache.hive.org.apache.curator</shadedPattern>
+                </relocation>
+                <relocation>
                   <pattern>com.beust</pattern>
                   <shadedPattern>org.apache.hive.com.beust</shadedPattern>
                 </relocation>