From a523fbdb6cc64a42a51aa4393fdc5c13f0dbdc25 Mon Sep 17 00:00:00 2001
From: Giridharan Kesavan <gkesavan@apache.org>
Date: Mon, 8 Aug 2011 22:09:28 +0000
Subject: [PATCH] HDFS-2230. Fix ivy conf to resolve/retrieve latest
 common-tests jar published by hadoop common maven build. (gkesavan)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1155123 13f79535-47bb-0310-9956-ffa450edef68
---
 hdfs/CHANGES.txt                   | 3 +++
 hdfs/build.xml                     | 6 +++---
 hdfs/ivy.xml                       | 6 ++++--
 hdfs/ivy/ivysettings.xml           | 8 +++++---
 hdfs/ivy/libraries.properties      | 2 +-
 hdfs/src/contrib/build-contrib.xml | 2 +-
 hdfs/src/contrib/fuse-dfs/ivy.xml  | 8 +++++---
 7 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/hdfs/CHANGES.txt b/hdfs/CHANGES.txt
index a413f44733..083123619d 100644
--- a/hdfs/CHANGES.txt
+++ b/hdfs/CHANGES.txt
@@ -646,6 +646,9 @@ Trunk (unreleased changes)
 
     HDFS-2238. In NamenodeFsck.toString(), uses StringBuilder.(..) instead of
     string concatenation.  (Uma Maheswara Rao G via szetszwo)
+   
+    HDFS-2230. ivy to resolve/retrieve latest common-tests jar published by 
+    hadoop common maven build. (gkesavan)
 
   OPTIMIZATIONS
 
diff --git a/hdfs/build.xml b/hdfs/build.xml
index 3660120d50..cc065c58d9 100644
--- a/hdfs/build.xml
+++ b/hdfs/build.xml
@@ -180,7 +180,7 @@
   <property name="hadoop-hdfs-test.pom" location="${ivy.dir}/hadoop-hdfs-test.xml"/>
 
   <!--this is the naming policy for artifacts we want pulled down-->
-  <property name="ivy.artifact.retrieve.pattern" value="${ant.project.name}/[conf]/[artifact]-[revision].[ext]"/>
+  <property name="ivy.artifact.retrieve.pattern" value="${ant.project.name}/[conf]/[artifact]-[revision](-[classifier]).[ext]"/>
 
   <!--this is how artifacts that get built are named-->
   <property name="ivy.publish.pattern" value="hadoop-hdfs-[revision].[ext]"/>
@@ -247,8 +247,8 @@
     <pathelement location="${build.tools}"/>
     <pathelement path="${clover.jar}"/>
     <path refid="ivy-test.classpath"/>
-    <fileset dir="${lib.dir}">
-      <include name="hadoop-common-test-${hadoop-common.version}.jar" />
+    <fileset dir="${test.ivy.lib.dir}">
+      <include name="hadoop-common-${hadoop-common.version}-tests.jar" />
       <exclude name="**/excluded/" />
     </fileset>
     <pathelement location="${build.classes}"/>
diff --git a/hdfs/ivy.xml b/hdfs/ivy.xml
index e63c44029d..1b3ac831cf 100644
--- a/hdfs/ivy.xml
+++ b/hdfs/ivy.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 
-<ivy-module version="1.0">
+<ivy-module version="1.0" xmlns:m="http://ant.apache.org/ivy/maven">
   <info organisation="org.apache.hadoop" module="${ant.project.name}" revision="${version}">
     <license name="Apache 2.0"/>
     <ivyauthor name="Apache Hadoop Team" url="http://hadoop.apache.org"/>
@@ -86,7 +86,9 @@
 
     <dependency org="org.slf4j" name="slf4j-api" rev="${slf4j-api.version}" conf="test->master"/>
     <dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j-log4j12.version}" conf="test->master"/>
-    <dependency org="org.apache.hadoop" name="hadoop-common-test" rev="${hadoop-common.version}" conf="test->master"/>
+    <dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}" conf="test->master">
+      <artifact name="hadoop-common" type="tests" ext="jar" m:classifier="tests"/>
+    </dependency> 
 
     <dependency org="checkstyle" name="checkstyle" rev="${checkstyle.version}" conf="checkstyle->default"/>
 
