hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s..@apache.org
Subject svn commit: r1160358 - in /hadoop/common/branches/branch-0.22/hdfs: build.xml ivy/hadoop-hdfs-instrumented-template.xml ivy/hadoop-hdfs-template.xml
Date Mon, 22 Aug 2011 18:24:35 GMT
Author: shv
Date: Mon Aug 22 18:24:35 2011
New Revision: 1160358

URL: http://svn.apache.org/viewvc?rev=1160358&view=rev
Log:
HDFS-2214. Revert last patch.

Modified:
    hadoop/common/branches/branch-0.22/hdfs/build.xml
    hadoop/common/branches/branch-0.22/hdfs/ivy/hadoop-hdfs-instrumented-template.xml
    hadoop/common/branches/branch-0.22/hdfs/ivy/hadoop-hdfs-template.xml

Modified: hadoop/common/branches/branch-0.22/hdfs/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/hdfs/build.xml?rev=1160358&r1=1160357&r2=1160358&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/hdfs/build.xml (original)
+++ hadoop/common/branches/branch-0.22/hdfs/build.xml Mon Aug 22 18:24:35 2011
@@ -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>
 
   <!--

Modified: hadoop/common/branches/branch-0.22/hdfs/ivy/hadoop-hdfs-instrumented-template.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/hdfs/ivy/hadoop-hdfs-instrumented-template.xml?rev=1160358&r1=1160357&r2=1160358&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/hdfs/ivy/hadoop-hdfs-instrumented-template.xml (original)
+++ hadoop/common/branches/branch-0.22/hdfs/ivy/hadoop-hdfs-instrumented-template.xml Mon
Aug 22 18:24:35 2011
@@ -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>

Modified: hadoop/common/branches/branch-0.22/hdfs/ivy/hadoop-hdfs-template.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/hdfs/ivy/hadoop-hdfs-template.xml?rev=1160358&r1=1160357&r2=1160358&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/hdfs/ivy/hadoop-hdfs-template.xml (original)
+++ hadoop/common/branches/branch-0.22/hdfs/ivy/hadoop-hdfs-template.xml Mon Aug 22 18:24:35
2011
@@ -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>



Mime
View raw message