- make the sources of the individual ant jars also published into the maven repository

- make a javadoc jar publish with ant's main jar


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1095053 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 45 insertions, 1 deletions

diff --git a/release/ivy.xml b/release/ivy.xml
index 3d24ba203..f65564aeb 100644
--- a/release/ivy.xml
+++ b/release/ivy.xml
@@ -28,86 +28,130 @@
     <artifact name="ant" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant" type="jar" ext="jar"/>
     <artifact name="ant" type="jar.asc" ext="jar.asc"/>
+    <artifact name="ant" type="sources" ext="jar" classifier="sources" />
+    <artifact name="ant" type="sources.asc" ext="jar.asc" classifier="sources" />
+    <artifact name="ant" type="javadocs" ext="jar" classifier="javadocs" />
+    <artifact name="ant" type="javadocs.asc" ext="jar.asc" classifier="javadocs" />
     <artifact name="ant-antlr" type="pom" ext="pom"/>
     <artifact name="ant-antlr" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-antlr" type="jar" ext="jar"/>
     <artifact name="ant-antlr" type="jar.asc" ext="jar.asc"/>
+    <artifact name="ant-antlr" type="sources" ext="jar" classifier="sources" />
+    <artifact name="ant-antlr" type="sources.asc" ext="jar.asc" classifier="sources" />
     <artifact name="ant-apache-bcel" type="pom" ext="pom"/>
     <artifact name="ant-apache-bcel" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-apache-bcel" type="jar" ext="jar"/>
     <artifact name="ant-apache-bcel" type="jar.asc" ext="jar.asc"/>
+    <artifact name="ant-apache-bcel" type="sources" ext="jar" classifier="sources" />
+    <artifact name="ant-apache-bcel" type="sources.asc" ext="jar.asc" classifier="sources" />
     <artifact name="ant-apache-bsf" type="pom" ext="pom"/>
     <artifact name="ant-apache-bsf" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-apache-bsf" type="jar" ext="jar"/>
     <artifact name="ant-apache-bsf" type="jar.asc" ext="jar.asc"/>
+    <artifact name="ant-apache-bsf" type="sources" ext="jar" classifier="sources" />
+    <artifact name="ant-apache-bsf" type="sources.asc" ext="jar.asc" classifier="sources" />
     <artifact name="ant-apache-log4j" type="pom" ext="pom"/>
     <artifact name="ant-apache-log4j" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-apache-log4j" type="jar" ext="jar"/>
     <artifact name="ant-apache-log4j" type="jar.asc" ext="jar.asc"/>
+    <artifact name="ant-apache-log4j" type="sources" ext="jar" classifier="sources" />
+    <artifact name="ant-apache-log4j" type="sources.asc" ext="jar.asc" classifier="sources" />
     <artifact name="ant-apache-oro" type="pom" ext="pom"/>
     <artifact name="ant-apache-oro" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-apache-oro" type="jar" ext="jar"/>
     <artifact name="ant-apache-oro" type="jar.asc" ext="jar.asc"/>
+    <artifact name="ant-apache-oro" type="sources" ext="jar" classifier="sources" />
+    <artifact name="ant-apache-oro" type="sources.asc" ext="jar.asc" classifier="sources" />
     <artifact name="ant-apache-regexp" type="pom" ext="pom"/>
     <artifact name="ant-apache-regexp" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-apache-regexp" type="jar" ext="jar"/>
     <artifact name="ant-apache-regexp" type="jar.asc" ext="jar.asc"/>
+    <artifact name="ant-apache-regexp" type="sources" ext="jar" classifier="sources" />
+    <artifact name="ant-apache-regexp" type="sources.asc" ext="jar.asc" classifier="sources" />
     <artifact name="ant-apache-resolver" type="pom" ext="pom"/>
     <artifact name="ant-apache-resolver" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-apache-resolver" type="jar" ext="jar"/>
     <artifact name="ant-apache-resolver" type="jar.asc" ext="jar.asc"/>
+    <artifact name="ant-apache-resolver" type="sources" ext="jar" classifier="sources" />
+    <artifact name="ant-apache-resolver" type="sources.asc" ext="jar.asc" classifier="sources" />
     <artifact name="ant-apache-xalan2" type="pom" ext="pom"/>
     <artifact name="ant-apache-xalan2" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-apache-xalan2" type="jar" ext="jar"/>
     <artifact name="ant-apache-xalan2" type="jar.asc" ext="jar.asc"/>
+    <artifact name="ant-apache-xalan2" type="sources" ext="jar" classifier="sources" />
+    <artifact name="ant-apache-xalan2" type="sources.asc" ext="jar.asc" classifier="sources" />
     <artifact name="ant-commons-logging" type="pom" ext="pom"/>
     <artifact name="ant-commons-logging" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-commons-logging" type="jar" ext="jar"/>
     <artifact name="ant-commons-logging" type="jar.asc" ext="jar.asc"/>
+    <artifact name="ant-commons-logging" type="sources" ext="jar" classifier="sources" />
+    <artifact name="ant-commons-logging" type="sources.asc" ext="jar.asc" classifier="sources" />
     <artifact name="ant-commons-net" type="pom" ext="pom"/>
     <artifact name="ant-commons-net" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-commons-net" type="jar" ext="jar"/>
     <artifact name="ant-commons-net" type="jar.asc" ext="jar.asc"/>
