Added release deployment

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@496836 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index 32690ad..bfe7df2 100644 (file)
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -44,12 +44,11 @@
       <arg value="-DrepositoryId=${maven.repo.repositoryId}"/>
       <arg value="-Durl=${maven.repo.url}"/>
       <arg value="-DpomFile=${pom}.tmp"/>
-      <arg value="-Dmaven.scp.executable=${maven.scp.executable}"/>
     </exec>
     <delete file="${pom}.tmp"/>
   </target>
   
-  <target name="deploy">
+  <target name="generic-deploy">
     <antcall target="maven-deploy"><!--Deploy annotations-->
       <param name="file" value="${tomcat.lib.path}/annotations-api.jar"/>
       <param name="groupId" value="org.apache.tomcat"/>
@@ -122,8 +121,6 @@
       <param name="artifactId" value="jasper"/>
       <param name="pom" value="${tomcat.pom.path}/jasper.pom"/>
     </antcall>
-  </target>
-  <target name="deploy-extras">
     <antcall target="maven-deploy"><!--Deploy Extras Juli-->
       <param name="file" value="${tomcat.extras.path}/tomcat-juli.jar"/>
       <param name="groupId" value="org.apache.tomcat.extras"/>
@@ -137,4 +134,21 @@
       <param name="pom" value="${tomcat.pom.path}/juli-adapters.pom"/>
     </antcall>
   </target>
+
+  <target name="deploy-snapshot">
+    <antcall target="generic-deploy">
+      <param name="maven.repo.repositoryId" value="${maven.snapshot.repo.repositoryId}"/>
+      <param name="maven.repo.url" value="${maven.snapshot.repo.url}"/>
+      <param name="maven.deploy.version" value="${maven.snapshot.deploy.version}"/>
+    </antcall>
+  </target>
+
+  <target name="deploy-release">
+    <antcall target="generic-deploy">
+      <param name="maven.repo.repositoryId" value="${maven.release.repo.repositoryId}"/>
+      <param name="maven.repo.url" value="${maven.release.repo.url}"/>
+      <param name="maven.deploy.version" value="${maven.release.deploy.version}"/>
+    </antcall>
+  </target>
+
 </project>

diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 64cc6ab..8b77fe7 100644 (file)
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -1,9 +1,22 @@
+#Maven properties
 maven.home=/development/maven-2.0.4
-maven.bin=mvn.bat
-maven.repo.url=scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository
-maven.repo.repositoryId=apache.snapshots
-maven.deploy.version=6.0.7-SNAPSHOT
+#Define mvn for Unix systems and mvn.bat for Windows as ANT exec requires the full name
+maven.bin=mvn
+
+#Maven snapshot properties
+maven.snapshot.repo.url=scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository
+maven.snapshot.repo.repositoryId=apache.snapshots
+maven.snapshot.deploy.version=6.0.8-SNAPSHOT
+
+#Maven release properties
+maven.release.repo.url=scp://people.apache.org/www/tomcat.apache.org/dev/dist/m2-repository
+maven.release.repo.repositoryId=tomcat-staging
+maven.release.deploy.version=6.0.8
+
+#Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib
 tomcat.bin.path=../../output/build/bin
+tomcat.extras.path=../../output/extras
+
+#Where do we find the POM files
 tomcat.pom.path=../../res/maven
-tomcat.extras.path=../../output/extras
\ No newline at end of file