Commit ecbbed2
[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] test1 parent dd4cb33 commit ecbbed2
1 file changed
+13
-0
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
939 | 939 | | |
940 | 940 | | |
941 | 941 | | |
| 942 | + | |
| 943 | + | |
| 944 | + | |
| 945 | + | |
| 946 | + | |
| 947 | + | |
| 948 | + | |
| 949 | + | |
| 950 | + | |
| 951 | + | |
942 | 952 | | |
943 | 953 | | |
944 | 954 | | |
| |||
1549 | 1559 | | |
1550 | 1560 | | |
1551 | 1561 | | |
| 1562 | + | |
1552 | 1563 | | |
1553 | 1564 | | |
1554 | 1565 | | |
| |||
1561 | 1572 | | |
1562 | 1573 | | |
1563 | 1574 | | |
| 1575 | + | |
1564 | 1576 | | |
1565 | 1577 | | |
1566 | 1578 | | |
| |||
1573 | 1585 | | |
1574 | 1586 | | |
1575 | 1587 | | |
| 1588 | + | |
1576 | 1589 | | |
1577 | 1590 | | |
1578 | 1591 | | |
| |||
0 commit comments