Repository: spark Updated Branches: refs/heads/master da738cffa -> c5790a2f7
[MINOR] [BUILD] Declare ivy dependency in root pom. Without this, any dependency that pulls ivy transitively may override the version and potentially cause issue. In my machine, the hive tests were pulling an old version of ivy, and subsequently failing with a "NoSuchMethodError". Author: Marcelo Vanzin <van...@cloudera.com> Closes #5893 from vanzin/ivy-dep-fix and squashes the following commits: ea2112d [Marcelo Vanzin] [minor] [build] Declare ivy dependency in root pom. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/c5790a2f Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/c5790a2f Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/c5790a2f Branch: refs/heads/master Commit: c5790a2f772168351c18bb0da51a124cee89a06f Parents: da738cf Author: Marcelo Vanzin <van...@cloudera.com> Authored: Tue May 5 08:56:16 2015 +0100 Committer: Sean Owen <so...@cloudera.com> Committed: Tue May 5 08:56:16 2015 +0100 ---------------------------------------------------------------------- core/pom.xml | 1 - pom.xml | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/c5790a2f/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index c577944..164a836 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -273,7 +273,6 @@ <dependency> <groupId>org.apache.ivy</groupId> <artifactId>ivy</artifactId> - <version>${ivy.version}</version> </dependency> <dependency> <groupId>oro</groupId> http://git-wip-us.apache.org/repos/asf/spark/blob/c5790a2f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index de18741..12ad7c5 100644 --- a/pom.xml +++ b/pom.xml @@ -417,6 +417,11 @@ <version>${commons.math3.version}</version> </dependency> <dependency> + <groupId>org.apache.ivy</groupId> + <artifactId>ivy</artifactId> + <version>${ivy.version}</version> + </dependency> + <dependency> <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> <version>1.3.9</version> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org