Skip to content

Commit ecbbed2

Browse files
zhzhansrowen
authored andcommitted
[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 <[email protected]> Closes apache#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
1 parent dd4cb33 commit ecbbed2

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -939,6 +939,16 @@
939939
<version>${codehaus.jackson.version}</version>
940940
<scope>${hadoop.deps.scope}</scope>
941941
</dependency>
942+
<dependency>
943+
<groupId>org.codehaus.jackson</groupId>
944+
<artifactId>jackson-xc</artifactId>
945+
<version>${codehaus.jackson.version}</version>
946+
</dependency>
947+
<dependency>
948+
<groupId>org.codehaus.jackson</groupId>
949+
<artifactId>jackson-jaxrs</artifactId>
950+
<version>${codehaus.jackson.version}</version>
951+
</dependency>
942952
<dependency>
943953
<groupId>${hive.group}</groupId>
944954
<artifactId>hive-beeline</artifactId>
@@ -1549,6 +1559,7 @@
15491559
<protobuf.version>2.5.0</protobuf.version>
15501560
<hbase.version>0.98.7-hadoop2</hbase.version>
15511561
<avro.mapred.classifier>hadoop2</avro.mapred.classifier>
1562+
<codehaus.jackson.version>1.9.13</codehaus.jackson.version>
15521563
</properties>
15531564
</profile>
15541565

@@ -1561,6 +1572,7 @@
15611572
<hbase.version>0.98.7-hadoop2</hbase.version>
15621573
<commons.math3.version>3.1.1</commons.math3.version>
15631574
<avro.mapred.classifier>hadoop2</avro.mapred.classifier>
1575+
<codehaus.jackson.version>1.9.13</codehaus.jackson.version>
15641576
</properties>
15651577
</profile>
15661578

@@ -1573,6 +1585,7 @@
15731585
<hbase.version>0.98.7-hadoop2</hbase.version>
15741586
<commons.math3.version>3.1.1</commons.math3.version>
15751587
<avro.mapred.classifier>hadoop2</avro.mapred.classifier>
1588+
<codehaus.jackson.version>1.9.13</codehaus.jackson.version>
15761589
</properties>
15771590
</profile>
15781591

0 commit comments

Comments
 (0)