[11/50] [abbrv] phoenix git commit: PHOENIX-2531 Explicitly list java.sql.Driver file to fix thin-client jar

[sa...@apache.org]

PHOENIX-2531 Explicitly list java.sql.Driver file to fix thin-client jar

The file with the same name was being included in the final artifact
from including the Avatica jar in this jar. If we specify the file
explicitly, we can be sure that it will be the file contained in
the jar.


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

Branch: refs/heads/4.x-HBase-1.0
Commit: 356b73f1a9e3224ee97cae7d13a3918b6c88dfb8
Parents: 9a71114
Author: Josh Elser <el...@apache.org>
Authored: Tue Dec 15 17:01:57 2015 -0500
Committer: Nick Dimiduk <nd...@apache.org>
Committed: Tue Dec 15 15:51:14 2015 -0800

----------------------------------------------------------------------
 phoenix-server-client/src/build/thin-client.xml | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/356b73f1/phoenix-server-client/src/build/thin-client.xml
----------------------------------------------------------------------
diff --git a/phoenix-server-client/src/build/thin-client.xml b/phoenix-server-client/src/build/thin-client.xml
index 5865395..0e7ca52 100644
--- a/phoenix-server-client/src/build/thin-client.xml
+++ b/phoenix-server-client/src/build/thin-client.xml
@@ -38,4 +38,12 @@
       <scope>runtime</scope>
     </dependencySet>
   </dependencySets>
+  <files>
+    <file>
+      <!-- Specify this file directly to make sure we don't get the file
+           with the same path/name from Avatica. -->
+      <source>src/main/resources/META-INF/services/java.sql.Driver</source>
+      <outputDirectory>/META-INF/services/</outputDirectory>
+    </file>
+  </files>
 </assembly>