HADOOP-1212. Harmonize HDFS JAR library versions with Common.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hdfs/trunk@959505 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -1007,6 +1007,8 @@ Release 0.21.0 - Unreleased
     HDFS_1057. Concurrent readers hit ChecksumExceptions if following a
     writer to very end of file. (sam rash via hairong)
 
+    HADOOP-1212. Harmonize HDFS JAR library versions with Common. (tomwhite)
+
 Release 0.20.3 - Unreleased
 
   IMPROVEMENTS

ivy.xml

@@ -60,7 +60,11 @@
     <dependency org="org.apache.hadoop" name="hadoop-common-instrumented" rev="${hadoop-common.version}" conf="system->default"/>
     <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}" conf="common->master"/>
     <dependency org="log4j" name="log4j" rev="${log4j.version}" conf="common->master"/>
-    <dependency org="org.apache.hadoop" name="avro" rev="${avro.version}" conf="common->default"/>
+    <dependency org="org.apache.hadoop" name="avro" rev="${avro.version}" conf="common->default">
+      <exclude module="ant"/>
+      <exclude module="jetty"/>
+      <exclude module="slf4j-simple"/>
+    </dependency>
     <dependency org="org.aspectj" name="aspectjrt" rev="${aspectj.version}" conf="common->default"/>
     <dependency org="org.aspectj" name="aspectjtools" rev="${aspectj.version}" conf="common->default"/>
 

ivy/libraries.properties

@@ -14,7 +14,6 @@
 #It drives ivy and the generation of a maven POM
 
 #These are the versions of our dependencies (in alphabetical order)
-apacheant.version=1.7.1
 ant-task.version=2.0.10
 avro.version=1.3.2
 
@@ -23,8 +22,7 @@ checkstyle.version=4.2
 commons-cli.version=1.2
 commons-cli2.version=2.0-mahout
 commons-collections.version=3.1
-commons-httpclient.version=3.0.1
-commons-lang.version=2.4
+commons-lang.version=2.5
 commons-logging.version=1.1.1
 commons-logging-api.version=1.1
 commons-el.version=1.0
@@ -34,24 +32,19 @@ commons-net.version=1.4.1
 core.version=3.1.1
 coreplugin.version=1.3.2
 
-ftplet-api.version=1.0.2
-ftpserver-core.version=1.0.2
-
 hadoop-common.version=0.22.0-SNAPSHOT
 hadoop-hdfs.version=0.22.0-SNAPSHOT
 
 hsqldb.version=1.8.0.10
 
-#ivy.version=2.0.0-beta2
-ivy.version=2.0.0-rc2
+ivy.version=2.1.0
 
 jasper.version=5.5.12
 jsp.version=2.1
 jsp-api.version=5.5.12
-jets3t.version=0.6.1
 jetty.version=6.1.14
 jetty-util.version=6.1.14
-junit.version=4.5
+junit.version=4.8.1
 jdiff.version=1.0.9
 json.version=1.0
 
@@ -60,8 +53,6 @@ kfs.version=0.3
 log4j.version=1.2.15
 lucene-core.version=2.3.1
 
-mina-core.version=2.0.0-M6
-
 oro.version=2.0.8
 
 rats-lib.version=0.6
@@ -69,8 +60,8 @@ rats-lib.version=0.6
 servlet.version=4.0.6
 servlet-api-2.5.version=6.1.14
 servlet-api.version=2.5
-slf4j-api.version=1.4.3
-slf4j-log4j12.version=1.4.3
+slf4j-api.version=1.5.11
+slf4j-log4j12.version=1.5.11
 
 xmlenc.version=0.52
 xerces.version=1.4.4

src/contrib/hdfsproxy/ivy/libraries.properties

@@ -1,18 +1,18 @@
 #This properties file lists the versions of the various artifacts used by hadoop.
 #It drives ivy and the generation of a maven POM
 #These are the versions of our dependencies (in alphabetical order)
-ivy.version=2.0.0-rc2
+ivy.version=2.1.0
 
 log4j.version=1.2.15
-slf4j-api.version=1.4.3
-slf4j-log4j12.version=1.4.3
+slf4j-api.version=1.5.11
+slf4j-log4j12.version=1.5.11
 jetty.version=6.1.14
 jetty-util.version=6.1.14
 servlet-api-2.5.version=6.1.14
 cactus.version=1.8.0
-commons-logging.version=1.1
-commons-logging-api.version=1.0.4
-junit.version=3.8.2
+commons-logging.version=1.1.1
+commons-logging-api.version=1.1
+junit.version=4.8.1
 jsp.version=2.1
 core.version=3.1.1
 xmlenc.version=0.52