spark git commit: [MINOR] [BUILD] Declare ivy dependency in root pom.

2015-05-05 Thread srowen
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
   groupIdorg.apache.ivy/groupId
   artifactIdivy/artifactId
-  version${ivy.version}/version
 /dependency
 dependency
   groupIdoro/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
+groupIdorg.apache.ivy/groupId
+artifactIdivy/artifactId
+version${ivy.version}/version
+  /dependency
+  dependency
 groupIdcom.google.code.findbugs/groupId
 artifactIdjsr305/artifactId
 version1.3.9/version


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org



spark git commit: [MINOR] [BUILD] Declare ivy dependency in root pom.

2015-05-05 Thread srowen
Repository: spark
Updated Branches:
  refs/heads/branch-1.4 21ed108fa - 5160437c1


[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.

(cherry picked from commit c5790a2f772168351c18bb0da51a124cee89a06f)
Signed-off-by: Sean Owen so...@cloudera.com


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/5160437c
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/5160437c
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/5160437c

Branch: refs/heads/branch-1.4
Commit: 5160437c1b7cdc9d821bed8a063f7545c7052181
Parents: 21ed108
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:28 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/5160437c/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
   groupIdorg.apache.ivy/groupId
   artifactIdivy/artifactId
-  version${ivy.version}/version
 /dependency
 dependency
   groupIdoro/groupId

http://git-wip-us.apache.org/repos/asf/spark/blob/5160437c/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
+groupIdorg.apache.ivy/groupId
+artifactIdivy/artifactId
+version${ivy.version}/version
+  /dependency
+  dependency
 groupIdcom.google.code.findbugs/groupId
 artifactIdjsr305/artifactId
 version1.3.9/version


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org



spark git commit: [MINOR] [BUILD] Declare ivy dependency in root pom.

2015-05-05 Thread srowen
Repository: spark
Updated Branches:
  refs/heads/branch-1.3 702356c5d - b34b5bdf5


[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.

(cherry picked from commit c5790a2f772168351c18bb0da51a124cee89a06f)
Signed-off-by: Sean Owen so...@cloudera.com


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/b34b5bdf
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/b34b5bdf
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/b34b5bdf

Branch: refs/heads/branch-1.3
Commit: b34b5bdf520931ece2549c0662d8fde9435afd1c
Parents: 702356c
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:39 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/b34b5bdf/core/pom.xml
--
diff --git a/core/pom.xml b/core/pom.xml
index 5971d05..f6515c9 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -259,7 +259,6 @@
 dependency
   groupIdorg.apache.ivy/groupId
   artifactIdivy/artifactId
-  version${ivy.version}/version
 /dependency
 dependency
   groupIdoro/groupId

http://git-wip-us.apache.org/repos/asf/spark/blob/b34b5bdf/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 5cd21f1..f2a2654 100644
--- a/pom.xml
+++ b/pom.xml
@@ -412,6 +412,11 @@
 version${commons.math3.version}/version
   /dependency
   dependency
+groupIdorg.apache.ivy/groupId
+artifactIdivy/artifactId
+version${ivy.version}/version
+  /dependency
+  dependency
 groupIdcom.google.code.findbugs/groupId
 artifactIdjsr305/artifactId
 version1.3.9/version


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org