HADOOP-6395. Upgrade some libraries to be consistent across common, hdfs,

and mapreduce. (omalley)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.21@884429 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -613,6 +613,9 @@ Trunk (unreleased changes)
     HADOOP-6367. Removes Access Token implementation from common.
     (Kan Zhang via ddas)
 
+    HADOOP-6395. Upgrade some libraries to be consistent across common, hdfs,
+    and mapreduce. (omalley)
+
   OPTIMIZATIONS
 
     HADOOP-5595. NameNode does not need to run a replicator to choose a

ivy.xml

@@ -269,7 +269,9 @@
     <dependency org="org.apache.hadoop"
       name="avro"
       rev="${avro.version}"
-      conf="common->default"/>
+      conf="common->default">
+      <exclude module="slf4j-simple"/>
+    </dependency>
     <dependency org="org.codehaus.jackson"
       name="jackson-mapper-asl"
       rev="${jackson.version}"

ivy/hadoop-core-template.xml

@@ -121,7 +121,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>avro</artifactId>
-      <version>1.0.0</version>
+      <version>1.2.0</version>
     </dependency>
   </dependencies>
 </project>

ivy/libraries.properties

@@ -27,8 +27,8 @@ commons-codec.version=1.3
 commons-collections.version=3.1
 commons-httpclient.version=3.0.1
 commons-lang.version=2.4
-commons-logging.version=1.0.4
-commons-logging-api.version=1.0.4
+commons-logging.version=1.1.1
+commons-logging-api.version=1.1
 commons-el.version=1.0
 commons-fileupload.version=1.2
 commons-io.version=1.4
@@ -78,4 +78,4 @@ slf4j-log4j12.version=1.4.3
 xmlenc.version=0.52
 xerces.version=1.4.4
 
-aspectj.version=1.6.4
+aspectj.version=1.6.5