PHOENIX-1468 Add org.iq80.snappy to client and server assemblies

alanqk7 · Nov 19, 2014 · d448417 · d448417
1 parent 9fa513b
commit d448417
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/phoenix-assembly/src/build/client.xml b/phoenix-assembly/src/build/client.xml
@@ -49,6 +49,7 @@
         <include>org.cloudera.htrace:htrace-core</include>
         <include>io.netty:netty</include>
         <include>commons-codec:commons-codec</include>
+        <include>org.iq80.snappy:snappy</include>
       </includes>
     </dependencySet>
 

diff --git a/phoenix-assembly/src/build/server.xml b/phoenix-assembly/src/build/server.xml
@@ -36,6 +36,7 @@
       <includes>
         <include>org.apache.phoenix:phoenix-core</include>
         <include>org.apache.phoenix:phoenix-hadoop*</include>
+        <include>org.iq80.snappy:snappy</include>
       </includes>
     </dependencySet>
     <dependencySet>

diff --git a/pom.xml b/pom.xml
@@ -476,6 +476,12 @@
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-common</artifactId>
         <version>${hadoop-two.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.xerial.snappy</groupId>
+            <artifactId>snappy-java</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
@@ -501,6 +507,12 @@
         <artifactId>pig</artifactId>
         <version>${pig.version}</version>
         <classifier>h2</classifier>
+        <exclusions>
+          <exclusion>
+            <groupId>org.xerial.snappy</groupId>
+            <artifactId>snappy-java</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
 
       <!-- Make sure we have all the antlr dependencies -->
@@ -533,6 +545,12 @@
         <groupId>org.apache.flume</groupId>
         <artifactId>flume-ng-core</artifactId>
         <version>${flume.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.xerial.snappy</groupId>
+            <artifactId>snappy-java</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>net.sourceforge.findbugs</groupId>