svn commit: r1064453 - /lucene/dev/nightly/common-maven.sh

[sa...@apache.org]

Author: sarowe
Date: Fri Jan 28 04:39:26 2011
New Revision: 1064453

URL: http://svn.apache.org/viewvc?rev=1064453&view=rev
Log:
make the maven build last, and artifact generation first, so that the test output remains for hudson to find

Modified:
    lucene/dev/nightly/common-maven.sh

Modified: lucene/dev/nightly/common-maven.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/common-maven.sh?rev=1064453&r1=1064452&r2=1064453&view=diff
==============================================================================
--- lucene/dev/nightly/common-maven.sh (original)
+++ lucene/dev/nightly/common-maven.sh Fri Jan 28 04:39:26 2011
@@ -7,6 +7,14 @@ mkdir -p $MAVEN_ARTIFACTS/org/apache
 
 cd $WORKSPACE/$ROOT_DIR
 
+echo ">>> Generating the Maven snapshot artifacts"
+$ANT_HOME/bin/ant \
+  -Dsvnversion.exe=$SVNVERSION_EXE \
+  -Dsvn.exe=$SVN_EXE \
+  -Dversion=$MAVEN_ARTIFACT_VERSION \
+  generate-maven-artifacts
+echo ">>> Done generating the Maven snapshot artifacts"
+
 # Keep maven from downloading the entire universe
 SAVED_MAVEN_LOCAL_REPO=$HOME/saved-maven-local-repo
 if [ -d $SAVED_MAVEN_LOCAL_REPO ]; then
@@ -19,10 +27,6 @@ else
 	echo ">>> No saved Maven local repo to restore"
 fi
 
-echo ">>> Getting the Maven POMs"
-$ANT_HOME/bin/ant -Dversion=$MAVEN_ARTIFACT_VERSION get-maven-poms
-echo ">>> Done getting the Maven POMs"
-
 echo ">>> Installing non-mavenized deps into the maven local repo"
 $M2_HOME/bin/mvn -B -N -P bootstrap install
 echo ">>> Done installing non-mavenized deps into the maven local repo"
@@ -37,11 +41,3 @@ rm -rf $HOME/.m2/repository/org/apache/l
 rm -rf $HOME/.m2/repository/org/apache/solr
 mv -f $HOME/.m2/repository $SAVED_MAVEN_LOCAL_REPO
 echo ">>> Done saving ~/.m2/repository/ to $SAVED_MAVEN_LOCAL_REPO"
-
-echo ">>> Generating the Maven snapshot artifacts"
-$ANT_HOME/bin/ant \
-  -Dsvnversion.exe=$SVNVERSION_EXE \
-  -Dsvn.exe=$SVN_EXE \
-  -Dversion=$MAVEN_ARTIFACT_VERSION \
-  clean generate-maven-artifacts
-echo ">>> Done generating the Maven snapshot artifacts"