diff options
| author | Xiangrui Meng <meng@databricks.com> | 2014-11-01 15:21:36 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-11-01 15:21:36 -0700 |
| commit | d8176b1c2f22247ee724041aefa1af9118cf861d (patch) | |
| tree | 964064cf27df71c69d3e4e8a63acce9d444fd2ec /mllib/pom.xml | |
| parent | 7894de276b8d0b0e4efc654d0b254fc2a6f6077c (diff) | |
| download | spark-d8176b1c2f22247ee724041aefa1af9118cf861d.tar.gz spark-d8176b1c2f22247ee724041aefa1af9118cf861d.tar.bz2 spark-d8176b1c2f22247ee724041aefa1af9118cf861d.zip | |
[SPARK-4121] Set commons-math3 version based on hadoop profiles, instead of shading
In #2928 , we shade commons-math3 to prevent future conflicts with hadoop. It caused problems with our Jenkins master build with maven. Some tests used local-cluster mode, where the assembly jar contains relocated math3 classes, while mllib test code still compiles with core and the untouched math3 classes.
This PR sets commons-math3 version based on hadoop profiles.
pwendell JoshRosen srowen
Author: Xiangrui Meng <meng@databricks.com>
Closes #3023 from mengxr/SPARK-4121-alt and squashes the following commits:
580f6d9 [Xiangrui Meng] replace tab by spaces
7f71f08 [Xiangrui Meng] revert changes to PoissonSampler to avoid conflicts
d3353d9 [Xiangrui Meng] do not shade commons-math3
b4180dc [Xiangrui Meng] temp work
Diffstat (limited to 'mllib/pom.xml')
| -rw-r--r-- | mllib/pom.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mllib/pom.xml b/mllib/pom.xml index de062a4901..fb7239e779 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -65,6 +65,10 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.commons</groupId> + <artifactId>commons-math3</artifactId> + </exclusion> </exclusions> </dependency> <dependency> |