You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2011/01/27 19:40:23 UTC
svn commit: r1064251 - in /lucene/dev/nightly: common-maven.sh
hudson-lucene-solr-maven-3.x.sh hudson-lucene-solr-maven-trunk.sh
Author: sarowe
Date: Thu Jan 27 18:40:23 2011
New Revision: 1064251
URL: http://svn.apache.org/viewvc?rev=1064251&view=rev
Log:
Switched from tools/maven/latest2/ to tools/maven/latest2.2 (latest2 is v2.0.9, and Uwe symlinked latest2.2 to v2.2.1); common-maven.sh now holds commands shared by the trunk and 3.x Maven builds, and is sourced from the scripts for each of them
Added:
lucene/dev/nightly/common-maven.sh (with props)
Modified:
lucene/dev/nightly/hudson-lucene-solr-maven-3.x.sh
lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh
Added: lucene/dev/nightly/common-maven.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/common-maven.sh?rev=1064251&view=auto
==============================================================================
--- lucene/dev/nightly/common-maven.sh (added)
+++ lucene/dev/nightly/common-maven.sh Thu Jan 27 18:40:23 2011
@@ -0,0 +1,47 @@
+## This script is sourced from the *-maven-*.sh scripts.
+## The commands in this file should work in any branch/trunk.
+
+export M2_HOME=$HOME/tools/maven/latest2.2
+
+mkdir -p $MAVEN_ARTIFACTS/org/apache
+
+cd $WORKSPACE/$ROOT_DIR
+
+# Keep maven from downloading the entire universe
+SAVED_MAVEN_LOCAL_REPO=$HOME/saved-maven-local-repo
+if [ -d $SAVED_MAVEN_LOCAL_REPO ]; then
+ echo ">>> Restoring the saved Maven local repo"
+ # Add this when no longer done in hudson-settings.sh:
+ # rm -rf $HOME/.m2/repository
+ cp -Rf $SAVED_MAVEN_LOCAL_REPO $HOME/.m2/repository
+ echo ">>> Done restoring the saved Maven local repo"
+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 -N -P bootstrap install
+echo ">>> Done installing non-mavenized deps into the maven local repo"
+
+echo ">>> Running the Maven build"
+$M2_HOME/bin/mvn clean install
+echo ">>> Done running the Maven build"
+
+echo ">>> Saving ~/.m2/repository/ to $SAVED_MAVEN_LOCAL_REPO"
+# Don't save output from "mvn clean install"
+rm -rf $HOME/.m2/repository/org/apache/lucene
+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"
Modified: lucene/dev/nightly/hudson-lucene-solr-maven-3.x.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-lucene-solr-maven-3.x.sh?rev=1064251&r1=1064250&r2=1064251&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-lucene-solr-maven-3.x.sh (original)
+++ lucene/dev/nightly/hudson-lucene-solr-maven-3.x.sh Thu Jan 27 18:40:23 2011
@@ -5,50 +5,8 @@
MAVEN_ARTIFACT_VERSION=3.1-SNAPSHOT
export JAVA_HOME=$JAVA_HOME_15
-export M2_HOME=$HOME/tools/maven/latest2
-SAVED_MAVEN_LOCAL_REPO=$HOME/saved-maven-local-repo
-mkdir -p $MAVEN_ARTIFACTS/org/apache
-
-cd $WORKSPACE/$ROOT_DIR
-
-# Keep maven from downloading the entire universe
-if [ -d $SAVED_MAVEN_LOCAL_REPO ]; then
- echo ">>> Restoring the saved Maven local repo"
- # Add this when no longer done in hudson-settings.sh:
- # rm -rf $HOME/.m2/repository
- cp -Rf $SAVED_MAVEN_LOCAL_REPO $HOME/.m2/repository
- echo ">>> Done restoring the saved Maven local repo"
-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 -N -P bootstrap install
-echo ">>> Done installing non-mavenized deps into the maven local repo"
-
-echo ">>> Running the Maven build"
-$M2_HOME/bin/mvn clean install
-echo ">>> Done running the Maven build"
-
-echo ">>> Saving ~/.m2/repository/ to $SAVED_MAVEN_LOCAL_REPO"
-# Don't save output from "mvn clean install"
-rm -rf $HOME/.m2/repository/org/apache/lucene
-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"
+. $WORKSPACE/nightly/common-maven.sh
echo ">>> Moving Maven artifacts to $MAVEN_ARTIFACTS"
mv -f $WORKSPACE/$CORE_DIR/dist/maven/org/apache/lucene \
Modified: lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh?rev=1064251&r1=1064250&r2=1064251&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh (original)
+++ lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh Thu Jan 27 18:40:23 2011
@@ -5,50 +5,8 @@
MAVEN_ARTIFACT_VERSION=4.0-SNAPSHOT
export JAVA_HOME=$JAVA_HOME_16
-export M2_HOME=$HOME/tools/maven/latest2
-SAVED_MAVEN_LOCAL_REPO=$HOME/saved-maven-local-repo
-mkdir -p $MAVEN_ARTIFACTS/org/apache
-
-cd $WORKSPACE/$ROOT_DIR
-
-# Keep maven from downloading the entire universe
-if [ -d $SAVED_MAVEN_LOCAL_REPO ]; then
- echo ">>> Restoring the saved Maven local repo"
- # Add this when no longer done in hudson-settings.sh:
- # rm -rf $HOME/.m2/repository
- cp -Rf $SAVED_MAVEN_LOCAL_REPO $HOME/.m2/repository
- echo ">>> Done restoring the saved Maven local repo"
-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 -N -P bootstrap install
-echo ">>> Done installing non-mavenized deps into the maven local repo"
-
-echo ">>> Running the Maven build"
-$M2_HOME/bin/mvn clean install
-echo ">>> Done running the Maven build"
-
-echo ">>> Saving ~/.m2/repository/ to $SAVED_MAVEN_LOCAL_REPO"
-# Don't save output from "mvn clean install"
-rm -rf $HOME/.m2/repository/org/apache/lucene
-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"
+. $WORKSPACE/nightly/common-maven.sh
echo ">>> Moving Maven artifacts to $MAVEN_ARTIFACTS"
mv -f $WORKSPACE/$ROOT_DIR/dist/maven/org/apache/* \