drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [4/4] drill git commit: DRILL-5157: Multiple Snappy versions on class path
Date Tue, 21 Feb 2017 15:33:34 GMT
DRILL-5157: Multiple Snappy versions on class path

Multiple Snappy versions on class path; causes unit test failures.

This fix updates the Snappy library and adds dependency management to
exclude older versions brought in by Avro and Parquet.


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

Branch: refs/heads/master
Commit: 38f816a45924654efd085bf7f1da7d97a4a51e38
Parents: 0b8ef9e
Author: Paul Rogers <progers@maprtech.com>
Authored: Tue Dec 27 17:21:09 2016 -0800
Committer: Jinfeng Ni <jni@apache.org>
Committed: Tue Feb 21 00:53:07 2017 -0800

----------------------------------------------------------------------
 exec/java-exec/pom.xml | 11 ++++++-----
 pom.xml                | 27 +++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/38f816a4/exec/java-exec/pom.xml
----------------------------------------------------------------------
diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml
index 000d447..2acda3a 100644
--- a/exec/java-exec/pom.xml
+++ b/exec/java-exec/pom.xml
@@ -376,11 +376,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.xerial.snappy</groupId>
-      <artifactId>snappy-java</artifactId>
-      <version>1.0.5-M3</version>
-    </dependency>
-    <dependency>
       <groupId>com.carrotsearch</groupId>
       <artifactId>hppc</artifactId>
       <version>0.7.1</version>
@@ -429,6 +424,12 @@
       <groupId>org.apache.avro</groupId>
       <artifactId>avro</artifactId>
       <version>1.7.7</version>
+      <exclusions>
+    	<exclusion>
+    	  <groupId>org.xerial.snappy</groupId>
+    	  <artifactId>snappy-java</artifactId>
+    	</exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.avro</groupId>

http://git-wip-us.apache.org/repos/asf/drill/blob/38f816a4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6813a72..0f7b54e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -609,6 +609,11 @@
       <version>0.9.44</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.xerial.snappy</groupId>
+      <artifactId>snappy-java</artifactId>
+      <version>1.1.2.6</version>
+    </dependency>
 
   </dependencies>
 
@@ -1331,6 +1336,17 @@
             </exclusions>
           </dependency>
           <dependency>
+          	<groupId>org.apache.parquet</groupId>
+          	<artifactId>parquet-hadoop</artifactId>
+          	<version>${parquet.version}</version>
+          	<exclusions>
+          		<exclusion>
+          			<groupId>org.xerial.snappy</groupId>
+          			<artifactId>snappy-java</artifactId>
+          		</exclusion>
+          	</exclusions>
+          </dependency>
+          <dependency>
             <groupId>org.apache.hbase</groupId>
             <artifactId>hbase-server</artifactId>
             <version>${hbase.version}</version>
@@ -1772,6 +1788,17 @@
             <artifactId>sqlline</artifactId>
             <version>${sqlline.version}</version>
           </dependency>
+          <dependency>
+          	<groupId>org.apache.parquet</groupId>
+          	<artifactId>parquet-hadoop</artifactId>
+          	<version>${parquet.version}</version>
+          	<exclusions>
+          		<exclusion>
+          			<groupId>org.xerial.snappy</groupId>
+          			<artifactId>snappy-java</artifactId>
+          		</exclusion>
+          	</exclusions>
+          </dependency>
           <!-- Test Dependencies -->
           <dependency>
             <groupId>org.apache.hadoop</groupId>


Mime
View raw message