diff --git a/hdfs/ivy/ivysettings.xml b/hdfs/ivy/ivysettings.xml
index 0e8b8253fb..a72aafc10d 100644
--- a/hdfs/ivy/ivysettings.xml
+++ b/hdfs/ivy/ivysettings.xml
@@ -31,7 +31,8 @@
   -->
   <property name="repo.maven.org" value="http://repo1.maven.org/maven2/" override="false"/>
   <property name="snapshot.apache.org" value="https://repository.apache.org/content/repositories/snapshots/" override="false"/>
-  <property name="maven2.pattern" value="[organisation]/[module]/[revision]/[module]-[revision]"/>
+  <property name="maven2.pattern" value="[organisation]/[module]/[revision]/[module]-[revision](-[classifier])"/>
+
   <property name="repo.dir" value="${user.home}/.m2/repository"/>
   <property name="maven2.pattern.ext"  value="${maven2.pattern}.[ext]"/>
   <property name="resolvers" value="default" override="false"/>
@@ -41,10 +42,11 @@
   <resolvers>
     <ibiblio name="maven2" root="${repo.maven.org}" pattern="${maven2.pattern.ext}" m2compatible="true"/>
     <ibiblio name="apache-snapshot" root="${snapshot.apache.org}" m2compatible="true"
-        checkmodified="true" changingPattern=".*SNAPSHOT"/>
+        checkmodified="true" changingPattern=".*SNAPSHOT" />
+      
 
     <filesystem name="fs" m2compatible="true" force="${force-resolve}">
-       <artifact pattern="${repo.dir}/[organisation]/[module]/[revision]/[module]-[revision].[ext]"/>
+       <artifact pattern="${repo.dir}/${maven2.pattern.ext}"/>
        <ivy pattern="${repo.dir}/[organisation]/[module]/[revision]/[module]-[revision].pom"/>
     </filesystem>
 
diff --git a/hdfs/ivy/libraries.properties b/hdfs/ivy/libraries.properties
index 8fc14d9d2d..5fcb9d994e 100644
--- a/hdfs/ivy/libraries.properties
+++ b/hdfs/ivy/libraries.properties
@@ -41,7 +41,7 @@ hadoop-hdfs.version=0.23.0-SNAPSHOT
 
 hsqldb.version=1.8.0.10
 
-ivy.version=2.1.0
+ivy.version=2.2.0-rc1
 
 jasper.version=5.5.12
 jdeb.version=0.8
diff --git a/hdfs/src/contrib/build-contrib.xml b/hdfs/src/contrib/build-contrib.xml
index 0c135ce466..0c57fb90a2 100644
--- a/hdfs/src/contrib/build-contrib.xml
+++ b/hdfs/src/contrib/build-contrib.xml
@@ -82,7 +82,7 @@
 
   <!--this is the naming policy for artifacts we want pulled down-->
   <property name="ivy.artifact.retrieve.pattern"
-    			value="${ant.project.name}/[conf]/[artifact]-[revision].[ext]"/>
+    			value="${ant.project.name}/[conf]/[artifact]-[revision](-[classifier]).[ext]"/>
 
   <!-- the normal classpath -->
   <path id="contrib-classpath">
diff --git a/hdfs/src/contrib/fuse-dfs/ivy.xml b/hdfs/src/contrib/fuse-dfs/ivy.xml
index 77e20ae3eb..c99e16eb6d 100644
--- a/hdfs/src/contrib/fuse-dfs/ivy.xml
+++ b/hdfs/src/contrib/fuse-dfs/ivy.xml
@@ -15,7 +15,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<ivy-module version="1.0">
+<ivy-module version="1.0" xmlns:m="http://ant.apache.org/ivy/maven">
   <info organisation="org.apache.hadoop" module="${ant.project.name}">
     <license name="Apache 2.0"/>
     <ivyauthor name="Apache Hadoop Team" url="http://hadoop.apache.org"/>
@@ -45,9 +45,11 @@
       rev="${hadoop-common.version}"
       conf="common->default"/>
     <dependency org="org.apache.hadoop"
-      name="hadoop-common-test"
+      name="hadoop-common"
       rev="${hadoop-common.version}"
-      conf="common->default"/>
+      conf="common->default">
+      <artifact name="hadoop-common" type="tests" ext="jar" m:classifier="tests"/>
+    </dependency>
     <dependency org="log4j"
       name="log4j"
       rev="${log4j.version}"