Repository: phoenix Updated Branches: refs/heads/master 6b85406cb -> de37a9a6b
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/de37a9a6 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/de37a9a6 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/de37a9a6 Branch: refs/heads/master Commit: de37a9a6b73b0d565b775f9e224a8843be417b02 Parents: 6b85406 Author: Josh Elser <[email protected]> Authored: Tue Dec 15 17:01:57 2015 -0500 Committer: Nick Dimiduk <[email protected]> Committed: Tue Dec 15 15:50:54 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/de37a9a6/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>
