phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndimi...@apache.org
Subject phoenix git commit: PHOENIX-2032 psql.py is broken after PHOENIX-2013
Date Sat, 13 Jun 2015 00:23:20 GMT
Repository: phoenix
Updated Branches:
  refs/heads/4.4-HBase-1.1 e3a657886 -> 0a1095044


PHOENIX-2032 psql.py is broken after PHOENIX-2013


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

Branch: refs/heads/4.4-HBase-1.1
Commit: 0a1095044a59832dd87c509e5864302e3f025a9a
Parents: e3a6578
Author: Nick Dimiduk <ndimiduk@apache.org>
Authored: Fri Jun 12 10:23:05 2015 -0700
Committer: Nick Dimiduk <ndimiduk@apache.org>
Committed: Fri Jun 12 17:14:50 2015 -0700

----------------------------------------------------------------------
 phoenix-assembly/pom.xml              |  4 ----
 phoenix-assembly/src/build/client.xml | 27 +++++++++++++++++++++++----
 2 files changed, 23 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/0a109504/phoenix-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 0200459..ba84332 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -148,10 +148,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.phoenix</groupId>
-      <artifactId>phoenix-spark</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.phoenix</groupId>
       <artifactId>phoenix-server</artifactId>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/0a109504/phoenix-assembly/src/build/client.xml
----------------------------------------------------------------------
diff --git a/phoenix-assembly/src/build/client.xml b/phoenix-assembly/src/build/client.xml
index 4bd4544..0e1e1f6 100644
--- a/phoenix-assembly/src/build/client.xml
+++ b/phoenix-assembly/src/build/client.xml
@@ -63,13 +63,32 @@
     </dependencySet>
 
     <!-- Make sure we get all the components, not just the minimal client ones (e.g.
-      phoenix-flume, phoenix-pig, etc) -->
+      phoenix-flume, phoenix-pig, etc). We should exclude phoenix-server and
+      phoenix-server-client in the future, see PHOENIX-2032, PHOENIX-2038 -->
     <dependencySet>
       <outputDirectory>/</outputDirectory>
       <unpack>true</unpack>
-      <includes>
-        <include>org.apache.phoenix:phoenix-*</include>
-      </includes>
+      <!-- multiple deps provide some variant of LICENSE files/directories. These
+           overwrite each other at best, at worst conflict on case-insensitive
+           filesystems like HDFS+ and FAT32. Just exclude them -->
+      <unpackOptions>
+        <excludes>
+          <exclude>*license*</exclude>
+          <exclude>*LICENSE*</exclude>
+          <exclude>**/license/**</exclude>
+          <exclude>**/LICENSE/**</exclude>
+        </excludes>
+      </unpackOptions>
+      <!-- this is default, but make intentions clear -->
+      <useTransitiveDependencies>true</useTransitiveDependencies>
+      <!-- "When <include> subelements are present, they define a set of
+           artifact coordinates to include. If none is present, then <includes>
+           represents all valid values"
+           https://maven.apache.org/plugins/maven-assembly-plugin/assembly.html#class_dependencySet
+           This means bring in all dependencies transitively of the
+           phoenix-assembly module.
+      -->
+      <includes />
     </dependencySet>
   </dependencySets>
 </assembly>


Mime
View raw message