diff options
| author | Zhan Zhang <zhazhan@gmail.com> | 2015-02-07 19:41:30 +0000 |
|---|---|---|
| committer | Sean Owen <sowen@cloudera.com> | 2015-02-07 19:41:30 +0000 |
| commit | ecbbed2e4ef3e69ddda4a2913fdc00c0f68e1489 (patch) | |
| tree | 543283f2349bb9a5e9f258a295468537a63ece14 /pom.xml | |
| parent | dd4cb33a271b893adebd5ec46dd349b16b591edc (diff) | |
| download | spark-ecbbed2e4ef3e69ddda4a2913fdc00c0f68e1489.tar.gz spark-ecbbed2e4ef3e69ddda4a2913fdc00c0f68e1489.tar.bz2 spark-ecbbed2e4ef3e69ddda4a2913fdc00c0f68e1489.zip | |
[SPARK-5108][BUILD] Jackson dependency management for Hadoop-2.6.0 support
There is dependency compatibility issue. Currently hadoop-2.6.0 use 1.9.13 for jackson. Upgrade to the same version to make it consistent.
Author: Zhan Zhang <zhazhan@gmail.com>
Closes #3938 from zhzhan/spark5108 and squashes the following commits:
0080a84 [Zhan Zhang] change to upgrade jackson version only in hadoop-2.x
0b9bad6 [Zhan Zhang] Merge branch 'master' of https://github.com/apache/spark into spark5108
917600a [Zhan Zhang] solve conflicts
f7064d0 [Zhan Zhang] hadoop2.6 dependency management fix
fc56b25 [Zhan Zhang] squash all commits
3bf966c [Zhan Zhang] test
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 13 |
1 files changed, 13 insertions, 0 deletions
@@ -940,6 +940,16 @@ <scope>${hadoop.deps.scope}</scope> </dependency> <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-xc</artifactId> + <version>${codehaus.jackson.version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-jaxrs</artifactId> + <version>${codehaus.jackson.version}</version> + </dependency> + <dependency> <groupId>${hive.group}</groupId> <artifactId>hive-beeline</artifactId> <version>${hive.version}</version> @@ -1549,6 +1559,7 @@ <protobuf.version>2.5.0</protobuf.version> <hbase.version>0.98.7-hadoop2</hbase.version> <avro.mapred.classifier>hadoop2</avro.mapred.classifier> + <codehaus.jackson.version>1.9.13</codehaus.jackson.version> </properties> </profile> @@ -1561,6 +1572,7 @@ <hbase.version>0.98.7-hadoop2</hbase.version> <commons.math3.version>3.1.1</commons.math3.version> <avro.mapred.classifier>hadoop2</avro.mapred.classifier> + <codehaus.jackson.version>1.9.13</codehaus.jackson.version> </properties> </profile> @@ -1573,6 +1585,7 @@ <hbase.version>0.98.7-hadoop2</hbase.version> <commons.math3.version>3.1.1</commons.math3.version> <avro.mapred.classifier>hadoop2</avro.mapred.classifier> + <codehaus.jackson.version>1.9.13</codehaus.jackson.version> </properties> </profile> |