Merge -r 1027655:1027656 from trunk to branch-0.21. Fixes: HADOOP-6954

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

CHANGES.txt

@@ -24,6 +24,9 @@ Release 0.21.1 - Unreleased
     HADOOP-6944. [Herriot] Implement a functionality for getting proxy users
     definitions like groups and hosts. (Vinay Thota via cos)
 
+    HADOOP-6954.  Sources JARs are not correctly published to the Maven
+    repository. (tomwhite)
+
 Release 0.21.0 - 2010-08-13
 
   INCOMPATIBLE CHANGES

build.xml

@@ -1244,7 +1244,8 @@
        <pom refid="hadoop.core"/>
        <attach file="${hadoop-common.jar}.asc" type="jar.asc"/>
        <attach file="${hadoop-common.pom}.asc" type="pom.asc"/>
-       <attach file="${hadoop-common-sources.jar}.asc" type="jar.asc" />
+       <attach file="${hadoop-common-sources.jar}.asc" type="jar.asc"
+         classifier="sources"/>
        <attach file="${hadoop-common-sources.jar}" classifier="sources"/>
      </artifact:deploy>
 
@@ -1253,7 +1254,8 @@
        <pom refid="hadoop.core.test"/>
        <attach file="${hadoop-common-test.jar}.asc" type="jar.asc"/>
        <attach file="${hadoop-common-test.pom}.asc" type="pom.asc"/>
-       <attach file="${hadoop-common-test-sources.jar}.asc" type="jar.asc"/>
+       <attach file="${hadoop-common-test-sources.jar}.asc" type="jar.asc"
+         classifier="sources"/>
        <attach file="${hadoop-common-test-sources.jar}" classifier="sources"/>
      </artifact:deploy>
 
@@ -1263,7 +1265,7 @@
        <attach file="${hadoop-common-instrumented.jar}.asc" type="jar.asc"/>
        <attach file="${hadoop-common-instrumented.pom}.asc" type="pom.asc"/>
        <attach file="${hadoop-common-instrumented-sources.jar}.asc" 
-         type="jar.asc"/>
+         type="jar.asc" classifier="sources"/>
        <attach file="${hadoop-common-instrumented-sources.jar}"
          classifier="sources"/>
      </artifact:deploy>