PHOENIX-3136 Do not relocate org.apache.calcite in queryserver/thin-client Relocation of these classes breaks compatibility with previous versions of Phoenix.
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/446c58b1 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/446c58b1 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/446c58b1 Branch: refs/heads/4.x-HBase-0.98 Commit: 446c58b1d5336bca37bda32f2736869df1ab5467 Parents: 845a5ac Author: Josh Elser <els...@apache.org> Authored: Tue Aug 2 11:51:37 2016 -0400 Committer: Josh Elser <els...@apache.org> Committed: Tue Aug 2 19:10:58 2016 -0400 ---------------------------------------------------------------------- phoenix-queryserver-client/pom.xml | 7 +++---- phoenix-queryserver/pom.xml | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/446c58b1/phoenix-queryserver-client/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-queryserver-client/pom.xml b/phoenix-queryserver-client/pom.xml index 40915e9..be4e770 100644 --- a/phoenix-queryserver-client/pom.xml +++ b/phoenix-queryserver-client/pom.xml @@ -113,10 +113,9 @@ <shadedPattern>${shaded.package}.com.fasterxml</shadedPattern> </relocation> <!-- ORG relocation --> - <relocation> - <pattern>org.apache.calcite</pattern> - <shadedPattern>${shaded.package}.org.apache.calcite</shadedPattern> - </relocation> + <!-- Calcite/Avatica is not relocated because the wire API (as of <=1.8.0) expects + consistent class names on client and server. Relocating these would break + backwards compatibility. --> <relocation> <pattern>org.apache.commons</pattern> <shadedPattern>${shaded.package}.org.apache.commons</shadedPattern> http://git-wip-us.apache.org/repos/asf/phoenix/blob/446c58b1/phoenix-queryserver/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml index 25fcdac..92e7169 100644 --- a/phoenix-queryserver/pom.xml +++ b/phoenix-queryserver/pom.xml @@ -105,10 +105,9 @@ <pattern>org.eclipse.jetty</pattern> <shadedPattern>${shaded.package}.org.eclipse.jetty</shadedPattern> </relocation> - <relocation> - <pattern>org.apache.calcite</pattern> - <shadedPattern>${shaded.package}.org.apache.calcite</shadedPattern> - </relocation> + <!-- Calcite/Avatica is not relocated because the wire API (as of <=1.8.0) expects + consistent class names on client and server. Relocating these would break + backwards compatibility. --> </relocations> </configuration> </execution>
