You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by sa...@apache.org on 2016/08/05 21:03:15 UTC

[16/50] [abbrv] 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/32ae3f5a
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/32ae3f5a
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/32ae3f5a

Branch: refs/heads/encodecolumns
Commit: 32ae3f5a3270fcdfa672f7d74dcb1721f2b65792
Parents: 4ac8e56
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:48:04 2016 -0400

----------------------------------------------------------------------
 phoenix-client/pom.xml | 1 +
 phoenix-core/pom.xml   | 6 ++++++
 phoenix-pig/pom.xml    | 1 -
 3 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/32ae3f5a/phoenix-client/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml
index acd13f2..e0707c2 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/32ae3f5a/phoenix-core/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index d20183c..2910453 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>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/32ae3f5a/phoenix-pig/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-pig/pom.xml b/phoenix-pig/pom.xml
index 2c88059..f187439 100644
--- a/phoenix-pig/pom.xml
+++ b/phoenix-pig/pom.xml
@@ -94,7 +94,6 @@
     <dependency>
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-client</artifactId>
-      <version>${hbase.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>