Return-Path: <commits-return-11328-archive-asf-public=cust-asf.ponee.io@phoenix.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 8DD18200B4A
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Tue,  5 Jul 2016 20:51:18 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 8C820160A2C; Tue,  5 Jul 2016 18:51:18 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id DFACA160A60
	for <archive-asf-public@cust-asf.ponee.io>; Tue,  5 Jul 2016 20:51:17 +0200 (CEST)
Received: (qmail 5184 invoked by uid 500); 5 Jul 2016 18:51:17 -0000
Mailing-List: contact commits-help@phoenix.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@phoenix.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@phoenix.apache.org>
List-Post: <mailto:commits@phoenix.apache.org>
List-Id: <commits.phoenix.apache.org>
Reply-To: dev@phoenix.apache.org
Delivered-To: mailing list commits@phoenix.apache.org
Received: (qmail 5109 invoked by uid 99); 5 Jul 2016 18:51:17 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jul 2016 18:51:17 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id D692CE38B3; Tue,  5 Jul 2016 18:51:16 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: elserj@apache.org
To: commits@phoenix.apache.org
Date: Tue, 05 Jul 2016 18:51:18 -0000
Message-Id: <c33257f601c74a2a81596e2a63de71d2@git.apache.org>
In-Reply-To: <a42edee2cf3043e6bb52c148428ad922@git.apache.org>
References: <a42edee2cf3043e6bb52c148428ad922@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [3/4] phoenix git commit: PHOENIX-3025 Remove guava relocation in
 queryserver jar
archived-at: Tue, 05 Jul 2016 18:51:18 -0000

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 <elserj@apache.org>
Authored: Tue Jul 5 14:30:04 2016 -0400
Committer: Josh Elser <elserj@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>