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/07/05 18:51:18 UTC

[3/4] phoenix git commit: PHOENIX-3025 Remove guava relocation in queryserver jar

PHOENIX-3025 Remove guava relocation in queryserver jar


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/31dfd7f4
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/31dfd7f4
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/31dfd7f4

Branch: refs/heads/4.x-HBase-1.0
Commit: 31dfd7f49aa252416f535702d0e8e94d65e553d9
Parents: ae36879
Author: Josh Elser <el...@apache.org>
Authored: Tue Jul 5 14:30:04 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Jul 5 14:31:49 2016 -0400

----------------------------------------------------------------------
 phoenix-queryserver/pom.xml | 8 --------
 1 file changed, 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/31dfd7f4/phoenix-queryserver/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml
index 8921133..599ed7d 100644
--- a/phoenix-queryserver/pom.xml
+++ b/phoenix-queryserver/pom.xml
@@ -102,12 +102,6 @@
               </filters>
               <relocations>
                 <relocation>
-                  <pattern>com.google</pattern>
-                  <shadedPattern>${shaded.package}.com.google</shadedPattern>
-                  <excludes>
-                  </excludes>
-                </relocation>
-                <relocation>
                   <pattern>org.eclipse.jetty</pattern>
                   <shadedPattern>${shaded.package}.org.eclipse.jetty</shadedPattern>
                 </relocation>
@@ -131,12 +125,10 @@
     <dependency>
       <groupId>org.apache.calcite.avatica</groupId>
       <artifactId>avatica</artifactId>
-      <version>${avatica.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.calcite.avatica</groupId>
       <artifactId>avatica-server</artifactId>
-      <version>${avatica.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.phoenix</groupId>