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 /assembly | |
| 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 'assembly')
| -rw-r--r-- | assembly/pom.xml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/assembly/pom.xml b/assembly/pom.xml index 9e8525dd46..31a01e4d8e 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -146,10 +146,6 @@ <exclude>com/google/common/base/Present*</exclude> </excludes> </relocation> - <relocation> - <pattern>org.apache.commons.math3</pattern> - <shadedPattern>org.spark-project.commons.math3</shadedPattern> - </relocation> </relocations> <transformers> <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> |