diff options
| -rw-r--r-- | assembly/pom.xml | 4 | ||||
| -rw-r--r-- | mllib/pom.xml | 4 | ||||
| -rw-r--r-- | pom.xml | 9 |
3 files changed, 12 insertions, 5 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" /> 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> @@ -145,6 +145,7 @@ <aws.java.sdk.version>1.8.3</aws.java.sdk.version> <aws.kinesis.client.version>1.1.0</aws.kinesis.client.version> <commons.httpclient.version>4.2.6</commons.httpclient.version> + <commons.math3.version>3.1.1</commons.math3.version> <PermGen>64m</PermGen> <MaxPermGen>512m</MaxPermGen> @@ -318,7 +319,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-math3</artifactId> - <version>3.3</version> + <version>${commons.math3.version}</version> </dependency> <dependency> <groupId>com.google.code.findbugs</groupId> @@ -1175,6 +1176,10 @@ <!-- A series of build profiles where customizations for particular Hadoop releases can be made --> + <!-- Hadoop-a.b.c dependencies can be found at + http://hadoop.apache.org/docs/ra.b.c/hadoop-project-dist/hadoop-common/dependency-analysis.html + --> + <profile> <id>hadoop-0.23</id> <!-- SPARK-1121: Adds an explicit dependency on Avro to work around a Hadoop 0.23.X issue --> @@ -1204,6 +1209,7 @@ <hadoop.version>2.3.0</hadoop.version> <protobuf.version>2.5.0</protobuf.version> <jets3t.version>0.9.0</jets3t.version> + <commons.math3.version>3.1.1</commons.math3.version> <avro.mapred.classifier>hadoop2</avro.mapred.classifier> </properties> </profile> @@ -1214,6 +1220,7 @@ <hadoop.version>2.4.0</hadoop.version> <protobuf.version>2.5.0</protobuf.version> <jets3t.version>0.9.0</jets3t.version> + <commons.math3.version>3.1.1</commons.math3.version> <avro.mapred.classifier>hadoop2</avro.mapred.classifier> </properties> </profile> |