Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 4ddbe9bdf -> 459cfe91d
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/459cfe91 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/459cfe91 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/459cfe91 Branch: refs/heads/4.x-HBase-0.98 Commit: 459cfe91d978d1a313ba33b5577ad08b55e8b28f Parents: 4ddbe9b Author: Josh Elser <[email protected]> Authored: Tue Dec 15 17:01:57 2015 -0500 Committer: Nick Dimiduk <[email protected]> Committed: Tue Dec 15 15:51:29 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/459cfe91/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>
