phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [1/8] phoenix git commit: PHOENIX-3136 Do not relocate org.apache.calcite in queryserver/thin-client
Date Tue, 02 Aug 2016 23:25:27 GMT
Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-0.98 38c55115c -> 6dd6343ca
  refs/heads/4.8-HBase-1.0 81ffc484e -> ce572433d
  refs/heads/4.8-HBase-1.1 f792b6e96 -> 2ee2d1df0
  refs/heads/4.8-HBase-1.2 5b5f0c91e -> c357318bd
  refs/heads/4.x-HBase-0.98 845a5ac7a -> 446c58b1d
  refs/heads/4.x-HBase-1.0 af4fb4483 -> 39cebc2ca
  refs/heads/4.x-HBase-1.1 32c8c7262 -> 644e5f585
  refs/heads/master a9ea8a3ba -> 7febdfa88


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/7febdfa8
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/7febdfa8
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/7febdfa8

Branch: refs/heads/master
Commit: 7febdfa881d6a0d41efc289968c8df30953ad39e
Parents: a9ea8a3
Author: Josh Elser <elserj@apache.org>
Authored: Tue Aug 2 11:51:37 2016 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Tue Aug 2 18:42:27 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/7febdfa8/phoenix-queryserver-client/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-queryserver-client/pom.xml b/phoenix-queryserver-client/pom.xml
index 8b2ecc8..ecc9edd 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/7febdfa8/phoenix-queryserver/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml
index f09e1cb..1c186a1 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>


Mime
View raw message