You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by el...@apache.org on 2016/07/21 20:26:25 UTC
[33/44] phoenix git commit: PHOENIX-3103 Exclude xom from bundling
PHOENIX-3103 Exclude xom from bundling
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/314a011f
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/314a011f
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/314a011f
Branch: refs/heads/4.x-HBase-1.0
Commit: 314a011fe1f164b401c05edd8fc6ceb1b2b108f3
Parents: fcf7fb9
Author: Josh Elser <el...@apache.org>
Authored: Wed Jul 20 15:16:56 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jul 21 15:30:32 2016 -0400
----------------------------------------------------------------------
phoenix-client/pom.xml | 1 +
phoenix-core/pom.xml | 6 ++++++
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/314a011f/phoenix-client/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml
index 33c7670..0ab6fca 100644
--- a/phoenix-client/pom.xml
+++ b/phoenix-client/pom.xml
@@ -128,6 +128,7 @@
</includes>
<excludes>
<exclude>org.apache.phoenix:phoenix-client</exclude>
+ <exclude>xom:xom</exclude>
</excludes>
</artifactSet>
<filters>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/314a011f/phoenix-core/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 11831bf..c612476 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -402,6 +402,12 @@
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId>
<version>${hbase.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xom</groupId>
+ <artifactId>xom</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>