HDFS-560 patches

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hdfs/branches/HDFS-326@806683 13f79535-47bb-0310-9956-ffa450edef68

build.xml

@@ -1417,7 +1417,7 @@
     <ivy:cachepath pathid="releaseaudit-classpath" conf="releaseaudit"/>
   </target>
 
-  <target name="ivy-report" depends="ivy-resolve-releaseaudit"
+  <target name="ivy-report" depends="ivy-resolve"
     description="Generate">
     <ivy:report todir="${build.ivy.report.dir}" settingsRef="${ant.project.name}.ivy.settings"/>
     <echo>

ivy.xml

@@ -252,10 +252,6 @@
       name="slf4j-api"
       rev="${slf4j-api.version}"
       conf="common->master"/>
-    <dependency org="org.apache.hadoop"
-      name="avro"
-      rev="1.0.0"
-      conf="common->default"/>
     <dependency org="org.eclipse.jdt"
       name="core"
       rev="${core.version}"
@@ -279,6 +275,19 @@
       rev="${aspectj.version}"
       conf="common->default">
     </dependency>
+
+    <dependency org="org.apache.hadoop"
+      name="avro"
+      rev="${avro.version}"
+      conf="mandatory->default"/>
+    <dependency org="org.codehaus.jackson"
+      name="jackson-mapper-asl"
+      rev="${jackson-mapper-asl.version}"
+      conf="mandatory->default"/>
+    <dependency org="com.thoughtworks.paranamer"
+      name="paranamer"
+      rev="${paranamer.version}"
+      conf="mandatory->default"/>
     </dependencies>
   
 </ivy-module>

ivy/hadoop-hdfs.pom

@@ -0,0 +1,47 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.hadoop</groupId>
+  <artifactId>hadoop-hdfs</artifactId>
+  <packaging>jar</packaging>
+  <version>${hadoop.version}</version>
+  <description>
+    Apache Hadoop Core is a software platform that lets one easily write and run applications
+    that process vast amounts of data.
+    hadoop-hdfs contains the server-side and client-side code to work with the Hadoop Distributed File System
+  </description>
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>http://apache.org/licenses/LICENSE-2.0</url>
+    </license>
+  </licenses>
+  <dependencies>
+
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-common</artifactId>
+      <version>${hadoop.version}</version>
+    </dependency>
+
+  </dependencies>
+</project>

ivy/libraries.properties

@@ -15,7 +15,7 @@
 
 #These are the versions of our dependencies (in alphabetical order)
 apacheant.version=1.7.0
-
+avro.version=1.0.0
 checkstyle.version=4.2
 
 commons-cli.version=1.2
@@ -40,11 +40,11 @@ hsqldb.version=1.8.0.10
 
 #ivy.version=2.0.0-beta2
 ivy.version=2.0.0-rc2
-
+jackson-mapper-asl.version=1.0.1
 jasper.version=5.5.12
 jsp.version=2.1
 jsp-api.version=5.5.12
-jets3t.version=0.6.1
+jets3t.version=0.7.1
 jetty.version=6.1.14
 jetty-util.version=6.1.14
 junit.version=4.5
@@ -59,7 +59,7 @@ lucene-core.version=2.3.1
 mina-core.version=2.0.0-M6
 
 oro.version=2.0.8
-
+paranamer.version=1.5
 rats-lib.version=0.6
 
 servlet.version=4.0.6