[CALCITE-1694] Pig adapter: Use the shaded Avatica dependency instead
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/256b1b90 Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/256b1b90 Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/256b1b90 Branch: refs/heads/master Commit: 256b1b90f4f00ace5c987edef536d767001278e8 Parents: 713c8f4 Author: Josh Elser <[email protected]> Authored: Tue Mar 14 12:02:06 2017 -0400 Committer: Julian Hyde <[email protected]> Committed: Tue Mar 14 21:42:14 2017 -0700 ---------------------------------------------------------------------- pig/pom.xml | 23 +++++++++++++++++++++-- pom.xml | 5 +++++ 2 files changed, 26 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/calcite/blob/256b1b90/pig/pom.xml ---------------------------------------------------------------------- diff --git a/pig/pom.xml b/pig/pom.xml index 2ec910d..7eef3db 100644 --- a/pig/pom.xml +++ b/pig/pom.xml @@ -39,18 +39,36 @@ limitations under the License. <dependency> <groupId>org.apache.calcite</groupId> <artifactId>calcite-core</artifactId> - <type>jar</type> + <exclusions> + <!-- exclude the non-shaded Avatica artifact --> + <exclusion> + <groupId>org.apache.calcite.avatica</groupId> + <artifactId>avatica-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.calcite</groupId> <artifactId>calcite-core</artifactId> <type>test-jar</type> <scope>test</scope> + <exclusions> + <!-- exclude the non-shaded Avatica artifact --> + <exclusion> + <groupId>org.apache.calcite.avatica</groupId> + <artifactId>avatica-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.calcite</groupId> <artifactId>calcite-linq4j</artifactId> </dependency> + <!-- Pull in the shaded Avatica artifact to avoid classpath pollution --> + <dependency> + <groupId>org.apache.calcite.avatica</groupId> + <artifactId>avatica</artifactId> + </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> @@ -107,9 +125,10 @@ limitations under the License. <failOnWarning>true</failOnWarning> <!-- ignore "unused but declared" warnings --> <ignoredUnusedDeclaredDependencies> + <ignoredUnusedDeclaredDependency>org.apache.calcite.avatica:avatica</ignoredUnusedDeclaredDependency> + <ignoredUnusedDeclaredDependency>org.apache.hadoop:hadoop-client</ignoredUnusedDeclaredDependency> <ignoredUnusedDeclaredDependency>org.slf4j:slf4j-api</ignoredUnusedDeclaredDependency> <ignoredUnusedDeclaredDependency>org.slf4j:slf4j-log4j12</ignoredUnusedDeclaredDependency> - <ignoredUnusedDeclaredDependency>org.apache.hadoop:hadoop-client</ignoredUnusedDeclaredDependency> </ignoredUnusedDeclaredDependencies> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/calcite/blob/256b1b90/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 91b275b..f93f80e 100644 --- a/pom.xml +++ b/pom.xml @@ -162,6 +162,11 @@ limitations under the License. <!-- Sorted by groupId, artifactId; calcite (and avatica) dependencies first. --> <dependency> <groupId>org.apache.calcite.avatica</groupId> + <artifactId>avatica</artifactId> + <version>${avatica.version}</version> + </dependency> + <dependency> + <groupId>org.apache.calcite.avatica</groupId> <artifactId>avatica-core</artifactId> <version>${avatica.version}</version> </dependency>
