spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sro...@apache.org
Subject spark git commit: [SPARK-5108][BUILD] Jackson dependency management for Hadoop-2.6.0 support
Date Sat, 07 Feb 2015 19:41:40 GMT
Repository: spark
Updated Branches:
  refs/heads/master dd4cb33a2 -> ecbbed2e4


[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


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/ecbbed2e
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ecbbed2e
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ecbbed2e

Branch: refs/heads/master
Commit: ecbbed2e4ef3e69ddda4a2913fdc00c0f68e1489
Parents: dd4cb33
Author: Zhan Zhang <zhazhan@gmail.com>
Authored: Sat Feb 7 19:41:30 2015 +0000
Committer: Sean Owen <sowen@cloudera.com>
Committed: Sat Feb 7 19:41:30 2015 +0000

----------------------------------------------------------------------
 pom.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/ecbbed2e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index da8ee07..5314bb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message