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/c69cdf04 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/c69cdf04 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/c69cdf04 Branch: refs/heads/4.x-HBase-1.1 Commit: c69cdf0460a6f3a6b22658309c38586369c0f04c Parents: bd6c60f 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:44 2016 -0400 ---------------------------------------------------------------------- phoenix-queryserver/pom.xml | 8 -------- 1 file changed, 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/c69cdf04/phoenix-queryserver/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml index d504503..6a39697 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>