Repository: spark Updated Branches: refs/heads/master 07fa1910d -> b239ea1c3
SPARK-3955 part 2 [CORE] [HOTFIX] Different versions between jackson-mapper-asl and jackson-core-asl pwendell https://github.com/apache/spark/commit/2483c1efb6429a7d8a20c96d18ce2fec93a1aff9 didn't actually add a reference to `jackson-core-asl` as intended, but a second redundant reference to `jackson-mapper-asl`, as markhamstra picked up on (https://github.com/apache/spark/pull/3716#issuecomment-68180192) This just rectifies the typo. I missed it as well; the original PR https://github.com/apache/spark/pull/2818 had it correct and I also didn't see the problem. Author: Sean Owen <[email protected]> Closes #3829 from srowen/SPARK-3955 and squashes the following commits: 6cfdc4e [Sean Owen] Actually refer to jackson-core-asl Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/b239ea1c Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/b239ea1c Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/b239ea1c Branch: refs/heads/master Commit: b239ea1c31aeaa752d5dc8f45423df1f8c0924ca Parents: 07fa191 Author: Sean Owen <[email protected]> Authored: Tue Dec 30 14:00:57 2014 -0800 Committer: Patrick Wendell <[email protected]> Committed: Tue Dec 30 14:00:57 2014 -0800 ---------------------------------------------------------------------- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/b239ea1c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a843af2..05f59a9 100644 --- a/pom.xml +++ b/pom.xml @@ -827,7 +827,7 @@ </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> + <artifactId>jackson-core-asl</artifactId> <version>${jackson.version}</version> </dependency> </dependencies> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
