From 4ae86dec22c0d6d284eb9b8d2ea1027673940b45 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Tue, 20 Apr 2010 09:48:30 +0000
Subject: [PATCH] Deploy vaadin jar as last

svn changeset:12684/svn branch:6.3
---
 build/build.xml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 3359df0921..e78027db0f 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -1074,38 +1074,39 @@
 	
     <target name="nightly-maven-publish" depends="nightly-maven-pom.xml">
         <property file="${gpg.passphrase.file}" />
-        <echo>Publishing ${output-dir}/WebContent/${lib-jar-name} to Maven repository</echo>
+
+    	<echo>Publishing ${result-path}/${lib-javadoc-jar-name} to Maven repository</echo>
         <artifact:mvn>
             <arg value="gpg:sign-and-deploy-file"/>
             <!-- .. is a workaround as maven runs in the build directory -->
-            <sysproperty key="file" value="../${output-dir}/WebContent/${lib-jar-name}" />
+            <sysproperty key="file" value="../${result-path}/${lib-javadoc-jar-name}" />
             <sysproperty key="pomFile" value="maven/pom.xml" />
             <sysproperty key="repositoryId" value="vaadin-snapshots" />
             <sysproperty key="url" value="http://oss.sonatype.org/content/repositories/vaadin-snapshots" />
+            <sysproperty key="classifier" value="javadoc" />
             <sysproperty key="gpg.passphrase" value="${gpg.passphrase}" />
         </artifact:mvn>
 
-    	<echo>Publishing ${result-path}/${lib-javadoc-jar-name} to Maven repository</echo>
+    	<echo>Publishing ${result-path}/${lib-sources-jar-name} to Maven repository</echo>
         <artifact:mvn>
             <arg value="gpg:sign-and-deploy-file"/>
             <!-- .. is a workaround as maven runs in the build directory -->
-            <sysproperty key="file" value="../${result-path}/${lib-javadoc-jar-name}" />
+            <sysproperty key="file" value="../${result-path}/${lib-sources-jar-name}" />
             <sysproperty key="pomFile" value="maven/pom.xml" />
             <sysproperty key="repositoryId" value="vaadin-snapshots" />
             <sysproperty key="url" value="http://oss.sonatype.org/content/repositories/vaadin-snapshots" />
-            <sysproperty key="classifier" value="javadoc" />
+            <sysproperty key="classifier" value="sources" />
             <sysproperty key="gpg.passphrase" value="${gpg.passphrase}" />
         </artifact:mvn>
 
-    	<echo>Publishing ${result-path}/${lib-sources-jar-name} to Maven repository</echo>
-        <artifact:mvn>
+        <echo>Publishing ${output-dir}/WebContent/${lib-jar-name} to Maven repository</echo>
+    	<artifact:mvn>
             <arg value="gpg:sign-and-deploy-file"/>
             <!-- .. is a workaround as maven runs in the build directory -->
-            <sysproperty key="file" value="../${result-path}/${lib-sources-jar-name}" />
+            <sysproperty key="file" value="../${output-dir}/WebContent/${lib-jar-name}" />
             <sysproperty key="pomFile" value="maven/pom.xml" />
             <sysproperty key="repositoryId" value="vaadin-snapshots" />
             <sysproperty key="url" value="http://oss.sonatype.org/content/repositories/vaadin-snapshots" />
-            <sysproperty key="classifier" value="sources" />
             <sysproperty key="gpg.passphrase" value="${gpg.passphrase}" />
         </artifact:mvn>
     </target>
-- 
2.39.5