Repository: spark Updated Branches: refs/heads/master 3e27940a1 -> 9fa43a33b
[SPARK-14612][ML] Consolidate the version of dependencies in mllib and mllib-local into one place ## What changes were proposed in this pull request? Move json4s, breeze dependency declaration into parent ## How was this patch tested? Should be no functional change, but Jenkins tests will test that. Author: Sean Owen <so...@cloudera.com> Closes #12390 from srowen/SPARK-14612. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/9fa43a33 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/9fa43a33 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/9fa43a33 Branch: refs/heads/master Commit: 9fa43a33b91c3a9b6be39bf3e00febf61a4b5b59 Parents: 3e27940 Author: Sean Owen <so...@cloudera.com> Authored: Thu Apr 14 10:48:17 2016 -0700 Committer: DB Tsai <d...@netflix.com> Committed: Thu Apr 14 10:48:17 2016 -0700 ---------------------------------------------------------------------- core/pom.xml | 1 - mllib-local/pom.xml | 13 ------------- mllib/pom.xml | 13 ------------- pom.xml | 22 ++++++++++++++++++++++ 4 files changed, 22 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/9fa43a33/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 4c7e3a3..7349ad3 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -192,7 +192,6 @@ <dependency> <groupId>org.json4s</groupId> <artifactId>json4s-jackson_${scala.binary.version}</artifactId> - <version>3.2.10</version> </dependency> <dependency> <groupId>com.sun.jersey</groupId> http://git-wip-us.apache.org/repos/asf/spark/blob/9fa43a33/mllib-local/pom.xml ---------------------------------------------------------------------- diff --git a/mllib-local/pom.xml b/mllib-local/pom.xml index c56561f..68f15dd 100644 --- a/mllib-local/pom.xml +++ b/mllib-local/pom.xml @@ -38,19 +38,6 @@ <dependency> <groupId>org.scalanlp</groupId> <artifactId>breeze_${scala.binary.version}</artifactId> - <version>0.11.2</version> - <exclusions> - <!-- This is included as a compile-scoped dependency by jtransforms, which is - a dependency of breeze. --> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.commons</groupId> - <artifactId>commons-math3</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.commons</groupId> http://git-wip-us.apache.org/repos/asf/spark/blob/9fa43a33/mllib/pom.xml ---------------------------------------------------------------------- diff --git a/mllib/pom.xml b/mllib/pom.xml index e56eafc..24d8274 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -77,19 +77,6 @@ <dependency> <groupId>org.scalanlp</groupId> <artifactId>breeze_${scala.binary.version}</artifactId> - <version>0.11.2</version> - <exclusions> - <!-- This is included as a compile-scoped dependency by jtransforms, which is - a dependency of breeze. --> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.commons</groupId> - <artifactId>commons-math3</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.commons</groupId> http://git-wip-us.apache.org/repos/asf/spark/blob/9fa43a33/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4585c8b..a772d51 100644 --- a/pom.xml +++ b/pom.xml @@ -585,6 +585,28 @@ <scope>${hadoop.deps.scope}</scope> </dependency> <dependency> + <groupId>org.scalanlp</groupId> + <artifactId>breeze_${scala.binary.version}</artifactId> + <version>0.11.2</version> + <exclusions> + <!-- This is included as a compile-scoped dependency by jtransforms, which is + a dependency of breeze. --> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.commons</groupId> + <artifactId>commons-math3</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.json4s</groupId> + <artifactId>json4s-jackson_${scala.binary.version}</artifactId> + <version>3.2.10</version> + </dependency> + <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-json</artifactId> <version>${jersey.version}</version> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
