Repository: phoenix Updated Branches: refs/heads/3.2 fdcb4da7a -> 4d3a5278a refs/heads/4.2 06a567026 -> 4cf13def1 refs/heads/master 9fa513bea -> d448417d9
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/d448417d Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d448417d Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d448417d Branch: refs/heads/master Commit: d448417d99d0ed93d285652b2bdb4c144de5bc56 Parents: 9fa513b Author: Andrew Purtell <apurt...@apache.org> Authored: Wed Nov 19 13:35:17 2014 -0800 Committer: Andrew Purtell <apurt...@apache.org> Committed: Wed Nov 19 14:56:54 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/d448417d/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/d448417d/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/d448417d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 746ad09..9d39f1e 100644 --- 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>
