diff options
| author | Jey Kottalam <jey@cs.berkeley.edu> | 2013-08-15 15:31:31 -0700 |
|---|---|---|
| committer | Jey Kottalam <jey@cs.berkeley.edu> | 2013-08-16 13:50:12 -0700 |
| commit | 11b42a84db255eb659412e9d0bf4622cb2e8b20a (patch) | |
| tree | 1cdcacf8ad3efbb9c942e5567d67a9967c6a6047 /pom.xml | |
| parent | 353fab2440dbf1369df20393e0377de2b327de72 (diff) | |
| download | spark-11b42a84db255eb659412e9d0bf4622cb2e8b20a.tar.gz spark-11b42a84db255eb659412e9d0bf4622cb2e8b20a.tar.bz2 spark-11b42a84db255eb659412e9d0bf4622cb2e8b20a.zip | |
Maven build now works with CDH hadoop-2.0.0-mr1
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 55 |
1 files changed, 20 insertions, 35 deletions
@@ -73,8 +73,9 @@ <mesos.version>0.12.1</mesos.version> <akka.version>2.0.3</akka.version> <slf4j.version>1.7.2</slf4j.version> - <cdh.version>4.1.2</cdh.version> <log4j.version>1.2.17</log4j.version> + <hadoop.version>1.2.1</hadoop.version> + <!-- <hadoop.version>2.0.0-mr1-cdh4.1.2</hadoop.version> --> <PermGen>64m</PermGen> <MaxPermGen>512m</MaxPermGen> @@ -328,7 +329,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> - <version>1.2.1</version> + <version>${hadoop.version}</version> <exclusions> <exclusion> <groupId>asm</groupId> @@ -336,6 +337,23 @@ </exclusion> </exclusions> </dependency> + <!-- Specify Avro version because Kafka also has it as a dependency --> + <dependency> + <groupId>org.apache.avro</groupId> + <artifactId>avro</artifactId> + <version>1.7.4</version> + </dependency> + <dependency> + <groupId>org.apache.avro</groupId> + <artifactId>avro-ipc</artifactId> + <version>1.7.4</version> + <exclusions> + <exclusion> + <groupId>org.jboss.netty</groupId> + <artifactId>netty</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> </dependencyManagement> @@ -542,39 +560,6 @@ <profiles> <profile> - <id>hadoop2</id> - <properties> - <hadoop.major.version>2</hadoop.major.version> - </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> - <version>2.0.0-mr1-cdh${cdh.version}</version> - </dependency> - <!-- Specify Avro version because Kafka also has it as a dependency --> - <dependency> - <groupId>org.apache.avro</groupId> - <artifactId>avro</artifactId> - <version>1.7.4</version> - </dependency> - <dependency> - <groupId>org.apache.avro</groupId> - <artifactId>avro-ipc</artifactId> - <version>1.7.4</version> - <exclusions> - <exclusion> - <groupId>org.jboss.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - </dependencyManagement> - </profile> - - <profile> <id>hadoop2-yarn</id> <properties> <hadoop.major.version>2</hadoop.major.version> |