Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 452c79993 -> 8c8c07c77 refs/heads/4.x-HBase-1.0 ae3687972 -> 31dfd7f49 refs/heads/4.x-HBase-1.1 bd6c60ffd -> c69cdf046 refs/heads/master 5570a73ff -> b7564692f
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/b7564692 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/b7564692 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/b7564692 Branch: refs/heads/master Commit: b7564692f6bb25eab22d5e013774a413007afabe Parents: 5570a73 Author: Josh Elser <els...@apache.org> Authored: Tue Jul 5 14:30:04 2016 -0400 Committer: Josh Elser <els...@apache.org> Committed: Tue Jul 5 14:30:04 2016 -0400 ---------------------------------------------------------------------- phoenix-queryserver/pom.xml | 8 -------- 1 file changed, 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/b7564692/phoenix-queryserver/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml index d4162ce..f09e1cb 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>
