hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1240072 - in /hadoop/common/branches/branch-1.0: CHANGES.txt ivy.xml ivy/libraries.properties src/contrib/capacity-scheduler/ivy/libraries.properties src/contrib/gridmix/ivy/libraries.properties src/contrib/hdfsproxy/ivy/libraries.properties
Date Fri, 03 Feb 2012 10:49:20 GMT
Author: mattf
Date: Fri Feb  3 10:49:19 2012
New Revision: 1240072

URL: http://svn.apache.org/viewvc?rev=1240072&view=rev
Log:
merged from branch-1: HADOOP-7470. Move up to Jackson 1.8.8.

Modified:
    hadoop/common/branches/branch-1.0/CHANGES.txt   (contents, props changed)
    hadoop/common/branches/branch-1.0/ivy.xml
    hadoop/common/branches/branch-1.0/ivy/libraries.properties
    hadoop/common/branches/branch-1.0/src/contrib/capacity-scheduler/ivy/libraries.properties
    hadoop/common/branches/branch-1.0/src/contrib/gridmix/ivy/libraries.properties
    hadoop/common/branches/branch-1.0/src/contrib/hdfsproxy/ivy/libraries.properties

Modified: hadoop/common/branches/branch-1.0/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/CHANGES.txt?rev=1240072&r1=1240071&r2=1240072&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.0/CHANGES.txt Fri Feb  3 10:49:19 2012
@@ -16,6 +16,8 @@ Release 1.0.1 - 2012.01.30
     HDFS-2814. NamenodeMXBean does not account for svn revision in the version 
     information. (Hitesh Shah via 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 

Propchange: hadoop/common/branches/branch-1.0/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb  3 10:49:19 2012
@@ -3,7 +3,7 @@
 /hadoop/common/branches/branch-0.20-security/CHANGES.txt:1170042,1170087,1170997,1171137,1171181,1171380,1171613,1171891,1171905,1172184,1172188,1172190,1172192,1173470,1173843,1174326,1174471,1174476,1174482,1175114,1176179,1176182,1176270,1176276,1176675,1176720,1177031,1177036,1177098,1177101,1177907,1178074,1179036,1179171,1179471,1179519,1179713,1179722,1179857,1179919,1183086,1183101,1183176,1183556,1186509,1187141,1189029,1189361,1190079,1190089,1190100,1195737,1197330,1198906,1199401,1199571,1200733,1205148,1205655,1206180
 /hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
 /hadoop/common/branches/branch-0.20-security-204/CHANGES.txt:1128390,1147228,1148069,1149316,1152887,1154413,1159730,1161741
-/hadoop/common/branches/branch-1/CHANGES.txt:1207579,1208143,1208936,1235107
+/hadoop/common/branches/branch-1/CHANGES.txt:1207579,1208143,1208936,1235107,1239393
 /hadoop/core/branches/branch-0.18/CHANGES.txt:727226
 /hadoop/core/branches/branch-0.19/CHANGES.txt:713112
 /hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,735082,736426,738602,738697,739416,740077,740157,741703,741762,743296,743745,743816,743892,744894,745180,745268,746010,746193,746206,746227,746233,746274,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752514,752555,752590,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569

Modified: hadoop/common/branches/branch-1.0/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/ivy.xml?rev=1240072&r1=1240071&r2=1240072&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/ivy.xml (original)
+++ hadoop/common/branches/branch-1.0/ivy.xml Fri Feb  3 10:49:19 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.0/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/ivy/libraries.properties?rev=1240072&r1=1240071&r2=1240072&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/ivy/libraries.properties (original)
+++ hadoop/common/branches/branch-1.0/ivy/libraries.properties Fri Feb  3 10:49:19 2012
@@ -48,7 +48,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.0/src/contrib/capacity-scheduler/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/src/contrib/capacity-scheduler/ivy/libraries.properties?rev=1240072&r1=1240071&r2=1240072&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/src/contrib/capacity-scheduler/ivy/libraries.properties
(original)
+++ hadoop/common/branches/branch-1.0/src/contrib/capacity-scheduler/ivy/libraries.properties
Fri Feb  3 10:49:19 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.0/src/contrib/gridmix/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/src/contrib/gridmix/ivy/libraries.properties?rev=1240072&r1=1240071&r2=1240072&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/src/contrib/gridmix/ivy/libraries.properties (original)
+++ hadoop/common/branches/branch-1.0/src/contrib/gridmix/ivy/libraries.properties Fri Feb
 3 10:49:19 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.0/src/contrib/hdfsproxy/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/src/contrib/hdfsproxy/ivy/libraries.properties?rev=1240072&r1=1240071&r2=1240072&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/src/contrib/hdfsproxy/ivy/libraries.properties (original)
+++ hadoop/common/branches/branch-1.0/src/contrib/hdfsproxy/ivy/libraries.properties Fri Feb
 3 10:49:19 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
 



Mime
View raw message