PHOENIX-2760 Upgrade phoenix-server and phoenix-server-client to Avatica 1.7.1 (Josh Elser)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/efa5a222 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/efa5a222 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/efa5a222 Branch: refs/heads/4.x-HBase-1.0 Commit: efa5a222da49402ac61a5c406cde3060a7868486 Parents: c636504 Author: James Taylor <jtay...@salesforce.com> Authored: Mon Mar 28 08:28:13 2016 -0700 Committer: James Taylor <jtay...@salesforce.com> Committed: Mon Mar 28 09:57:18 2016 -0700 ---------------------------------------------------------------------- phoenix-server-client/pom.xml | 4 ++-- phoenix-server/pom.xml | 12 ++++++------ phoenix-server/src/build/query-server-runnable.xml | 2 +- pom.xml | 14 +++++++------- 4 files changed, 16 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/efa5a222/phoenix-server-client/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-server-client/pom.xml b/phoenix-server-client/pom.xml index 5c88777..2a4d2ea 100644 --- a/phoenix-server-client/pom.xml +++ b/phoenix-server-client/pom.xml @@ -54,8 +54,8 @@ <dependencies> <dependency> - <groupId>org.apache.calcite</groupId> - <artifactId>calcite-avatica</artifactId> + <groupId>org.apache.calcite.avatica</groupId> + <artifactId>avatica</artifactId> </dependency> <dependency> <!-- a dependency for the thin-client uberjar --> http://git-wip-us.apache.org/repos/asf/phoenix/blob/efa5a222/phoenix-server/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml index 82966f0..19115a2 100644 --- a/phoenix-server/pom.xml +++ b/phoenix-server/pom.xml @@ -66,14 +66,14 @@ <artifactId>phoenix-server-client</artifactId> </dependency> <dependency> - <groupId>org.apache.calcite</groupId> - <artifactId>calcite-avatica</artifactId> - <version>${calcite.version}</version> + <groupId>org.apache.calcite.avatica</groupId> + <artifactId>avatica</artifactId> + <version>${avatica.version}</version> </dependency> <dependency> - <groupId>org.apache.calcite</groupId> - <artifactId>calcite-avatica-server</artifactId> - <version>${calcite.version}</version> + <groupId>org.apache.calcite.avatica</groupId> + <artifactId>avatica-server</artifactId> + <version>${avatica.version}</version> </dependency> <dependency> <groupId>org.apache.phoenix</groupId> http://git-wip-us.apache.org/repos/asf/phoenix/blob/efa5a222/phoenix-server/src/build/query-server-runnable.xml ---------------------------------------------------------------------- diff --git a/phoenix-server/src/build/query-server-runnable.xml b/phoenix-server/src/build/query-server-runnable.xml index d4259bf..db22142 100644 --- a/phoenix-server/src/build/query-server-runnable.xml +++ b/phoenix-server/src/build/query-server-runnable.xml @@ -45,7 +45,7 @@ <includes> <include>org.apache.phoenix:phoenix-server</include> <include>org.apache.phoenix:phoenix-server-client</include> - <include>org.apache.calcite:*</include> + <include>org.apache.calcite.avatica:*</include> </includes> </dependencySet> </dependencySets> http://git-wip-us.apache.org/repos/asf/phoenix/blob/efa5a222/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f5fb914..5f3301b 100644 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,7 @@ <!-- Do not change jodatime.version until HBASE-15199 is fixed --> <jodatime.version>1.6</jodatime.version> <joni.version>2.1.2</joni.version> - <calcite.version>1.6.0</calcite.version> + <avatica.version>1.7.1</avatica.version> <jettyVersion>8.1.7.v20120910</jettyVersion> <tephra.version>0.7.0</tephra.version> <spark.version>1.5.2</spark.version> @@ -571,14 +571,14 @@ </exclusions> </dependency> <dependency> - <groupId>org.apache.calcite</groupId> - <artifactId>calcite-avatica</artifactId> - <version>${calcite.version}</version> + <groupId>org.apache.calcite.avatica</groupId> + <artifactId>avatica</artifactId> + <version>${avatica.version}</version> </dependency> <dependency> - <groupId>org.apache.calcite</groupId> - <artifactId>calcite-avatica-server</artifactId> - <version>${calcite.version}</version> + <groupId>org.apache.calcite.avatica</groupId> + <artifactId>avatica-server</artifactId> + <version>${avatica.version}</version> </dependency> <!-- Transaction dependencies -->