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/d0bcb7b2 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d0bcb7b2 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d0bcb7b2 Branch: refs/heads/4.x-HBase-1.1 Commit: d0bcb7b2304133031b945d50e01f0f1d5fd023d4 Parents: e64f61b Author: Nick Dimiduk <ndimi...@apache.org> Authored: Fri Jun 12 10:23:05 2015 -0700 Committer: Nick Dimiduk <ndimi...@apache.org> Committed: Fri Jun 12 17:01:27 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/d0bcb7b2/phoenix-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index d275d03..ebc5d71 100644 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@ -152,10 +152,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/d0bcb7b2/phoenix-assembly/src/build/client.xml ---------------------------------------------------------------------- diff --git a/phoenix-assembly/src/build/client.xml b/phoenix-assembly/src/build/client.xml index 101ccd6..e99bb19 100644 --- a/phoenix-assembly/src/build/client.xml +++ b/phoenix-assembly/src/build/client.xml @@ -53,13 +53,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>
