Return-Path: 
 <commits-return-6686-apmail-phoenix-commits-archive=phoenix.apache.org@phoenix.apache.org>
X-Original-To: apmail-phoenix-commits-archive@minotaur.apache.org
Delivered-To: apmail-phoenix-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 28A1E18B6C
	for <apmail-phoenix-commits-archive@minotaur.apache.org>;
 Wed,  8 Jul 2015 16:50:03 +0000 (UTC)
Received: (qmail 1919 invoked by uid 500); 8 Jul 2015 16:50:03 -0000
Delivered-To: apmail-phoenix-commits-archive@phoenix.apache.org
Received: (qmail 1846 invoked by uid 500); 8 Jul 2015 16:50:03 -0000
Mailing-List: contact commits-help@phoenix.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@phoenix.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@phoenix.apache.org>
List-Post: <mailto:commits@phoenix.apache.org>
List-Id: <commits.phoenix.apache.org>
Reply-To: dev@phoenix.apache.org
Delivered-To: mailing list commits@phoenix.apache.org
Received: (qmail 1762 invoked by uid 99); 8 Jul 2015 16:50:03 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Jul 2015 16:50:03 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id C11FAE0F33; Wed,  8 Jul 2015 16:50:02 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: apurtell@apache.org
To: commits@phoenix.apache.org
Date: Wed, 08 Jul 2015 16:50:25 -0000
Message-Id: <d26be6dda294436b8936f294b3f4adb7@git.apache.org>
In-Reply-To: <da559f692c034d2cb81d24e056e29969@git.apache.org>
References: <da559f692c034d2cb81d24e056e29969@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [26/37] 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/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 <ndimiduk@apache.org>
Authored: Fri Jun 12 10:23:05 2015 -0700
Committer: Nick Dimiduk <ndimiduk@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>