Author: szetszwo
Date: Wed Feb 1 23:07:45 2012
New Revision: 1239393
URL: http://svn.apache.org/viewvc?rev=1239393&view=rev
Log:
HADOOP-7470. Move up to Jackson 1.8.8. Contributed by Enis Soztutar
Modified:
hadoop/common/branches/branch-1/CHANGES.txt
hadoop/common/branches/branch-1/ivy.xml
hadoop/common/branches/branch-1/ivy/libraries.properties
hadoop/common/branches/branch-1/src/contrib/capacity-scheduler/ivy/libraries.properties
hadoop/common/branches/branch-1/src/contrib/gridmix/ivy/libraries.properties
hadoop/common/branches/branch-1/src/contrib/hdfsproxy/ivy/libraries.properties
Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1239393&r1=1239392&r2=1239393&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Wed Feb 1 23:07:45 2012
@@ -165,6 +165,8 @@ Release 1.0.1 - 2012.01.30
HADOOP-7988. Upper case in hostname part of the principals doesn't work
with
kerberos. (jitendra)
+ HADOOP-7470. Move up to Jackson 1.8.8. (Enis Soztutar via szetszwo)
+
BUG FIXES
HADOOP-7960. Port HADOOP-5203 to branch-1, build version comparison is too
Modified: hadoop/common/branches/branch-1/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/ivy.xml?rev=1239393&r1=1239392&r2=1239393&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/ivy.xml (original)
+++ hadoop/common/branches/branch-1/ivy.xml Wed Feb 1 23:07:45 2012
@@ -286,7 +286,7 @@
</dependency>
<dependency org="org.codehaus.jackson"
name="jackson-mapper-asl"
- rev="1.0.1"
+ rev="${jackson.version}"
conf="common->default"/>
<dependency org="org.mockito"
name="mockito-all"
Modified: hadoop/common/branches/branch-1/ivy/libraries.properties
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/ivy/libraries.properties?rev=1239393&r1=1239392&r2=1239393&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/ivy/libraries.properties (original)
+++ hadoop/common/branches/branch-1/ivy/libraries.properties Wed Feb 1
23:07:45 2012
@@ -49,7 +49,7 @@ hsqldb.version=1.8.0.10
ivy.version=2.1.0
jasper.version=5.5.12
-jackson.version=1.0.1
+jackson.version=1.8.8
#not able to figureout the version of jsp & jsp-api version to get it resolved
throught ivy
# but still declared here as we are going to have a local copy from the lib
folder
jsp.version=2.1
Modified:
hadoop/common/branches/branch-1/src/contrib/capacity-scheduler/ivy/libraries.properties
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/contrib/capacity-scheduler/ivy/libraries.properties?rev=1239393&r1=1239392&r2=1239393&view=diff
==============================================================================
---
hadoop/common/branches/branch-1/src/contrib/capacity-scheduler/ivy/libraries.properties
(original)
+++
hadoop/common/branches/branch-1/src/contrib/capacity-scheduler/ivy/libraries.properties
Wed Feb 1 23:07:45 2012
@@ -4,7 +4,7 @@
#Please list the dependencies name with version if they are different from the
ones
#listed in the global libraries.properties file (in alphabetical order)
-jackson.version=1.0.1
+jackson.version=1.8.8
commons-configuration.version=1.6
commons-math.version=2.1
Modified:
hadoop/common/branches/branch-1/src/contrib/gridmix/ivy/libraries.properties
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/contrib/gridmix/ivy/libraries.properties?rev=1239393&r1=1239392&r2=1239393&view=diff
==============================================================================
---
hadoop/common/branches/branch-1/src/contrib/gridmix/ivy/libraries.properties
(original)
+++
hadoop/common/branches/branch-1/src/contrib/gridmix/ivy/libraries.properties
Wed Feb 1 23:07:45 2012
@@ -19,7 +19,7 @@
#Please list the dependencies name with version if they are different from the
ones
#listed in the global libraries.properties file (in alphabetical order)
-jackson.version=1.0.1
+jackson.version=1.8.8
commons-configuration.version=1.6
commons-math.version=2.1
Modified:
hadoop/common/branches/branch-1/src/contrib/hdfsproxy/ivy/libraries.properties
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/contrib/hdfsproxy/ivy/libraries.properties?rev=1239393&r1=1239392&r2=1239393&view=diff
==============================================================================
---
hadoop/common/branches/branch-1/src/contrib/hdfsproxy/ivy/libraries.properties
(original)
+++
hadoop/common/branches/branch-1/src/contrib/hdfsproxy/ivy/libraries.properties
Wed Feb 1 23:07:45 2012
@@ -3,7 +3,7 @@
#These are the versions of our dependencies (in alphabetical order)
log4j.version=1.2.15
slf4j-api.version=1.4.3
-jackson.version=1.0.1
+jackson.version=1.8.8
commons-configuration.version=1.6
commons-math.version=2.1