diff options
| author | witgo <witgo@qq.com> | 2014-04-28 22:50:51 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-04-28 22:55:09 -0700 |
| commit | ee964609e12be89190cdc4566f83d807b6749751 (patch) | |
| tree | c7fe0e331236e59aafdbdf3fd4de5f39e6dd81a6 /mllib | |
| parent | 42ba70625d0e50a91662f124ecb7526105b3c768 (diff) | |
| download | spark-ee964609e12be89190cdc4566f83d807b6749751.tar.gz spark-ee964609e12be89190cdc4566f83d807b6749751.tar.bz2 spark-ee964609e12be89190cdc4566f83d807b6749751.zip | |
Improved build configuration
1, Fix SPARK-1441: compile spark core error with hadoop 0.23.x
2, Fix SPARK-1491: maven hadoop-provided profile fails to build
3, Fix org.scala-lang: * ,org.apache.avro:* inconsistent versions dependency
4, A modified on the sql/catalyst/pom.xml,sql/hive/pom.xml,sql/core/pom.xml (Four spaces formatted into two spaces)
Author: witgo <witgo@qq.com>
Closes #480 from witgo/format_pom and squashes the following commits:
03f652f [witgo] review commit
b452680 [witgo] Merge branch 'master' of https://github.com/apache/spark into format_pom
bee920d [witgo] revert fix SPARK-1629: Spark Core missing commons-lang dependence
7382a07 [witgo] Merge branch 'master' of https://github.com/apache/spark into format_pom
6902c91 [witgo] fix SPARK-1629: Spark Core missing commons-lang dependence
0da4bc3 [witgo] merge master
d1718ed [witgo] Merge branch 'master' of https://github.com/apache/spark into format_pom
e345919 [witgo] add avro dependency to yarn-alpha
77fad08 [witgo] Merge branch 'master' of https://github.com/apache/spark into format_pom
62d0862 [witgo] Fix org.scala-lang: * inconsistent versions dependency
1a162d7 [witgo] Merge branch 'master' of https://github.com/apache/spark into format_pom
934f24d [witgo] review commit
cf46edc [witgo] exclude jruby
06e7328 [witgo] Merge branch 'SparkBuild' into format_pom
99464d2 [witgo] fix maven hadoop-provided profile fails to build
0c6c1fc [witgo] Fix compile spark core error with hadoop 0.23.x
6851bec [witgo] Maintain consistent SparkBuild.scala, pom.xml
(cherry picked from commit 030f2c2126d5075576cd6d83a1ee7462c48b953b)
Conflicts:
sql/catalyst/pom.xml
sql/core/pom.xml
sql/hive/pom.xml
Diffstat (limited to 'mllib')
| -rw-r--r-- | mllib/pom.xml | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/mllib/pom.xml b/mllib/pom.xml index 3461dd8412..4c67de8b24 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -31,20 +31,6 @@ <name>Spark Project ML Library</name> <url>http://spark.apache.org/</url> - <profiles> - <profile> - <!-- SPARK-1121: SPARK-1121: Adds an explicit dependency on Avro to work around - a Hadoop 0.23.X issue --> - <id>yarn-alpha</id> - <dependencies> - <dependency> - <groupId>org.apache.avro</groupId> - <artifactId>avro</artifactId> - </dependency> - </dependencies> - </profile> - </profiles> - <dependencies> <dependency> <groupId>org.apache.spark</groupId> |