You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by el...@apache.org on 2016/08/02 23:25:27 UTC

[1/8] phoenix git commit: PHOENIX-3136 Do not relocate org.apache.calcite in queryserver/thin-client

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 <el...@apache.org>
Authored: Tue Aug 2 11:51:37 2016 -0400
Committer: Josh Elser <el...@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>


[2/8] phoenix git commit: PHOENIX-3136 Do not relocate org.apache.calcite in queryserver/thin-client

Posted by el...@apache.org.
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/644e5f58
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/644e5f58
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/644e5f58

Branch: refs/heads/4.x-HBase-1.1
Commit: 644e5f5853e85ddd296a96d4a1c20a14e656a835
Parents: 32c8c72
Author: Josh Elser <el...@apache.org>
Authored: Tue Aug 2 11:51:37 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Aug 2 19:00:12 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/644e5f58/phoenix-queryserver-client/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-queryserver-client/pom.xml b/phoenix-queryserver-client/pom.xml
index 25fd577..6554889 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/644e5f58/phoenix-queryserver/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml
index 6a39697..1739f2a 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>


[6/8] phoenix git commit: PHOENIX-3136 Do not relocate org.apache.calcite in queryserver/thin-client

Posted by el...@apache.org.
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/2ee2d1df
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/2ee2d1df
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/2ee2d1df

Branch: refs/heads/4.8-HBase-1.1
Commit: 2ee2d1df04b929771ca827e7905645ec75d91c10
Parents: f792b6e
Author: Josh Elser <el...@apache.org>
Authored: Tue Aug 2 11:51:37 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Aug 2 19:21:11 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/2ee2d1df/phoenix-queryserver-client/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-queryserver-client/pom.xml b/phoenix-queryserver-client/pom.xml
index 25fd577..6554889 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/2ee2d1df/phoenix-queryserver/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml
index 6a39697..1739f2a 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>


[3/8] phoenix git commit: PHOENIX-3136 Do not relocate org.apache.calcite in queryserver/thin-client

Posted by el...@apache.org.
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/39cebc2c
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/39cebc2c
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/39cebc2c

Branch: refs/heads/4.x-HBase-1.0
Commit: 39cebc2caf2232be907056c36ae32e27dfad7bec
Parents: af4fb44
Author: Josh Elser <el...@apache.org>
Authored: Tue Aug 2 11:51:37 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Aug 2 19:04:02 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/39cebc2c/phoenix-queryserver-client/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-queryserver-client/pom.xml b/phoenix-queryserver-client/pom.xml
index d64cc3e..c2e8920 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/39cebc2c/phoenix-queryserver/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml
index 599ed7d..441c6d5 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>


[8/8] phoenix git commit: PHOENIX-3136 Do not relocate org.apache.calcite in queryserver/thin-client

Posted by el...@apache.org.
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/6dd6343c
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6dd6343c
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6dd6343c

Branch: refs/heads/4.8-HBase-0.98
Commit: 6dd6343caaa19861c59b6d54f669c2335acd4f68
Parents: 38c5511
Author: Josh Elser <el...@apache.org>
Authored: Tue Aug 2 11:51:37 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Aug 2 19:21:22 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/6dd6343c/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/6dd6343c/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>


[5/8] phoenix git commit: PHOENIX-3136 Do not relocate org.apache.calcite in queryserver/thin-client

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

Branch: refs/heads/4.8-HBase-1.2
Commit: c357318bd6e4cceee5d55a8e2dd76f9b313301c6
Parents: 5b5f0c9
Author: Josh Elser <el...@apache.org>
Authored: Tue Aug 2 11:51:37 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Aug 2 19:17:14 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/c357318b/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/c357318b/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>


[7/8] phoenix git commit: PHOENIX-3136 Do not relocate org.apache.calcite in queryserver/thin-client

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

Branch: refs/heads/4.8-HBase-1.0
Commit: ce572433dcc80d14d924c4d0b04d23692f391c7f
Parents: 81ffc48
Author: Josh Elser <el...@apache.org>
Authored: Tue Aug 2 11:51:37 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Aug 2 19:21:17 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/ce572433/phoenix-queryserver-client/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-queryserver-client/pom.xml b/phoenix-queryserver-client/pom.xml
index d64cc3e..c2e8920 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/ce572433/phoenix-queryserver/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml
index 599ed7d..441c6d5 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>


[4/8] phoenix git commit: PHOENIX-3136 Do not relocate org.apache.calcite in queryserver/thin-client

Posted by el...@apache.org.
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 <el...@apache.org>
Authored: Tue Aug 2 11:51:37 2016 -0400
Committer: Josh Elser <el...@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>