You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/12/27 07:59:36 UTC
spark git commit: [SPARK-3955] Different versions between
jackson-mapper-asl and jackson-c...
Repository: spark
Updated Branches:
refs/heads/master 82bf4bee1 -> 2483c1efb
[SPARK-3955] Different versions between jackson-mapper-asl and jackson-c...
...ore-asl
- set the same version to jackson-mapper-asl and jackson-core-asl
- It's related with #2818
- coded a same patch from a latest master
Author: Jongyoul Lee <jo...@gmail.com>
Closes #3716 from jongyoul/SPARK-3955 and squashes the following commits:
efa29aa [Jongyoul Lee] [SPARK-3955] Different versions between jackson-mapper-asl and jackson-core-asl - set the same version to jackson-mapper-asl and 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/2483c1ef
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/2483c1ef
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/2483c1ef
Branch: refs/heads/master
Commit: 2483c1efb6429a7d8a20c96d18ce2fec93a1aff9
Parents: 82bf4be
Author: Jongyoul Lee <jo...@gmail.com>
Authored: Fri Dec 26 22:59:34 2014 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Fri Dec 26 22:59:34 2014 -0800
----------------------------------------------------------------------
pom.xml | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/2483c1ef/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e4db139..a843af2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,6 +149,7 @@
<scala.binary.version>2.10</scala.binary.version>
<jline.version>${scala.version}</jline.version>
<jline.groupid>org.scala-lang</jline.groupid>
+ <jackson.version>1.8.8</jackson.version>
</properties>
<repositories>
@@ -819,10 +820,15 @@
</exclusions>
</dependency>
<dependency>
- <!-- Matches the version of jackson-core-asl pulled in by avro -->
+ <!-- Matches the versions of jackson-mapper-asl and jackson-core-asl with avro -->
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
- <version>1.8.8</version>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>${jackson.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org