drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ve...@apache.org
Subject [4/5] drill git commit: DRILL-2952: Upgrade Hive storage plugin to work with Hive 1.0.0
Date Mon, 08 Jun 2015 19:07:29 GMT
DRILL-2952: Upgrade Hive storage plugin to work with Hive 1.0.0


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

Branch: refs/heads/master
Commit: 93533835bdcaff018a6b6ee6ea5999f3c5659d70
Parents: eaf7c8d
Author: Na Yang <nyang@maprtec.com>
Authored: Wed May 27 14:50:18 2015 -0700
Committer: vkorukanti <venki.korukanti@gmail.com>
Committed: Fri Jun 5 15:13:56 2015 -0700

----------------------------------------------------------------------
 contrib/storage-hive/hive-exec-shade/pom.xml | 36 ++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/93533835/contrib/storage-hive/hive-exec-shade/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/storage-hive/hive-exec-shade/pom.xml b/contrib/storage-hive/hive-exec-shade/pom.xml
index d1fb6d3..75c3739 100644
--- a/contrib/storage-hive/hive-exec-shade/pom.xml
+++ b/contrib/storage-hive/hive-exec-shade/pom.xml
@@ -31,7 +31,7 @@
   <name>contrib/hive-storage-plugin/hive-exec-shaded</name>
 
   <properties>
-    <hive.version>0.13.1</hive.version>
+    <hive.version>1.0.0</hive.version>
   </properties>
 
   <dependencies>
@@ -73,6 +73,22 @@
           <groupId>com.google.protobuf</groupId>
           <artifactId>protobuf-java</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.apache.hive</groupId>
+          <artifactId>hive-shims</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.zookeeper</groupId>
+          <artifactId>zookeeper</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.curator</groupId>
+          <artifactId>curator-framework</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.curator</groupId>
+          <artifactId>apache-curator</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -100,6 +116,10 @@
           <groupId>org.mortbay.jetty</groupId>
           <artifactId>servlet-api</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.apache.hive</groupId>
+          <artifactId>hive-shims</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -171,6 +191,8 @@
                   <include>com.twitter:parquet-jackson</include>
                   <include>com.twitter:parquet-encoding</include>
                   <include>com.twitter:parquet-generator</include>
+                  <include>org.apache.calcite:calcite-core</include>
+                  <include>org.apache.calcite:calcite-avatica</include>
                 </includes>
               </artifactSet>
               <createDependencyReducedPom>false</createDependencyReducedPom>
@@ -188,6 +210,18 @@
                   <pattern>org.apache.commons.codec.</pattern>
                   <shadedPattern>hive.org.apache.commons.codec.</shadedPattern>
                 </relocation>
+                <relocation>
+                  <pattern>net.hydromatic.</pattern>
+                  <shadedPattern>hive.net.hydromatic.</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>org.eigenbase.</pattern>
+                  <shadedPattern>hive.org.eigenbase.</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>org.apache.calcite.</pattern>
+                  <shadedPattern>hive.org.apache.calcite.</shadedPattern>
+                </relocation>
               </relocations>
             </configuration>
           </execution>


Mime
View raw message