You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ap...@apache.org on 2014/11/20 00:06:40 UTC

[3/3] phoenix git commit: PHOENIX-1468 Add org.iq80.snappy to client and server assemblies

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


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

Branch: refs/heads/3.2
Commit: 4d3a5278ab82e522aa62195d033cafa8cbfeec48
Parents: fdcb4da
Author: Andrew Purtell <ap...@apache.org>
Authored: Wed Nov 19 13:35:17 2014 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Wed Nov 19 15:02:18 2014 -0800

----------------------------------------------------------------------
 phoenix-assembly/src/build/client.xml |  1 +
 phoenix-assembly/src/build/server.xml |  1 +
 pom.xml                               | 26 ++++++++++++++++++++++++++
 3 files changed, 28 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/4d3a5278/phoenix-assembly/src/build/client.xml
----------------------------------------------------------------------
diff --git a/phoenix-assembly/src/build/client.xml b/phoenix-assembly/src/build/client.xml
index 2b71ce2..f2dd389 100644
--- a/phoenix-assembly/src/build/client.xml
+++ b/phoenix-assembly/src/build/client.xml
@@ -46,6 +46,7 @@
         <include>jline:jline</include>
         <include>sqlline:sqlline</include>
         <include>org.apache.hbase:hbase*</include>
+        <include>org.iq80.snappy:snappy</include>
       </includes>
     </dependencySet>
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/4d3a5278/phoenix-assembly/src/build/server.xml
----------------------------------------------------------------------
diff --git a/phoenix-assembly/src/build/server.xml b/phoenix-assembly/src/build/server.xml
index 3329975..ecce920 100644
--- 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>
   </dependencySets>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/4d3a5278/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4420e52..3141bbb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -442,6 +442,12 @@
         <groupId>org.apache.pig</groupId>
         <artifactId>pig</artifactId>
         <version>${pig.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.xerial.snappy</groupId>
+            <artifactId>snappy-java</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.hbase</groupId>
@@ -456,6 +462,10 @@
             <groupId>org.jruby</groupId>
             <artifactId>jruby-complete</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>org.xerial.snappy</groupId>
+            <artifactId>snappy-java</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -477,6 +487,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>
@@ -617,6 +633,10 @@
                 <groupId>oro</groupId>
                 <artifactId>oro</artifactId>
               </exclusion>
+              <exclusion>
+                <groupId>org.xerial.snappy</groupId>
+                <artifactId>snappy-java</artifactId>
+              </exclusion>
             </exclusions>
           </dependency>
           <dependency>
@@ -661,6 +681,12 @@
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-common</artifactId>
             <version>${hadoop.version}</version>
+            <exclusions>
+              <exclusion>
+                <groupId>org.xerial.snappy</groupId>
+                <artifactId>snappy-java</artifactId>
+              </exclusion>
+            </exclusions>
           </dependency>
           <dependency>
             <groupId>org.apache.hadoop</groupId>