HADOOP-9017. svn merge -r 1408467:1408468 from branch-1.1

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

CHANGES.txt

@@ -348,6 +348,10 @@ Release 1.1.1 - Unreleased
     MAPREDUCE-4749. Fixed a bug in TaskTracker because of which kill-actions get
     delayed progressively. (Arpit Gupta via vinodkv)
 
+    HADOOP-9017. Fix hadoop-client-pom-template.xml and
+    hadoop-client-pom-template.xml for version token ( gkesavan )
+
+
 Release 1.1.0 - 2012.09.28
 
   INCOMPATIBLE CHANGES

ivy/hadoop-client-pom-template.xml

@@ -32,7 +32,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-core</artifactId>
-      <version>${project.version}</version>
+      <version>@version</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>

ivy/hadoop-minicluster-pom-template.xml

@@ -32,13 +32,13 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-core</artifactId>
-      <version>${project.version}</version>
+      <version>@version</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-test</artifactId>
-      <version>${project.version}</version>
+      <version>@version</version>
       <scope>compile</scope>
     </dependency>
     <dependency>