HDFS-2214. Revert last patch.

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

hdfs/build.xml

@@ -1724,14 +1724,6 @@
         <include name="hadoop-hdfs-${herriot.suffix}-test.xml"/>
       </fileset>
     </replaceregexp>
-    <replaceregexp byline="true">
-      <regexp pattern="@hadoop-common.version"/>
-      <substitution expression="${hadoop-common.version}"/>
-      <fileset dir="${basedir}/ivy">
-        <include name="hadoop-hdfs.xml"/>
-        <include name="hadoop-hdfs-${herriot.suffix}.xml"/>
-      </fileset>
-    </replaceregexp>
   </target>
 
   <!--

hdfs/ivy/hadoop-hdfs-instrumented-template.xml

@@ -33,7 +33,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-common-instrumented</artifactId>
-      <version>@hadoop-common.version</version>
+      <version>0.22.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>

hdfs/ivy/hadoop-hdfs-template.xml

@@ -33,7 +33,12 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-common</artifactId>
-      <version>@hadoop-common.version</version>
+      <version>0.22.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>r09</version>
     </dependency>
   </dependencies>
 </project>