Author: bodewig
Date: Tue May 22 03:51:38 2012
New Revision: 1341296
URL: http://svn.apache.org/viewvc?rev=1341296&view=rev
Log:
merge javadoc artifact name fix
Modified:
ant/core/branches/ANT_184_BRANCH/build.xml (contents, props changed)
Modified: ant/core/branches/ANT_184_BRANCH/build.xml
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_184_BRANCH/build.xml?rev=1341296&r1=1341295&r2=1341296&view=diff
==============================================================================
--- ant/core/branches/ANT_184_BRANCH/build.xml (original)
+++ ant/core/branches/ANT_184_BRANCH/build.xml Tue May 22 03:51:38 2012
@@ -1233,7 +1233,7 @@
</fileset>
<mapper type="regexp" from="ant(.*).jar"
to="ant\1/${project.version}/ant\1-${project.version}-sources.jar"/>
</copy>
- <jar
destfile="${java-repository.dir}/ant/${project.version}/ant-${project.version}-javadocs.jar"
+ <jar
destfile="${java-repository.dir}/ant/${project.version}/ant-${project.version}-javadoc.jar"
basedir="${build.javadocs}">
<metainf dir="${build.dir}">
<include name="LICENSE.txt"/>
@@ -1243,7 +1243,7 @@
<checksums-mvn>
<fileset dir="${java-repository.dir}"
includes="**/*${project.version}.jar"/>
<fileset dir="${java-repository.dir}"
includes="**/*${project.version}-sources.jar"/>
- <fileset dir="${java-repository.dir}"
includes="**/*${project.version}-javadocs.jar"/>
+ <fileset dir="${java-repository.dir}"
includes="**/*${project.version}-javadoc.jar"/>
<fileset dir="${java-repository.dir}"
includes="**/*${project.version}.pom"/>
</checksums-mvn>
Propchange: ant/core/branches/ANT_184_BRANCH/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue May 22 03:51:38 2012
@@ -0,0 +1,2 @@
+/ant/core/branches/ANT_18_BRANCH/build.xml:1293746
+/ant/core/trunk/build.xml:1240672-1292395,1292976,1292985,1293648,1293659