+    <artifact name="ant-commons-net" type="sources" ext="jar" classifier="sources" />
+    <artifact name="ant-commons-net" type="sources.asc" ext="jar.asc" classifier="sources" />
     <artifact name="ant-jai" type="pom" ext="pom"/>
     <artifact name="ant-jai" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-jai" type="jar" ext="jar"/>
     <artifact name="ant-jai" type="jar.asc" ext="jar.asc"/>
+    <artifact name="ant-jai" type="sources" ext="jar" classifier="sources" />
+    <artifact name="ant-jai" type="sources.asc" ext="jar.asc" classifier="sources" />
     <artifact name="ant-javamail" type="pom" ext="pom"/>
     <artifact name="ant-javamail" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-javamail" type="jar" ext="jar"/>
     <artifact name="ant-javamail" type="jar.asc" ext="jar.asc"/>
+    <artifact name="ant-javamail" type="sources" ext="jar" classifier="sources" />
+    <artifact name="ant-javamail" type="sources.asc" ext="jar.asc" classifier="sources" />
     <artifact name="ant-jdepend" type="pom" ext="pom"/>
     <artifact name="ant-jdepend" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-jdepend" type="jar" ext="jar"/>
     <artifact name="ant-jdepend" type="jar.asc" ext="jar.asc"/>
+    <artifact name="ant-jdepend" type="sources" ext="jar" classifier="sources" />
+    <artifact name="ant-jdepend" type="sources.asc" ext="jar.asc" classifier="sources" />
     <artifact name="ant-jmf" type="pom" ext="pom"/>
     <artifact name="ant-jmf" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-jmf" type="jar" ext="jar"/>
     <artifact name="ant-jmf" type="jar.asc" ext="jar.asc"/>
+    <artifact name="ant-jmf" type="sources" ext="jar" classifier="sources" />
+    <artifact name="ant-jmf" type="sources.asc" ext="jar.asc" classifier="sources" />
     <artifact name="ant-jsch" type="pom" ext="pom"/>
     <artifact name="ant-jsch" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-jsch" type="jar" ext="jar"/>
     <artifact name="ant-jsch" type="jar.asc" ext="jar.asc"/>
+    <artifact name="ant-jsch" type="sources" ext="jar" classifier="sources" />
+    <artifact name="ant-jsch" type="sources.asc" ext="jar.asc" classifier="sources" />
     <artifact name="ant-junit" type="pom" ext="pom"/>
     <artifact name="ant-junit" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-junit" type="jar" ext="jar"/>
     <artifact name="ant-junit" type="jar.asc" ext="jar.asc"/>
+    <artifact name="ant-junit" type="sources" ext="jar" classifier="sources" />
+    <artifact name="ant-junit" type="sources.asc" ext="jar.asc" classifier="sources" />
     <artifact name="ant-launcher" type="pom" ext="pom"/>
     <artifact name="ant-launcher" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-launcher" type="jar" ext="jar"/>
     <artifact name="ant-launcher" type="jar.asc" ext="jar.asc"/>
+    <artifact name="ant-launcher" type="sources" ext="jar" classifier="sources" />
+    <artifact name="ant-launcher" type="sources.asc" ext="jar.asc" classifier="sources" />
     <artifact name="ant-netrexx" type="pom" ext="pom"/>
     <artifact name="ant-netrexx" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-netrexx" type="jar" ext="jar"/>
     <artifact name="ant-netrexx" type="jar.asc" ext="jar.asc"/>
+    <artifact name="ant-netrexx" type="sources" ext="jar" classifier="sources" />
+    <artifact name="ant-netrexx" type="sources.asc" ext="jar.asc" classifier="sources" />
     <artifact name="ant-swing" type="pom" ext="pom"/>
     <artifact name="ant-swing" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-swing" type="jar" ext="jar"/>
     <artifact name="ant-swing" type="jar.asc" ext="jar.asc"/>
+    <artifact name="ant-swing" type="sources" ext="jar" classifier="sources" />
+    <artifact name="ant-swing" type="sources.asc" ext="jar.asc" classifier="sources" />
     <artifact name="ant-testutil" type="pom" ext="pom"/>
     <artifact name="ant-testutil" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-testutil" type="jar" ext="jar"/>
     <artifact name="ant-testutil" type="jar.asc" ext="jar.asc"/>
+    <artifact name="ant-testutil" type="sources" ext="jar" classifier="sources" />
+    <artifact name="ant-testutil" type="sources.asc" ext="jar.asc" classifier="sources" />
   </publications>
   <dependencies/> 
 </ivy-module>
diff --git a/release/upload.xml b/release/upload.xml
index cc6759a4e..5631cfd96 100644
--- a/release/upload.xml
+++ b/release/upload.xml
@@ -22,5 +22,5 @@
   <ivy:resolve file="ivy.xml"/>  
   <ivy:retrieve/>
   <ivy:deliver/>
-  <ivy:publish publishivy="false" artifactspattern="${basedir}/../java-repository/[organisation]/[module]/[artifact]/[revision]/[artifact]-[revision].[ext]" resolver="nexus"/>
+  <ivy:publish publishivy="false" artifactspattern="${basedir}/../java-repository/[organisation]/[module]/[artifact]/[revision]/[artifact]-[revision](-[classifier]).[ext]" resolver="nexus"/>
 </project>
\ No newline at end of file