You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ma...@apache.org on 2015/06/15 20:46:29 UTC
[49/50] [abbrv] phoenix git commit: PHOENIX-2032 psql.py is broken
after PHOENIX-2013
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/d1934afb
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d1934afb
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d1934afb
Branch: refs/heads/calcite
Commit: d1934afbe6230e823b9009950fe721165e98cc7c
Parents: bfb0eee
Author: Nick Dimiduk <nd...@apache.org>
Authored: Fri Jun 12 10:23:05 2015 -0700
Committer: Nick Dimiduk <nd...@apache.org>
Committed: Fri Jun 12 12:12:09 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/d1934afb/phoenix-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 51ff74d..baf6738 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/d1934afb/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>