svn commit: r736433 - /velocity/engine/branches/1.6.x/build/build.xml

[nb...@apache.org]

Author: nbubna
Date: Wed Jan 21 14:06:59 2009
New Revision: 736433

URL: http://svn.apache.org/viewvc?rev=736433&view=rev
Log:
VELOCITY-554 merge r736425 from trunk

Modified:
    velocity/engine/branches/1.6.x/build/build.xml

Modified: velocity/engine/branches/1.6.x/build/build.xml
URL: http://svn.apache.org/viewvc/velocity/engine/branches/1.6.x/build/build.xml?rev=736433&r1=736432&r2=736433&view=diff
==============================================================================
--- velocity/engine/branches/1.6.x/build/build.xml (original)
+++ velocity/engine/branches/1.6.x/build/build.xml Wed Jan 21 14:06:59 2009
@@ -477,7 +477,7 @@
   <target name="jar-src"
           depends="prepare"
           description="Builds the Velocity Source Jar File">
-    <jar jarfile="${build.dir}/${final.name}-src.jar">
+    <jar jarfile="${build.dir}/${final.name}-sources.jar">
       <metainf dir="${velocity.dir}">
         <include name="LICENSE"/>
         <include name="NOTICE"/>
@@ -494,10 +494,10 @@
         <attribute name="Implementation-Version" value="${version}"/>
       </manifest>
     </jar>
-    <checksum file="${build.dir}/${final.name}-src.jar" algorithm="md5" property="checksum.jar-src.md5"/>
-    <checksum file="${build.dir}/${final.name}-src.jar" algorithm="sha1" property="checksum.jar-src.sha1"/>
-    <echo message="${checksum.jar-src.md5} *${final.name}-src.jar" file="${build.dir}/${final.name}-src.jar.md5" />
-    <echo message="${checksum.jar-src.sha1} *${final.name}-src.jar" file="${build.dir}/${final.name}-src.jar.sha1" />
+    <checksum file="${build.dir}/${final.name}-sources.jar" algorithm="md5" property="checksum.jar-src.md5"/>
+    <checksum file="${build.dir}/${final.name}-sources.jar" algorithm="sha1" property="checksum.jar-src.sha1"/>
+    <echo message="${checksum.jar-src.md5} *${final.name}-sources.jar" file="${build.dir}/${final.name}-sources.jar.md5" />
+    <echo message="${checksum.jar-src.sha1} *${final.name}-sources.jar" file="${build.dir}/${final.name}-sources.jar.sha1" />
   </target>
 
   <!-- =================================================================== -->
@@ -635,7 +635,7 @@
 
     <artifact:install file="${build.dir}/${project}-${version}.jar" >
       <pom refid="maven.project"/>
-      <attach file="${build.dir}/${project}-${version}-src.jar" type="jar" classifier="sources"/>
+      <attach file="${build.dir}/${project}-${version}-sources.jar" type="jar" classifier="sources"/>
       <attach file="${build.dir}/${project}-${version}-dep.jar" type="jar" classifier="dep"/>
       <attach file="${build.dir}/${project}-${version}-javadoc.jar" type="jar" classifier="javadoc"/>
     </artifact:install>
@@ -644,7 +644,7 @@
   <!-- =================================================================== -->
   <!-- Deploy Maven artifacts  - custom repository                        -->
   <!-- =================================================================== -->
-  <target name="maven-deploy-custom-repository" if="maven.remote.repository"
+  <target name="maven-deploy-custom-repository" depends="maven-prepare" if="maven.remote.repository"
     description="Deploys the Maven artifacts in local repository">
 
     <echo>Deploying to ${maven.remote.repository}</echo>
@@ -652,7 +652,7 @@
     <artifact:deploy file="${build.dir}/${project}-${version}.jar" >
         <remoteRepository id="velocity.custom.repository" url="${maven.remote.repository}"/>
         <pom refid="maven.project"/>
-        <attach file="${build.dir}/${project}-${version}-src.jar" type="jar" classifier="sources"/>
+        <attach file="${build.dir}/${project}-${version}-sources.jar" type="jar" classifier="sources"/>
         <attach file="${build.dir}/${project}-${version}-dep.jar" type="jar" classifier="dep"/>
         <attach file="${build.dir}/${project}-${version}-javadoc.jar" type="jar" classifier="javadoc"/>
     </artifact:deploy>
@@ -661,14 +661,14 @@
   <!-- =================================================================== -->
   <!-- Deploy Maven artifacts - Apache Maven repository                   -->
   <!-- =================================================================== -->
-  <target name="maven-deploy-apache-repository" unless="maven.remote.repository"
+  <target name="maven-deploy-apache-repository" depends="maven-prepare" unless="maven.remote.repository"
     description="Deploys the Maven artifacts in apache repository">
 
     <echo>Deploying to Apache Maven repository</echo>
 
     <artifact:deploy file="${build.dir}/${project}-${version}.jar" >
         <pom refid="maven.project"/>
-        <attach file="${build.dir}/${project}-${version}-src.jar" type="jar" classifier="sources"/>
+        <attach file="${build.dir}/${project}-${version}-sources.jar" type="jar" classifier="sources"/>
         <attach file="${build.dir}/${project}-${version}-dep.jar" type="jar" classifier="dep"/>
         <attach file="${build.dir}/${project}-${version}-javadoc.jar" type="jar" classifier="javadoc"/>
     </artifact:deploy>
@@ -984,7 +984,7 @@
         <available file="${build.dir}/${final.name}.jar.asc"/>
         <available file="${build.dir}/${final.name}.pom.asc"/>
         <available file="${build.dir}/${project}-${version}-dep.jar.asc"/>
-        <available file="${build.dir}/${final.name}-src.jar.asc"/>
+        <available file="${build.dir}/${final.name}-sources.jar.asc"/>
         <available file="${build.dir}/${final.name}-javadoc.jar.asc"/>
       </and>
     </condition>