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:39 UTC
[2/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/4cf13def
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/4cf13def
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/4cf13def
Branch: refs/heads/4.2
Commit: 4cf13def15078176240f1adc83584eda566d6674
Parents: 06a5670
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 14:57:51 2014 -0800
----------------------------------------------------------------------
phoenix-assembly/src/build/client.xml | 1 +
phoenix-assembly/src/build/server.xml | 1 +
pom.xml | 18 ++++++++++++++++++
3 files changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/4cf13def/phoenix-assembly/src/build/client.xml
----------------------------------------------------------------------
diff --git a/phoenix-assembly/src/build/client.xml b/phoenix-assembly/src/build/client.xml
index f674331..ceaae85 100644
--- 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>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/4cf13def/phoenix-assembly/src/build/server.xml
----------------------------------------------------------------------
diff --git a/phoenix-assembly/src/build/server.xml b/phoenix-assembly/src/build/server.xml
index bc656e5..ddfd093 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>
<dependencySet>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/4cf13def/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e97957e..2fc08a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -477,6 +477,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>
@@ -502,6 +508,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 -->
@@ -534,6 +546,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>