diff options
| author | witgo <witgo@qq.com> | 2014-04-28 22:50:51 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-04-28 22:51:46 -0700 |
| commit | 030f2c2126d5075576cd6d83a1ee7462c48b953b (patch) | |
| tree | a695bbe5ec5dd2270e2671aef3f65f4911275b5c /external | |
| parent | 9f7a095184d6c7a9b1bbac55efcc3d878f876768 (diff) | |
| download | spark-030f2c2126d5075576cd6d83a1ee7462c48b953b.tar.gz spark-030f2c2126d5075576cd6d83a1ee7462c48b953b.tar.bz2 spark-030f2c2126d5075576cd6d83a1ee7462c48b953b.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
Diffstat (limited to 'external')
| -rw-r--r-- | external/flume/pom.xml | 14 | ||||
| -rw-r--r-- | external/kafka/pom.xml | 14 | ||||
| -rw-r--r-- | external/mqtt/pom.xml | 14 | ||||
| -rw-r--r-- | external/twitter/pom.xml | 14 | ||||
| -rw-r--r-- | external/zeromq/pom.xml | 14 |
5 files changed, 0 insertions, 70 deletions
diff --git a/external/flume/pom.xml b/external/flume/pom.xml index b84ca0c5e1..03d3b2394f 100644 --- a/external/flume/pom.xml +++ b/external/flume/pom.xml @@ -31,20 +31,6 @@ <name>Spark Project External Flume</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> diff --git a/external/kafka/pom.xml b/external/kafka/pom.xml index 343e1fabd8..979eb0ca62 100644 --- a/external/kafka/pom.xml +++ b/external/kafka/pom.xml @@ -31,20 +31,6 @@ <name>Spark Project External Kafka</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> diff --git a/external/mqtt/pom.xml b/external/mqtt/pom.xml index 3710a63541..9aa1c1a9f5 100644 --- a/external/mqtt/pom.xml +++ b/external/mqtt/pom.xml @@ -31,20 +31,6 @@ <name>Spark Project External MQTT</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> diff --git a/external/twitter/pom.xml b/external/twitter/pom.xml index 398b9f4fba..a443459594 100644 --- a/external/twitter/pom.xml +++ b/external/twitter/pom.xml @@ -31,20 +31,6 @@ <name>Spark Project External Twitter</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> diff --git a/external/zeromq/pom.xml b/external/zeromq/pom.xml index 77e957f404..a40e55876e 100644 --- a/external/zeromq/pom.xml +++ b/external/zeromq/pom.xml @@ -31,20 +31,6 @@ <name>Spark Project External ZeroMQ</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> |