From c8ce619ff5b4a0ef6495820aae138e053d7a1fed Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@vmware.com>
Date: Tue, 31 Mar 2009 03:05:28 +0000
Subject: [PATCH] Add ability to publish to S3 maven milestone repository for
 maven central style artifacts by adding slightly modified spring-build
 targets to publish-maven.xml

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@885 50f2f4bb-b051-0410-bef5-90022cba6387
---
 build-spring-framework/publish-maven.xml | 31 ++++++++++++++++++++----
 build-spring-framework/publish.xml       | 15 ++++++++++--
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/build-spring-framework/publish-maven.xml b/build-spring-framework/publish-maven.xml
index 14a5b27503b..d6ca38cc49c 100644
--- a/build-spring-framework/publish-maven.xml
+++ b/build-spring-framework/publish-maven.xml
@@ -16,13 +16,34 @@
 
 
         <!-- top level targets -->
-        <target name="publish-maven-central-only-pom-artifacts" depends="publish-only-pom-windows,publish-only-pom-unix">
+
+        <target name="publish-maven-central-only-pom-artifacts" depends="publish-central-only-pom-windows,publish-central-only-pom-unix">
+	</target>
+
+	<target name="publish-maven-central-code-artifacts" depends="publish-central-windows,publish-code-unix">
 	</target>
 
 
-	<target name="publish-maven-central-code-artifacts" depends="publish-code-windows,publish-code-unix">
+	<target name="publish-maven-milestone-only-pom-artifacts" depends="maven.init">
+	  <maven:deploy>
+	    <remoteRepository url="s3://${publish.bucket}/maven/bundles/${adjusted.release.type}">
+	      <authentication username="${accessKey}" passphrase="${secretKey}"/>
+	     </remoteRepository>
+	    <pom file="${local.pom.output.file}"/>
+	  </maven:deploy>
 	</target>
 
+	<target name="publish-maven-milestone-code-artifacts" depends="maven.init">
+		<maven:deploy file="${jar.output.file}">
+			<remoteRepository url="s3://${publish.bucket}/maven/bundles/${adjusted.release.type}">
+				<authentication username="${accessKey}" passphrase="${secretKey}"/>
+			</remoteRepository>
+			<pom file="${pom.output.file}"/>
+			<attach file="${source-jar.output.file}" classifier="sources"/>
+		</maven:deploy>	
+	</target>
+
+
 	<target name="install-pom" depends="maven.init">
 	  <maven:install>
 	    <pom file="${local.pom.output.file}"/>
@@ -33,7 +54,7 @@
 
         <!-- POM only deployment -->
 
-	<target name="publish-only-pom-windows" depends="maven.init" if="is.windows">
+	<target name="publish-central-only-pom-windows" depends="maven.init" if="is.windows">
 	  <maven:deploy>
   	    <!-- Due to http://jira.codehaus.org/browse/MANTTASKS-103 in 2.0.8 on windows, fixed in 2.0.9 -->
             <!-- Assuming using local file, value of variable should be of the form L:\temp\maven-repo-test -->
@@ -42,7 +63,7 @@
 	  </maven:deploy>
 	</target>
 
-	<target name="publish-only-pom-unix" depends="maven.init" unless="is.windows">
+	<target name="publish-central-only-pom-unix" depends="maven.init" unless="is.windows">
 	  <maven:deploy>
   	    <remoteRepository url="${maven.central.repository}"/>
 	    <pom file="${local.pom.output.file}"/>
@@ -52,7 +73,7 @@
 
         <!-- jar, source-jar and POM deployment -->
 
-	<target name="publish-code-windows" depends="maven.init">
+	<target name="publish-central-windows" depends="maven.init">
 		<maven:deploy file="${jar.output.file}">
  	  	    <!-- Due to http://jira.codehaus.org/browse/MANTTASKS-103 in 2.0.8 on windows, fixed in 2.0.9 -->
                     <!-- Assuming using local file, value of variable should be of the form L:\temp\maven-repo-test -->
diff --git a/build-spring-framework/publish.xml b/build-spring-framework/publish.xml
index 753e2ce1554..8373bbf87d7 100644
--- a/build-spring-framework/publish.xml
+++ b/build-spring-framework/publish.xml
@@ -31,12 +31,23 @@
     <pathelement location="../org.springframework.spring-parent"/>
   </path>
 
+  <!-- for milestones -->
 
-  <target name="publish-maven-central-spring" depends="publish-maven-central-only-pom-spring">
+  <target name="publish-maven-milestone" depends="publish-maven-milestone-only-pom">
+    <all-bundles target="publish-maven-milestone-code-artifacts" buildpathRef="modules-with-code-artifacts"/>
+  </target>
+
+  <target name="publish-maven-milestone-only-pom">
+    <all-bundles target="publish-maven-milestone-only-pom-artifacts" buildpathRef="modules-with-only-pom-artifacts"/>
+  </target>
+
+  <!-- for releases -->
+
+  <target name="publish-maven-central-release" depends="publish-maven-central-only-pom-release">
     <all-bundles target="publish-maven-central-code-artifacts" buildpathRef="modules-with-code-artifacts"/>
   </target>
 
-  <target name="publish-maven-central-only-pom-spring">
+  <target name="publish-maven-central-only-pom-release">
     <all-bundles target="publish-maven-central-only-pom-artifacts" buildpathRef="modules-with-only-pom-artifacts"/>
   </target>