lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sar...@apache.org
Subject svn commit: r1068229 - in /lucene/dev/nightly: common-maven.sh hudson-lucene-solr-maven-3.x.sh hudson-lucene-solr-maven-trunk.sh
Date Tue, 08 Feb 2011 00:06:02 GMT
Author: sarowe
Date: Tue Feb  8 00:06:02 2011
New Revision: 1068229

URL: http://svn.apache.org/viewvc?rev=1068229&view=rev
Log:
Fixed incorrect JVM version used in Solr artifact generation (was 1.6 on branch_3x); abandoned
single export'd per-branch JAVA_HOME definition in favor of per-command definitions, as in
the other hudson scripts; added comments describing JAVA_HOME rationale

Modified:
    lucene/dev/nightly/common-maven.sh
    lucene/dev/nightly/hudson-lucene-solr-maven-3.x.sh
    lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh

Modified: lucene/dev/nightly/common-maven.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/common-maven.sh?rev=1068229&r1=1068228&r2=1068229&view=diff
==============================================================================
--- lucene/dev/nightly/common-maven.sh (original)
+++ lucene/dev/nightly/common-maven.sh Tue Feb  8 00:06:02 2011
@@ -9,32 +9,40 @@ rm -rf $HOME/.m2/repository/org/apache/l
 rm -rf $HOME/.m2/repository/org/apache/solr
 echo ">>> Done removing Lucene/Solr artifacts from ~/.m2/repository/"
 
-ARTIFACT_GENERATION_JAVA_HOME=$JAVA_HOME_15
 for TopLevelDir in lucene modules solr ; do
     # There is no modules/ dir in branch_3x
     if [ -d $WORKSPACE/$ROOT_DIR/$TopLevelDir ] ; then
+        # Use Java 1.5 to build the maven artifacts, unless the top level
+        # directory is solr/, in which case use the Java version required
+        # by Solr for this branch (1.6 for trunk, 1.5 for 3.x).
         if [ "$TopLevelDir" = "solr" ]; then
-            ARTIFACT_GENERATION_JAVA_HOME=$JAVA_HOME_16
+	    ARTIFACTS_JAVA_HOME=$SOLR_JAVA_HOME
+	else
+	    ARTIFACTS_JAVA_HOME=$JAVA_HOME_15
         fi
         cd $WORKSPACE/$ROOT_DIR/$TopLevelDir
-        echo ">>> Generating the Maven snapshot artifacts"
-        JAVA_HOME=$ARTIFACT_GENERATION_JAVA_HOME $ANT_HOME/bin/ant \
+        echo ">>> Generating the Maven snapshot artifacts in $TopLevelDir/"
+        JAVA_HOME=$ARTIFACTS_JAVA_HOME $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"
+        echo ">>> Done generating the Maven snapshot artifacts in $TopLevelDir/"
     fi
 done
 
 cd $WORKSPACE/$ROOT_DIR
 
 echo ">>> Installing non-mavenized deps into the maven local repo"
-$M2_HOME/bin/mvn --batch-mode --non-recursive -Pbootstrap install
+# Use Solr's java version to build all modules
+JAVA_HOME=$SOLR_JAVA_HOME $M2_HOME/bin/mvn \
+    --batch-mode --non-recursive -Pbootstrap install
 echo ">>> Done installing non-mavenized deps into the maven local repo"
 
 echo ">>> Running the Maven build without tests"
-$M2_HOME/bin/mvn --batch-mode --fail-at-end -DskipTests install
+# Use Solr's java version to build all modules
+JAVA_HOME=$SOLR_JAVA_HOME $M2_HOME/bin/mvn \
+    --batch-mode --fail-at-end -DskipTests install
 echo ">>> Done running the Maven build without tests"
 
 echo ">>> Running tests under Maven"

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=1068229&r1=1068228&r2=1068229&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-lucene-solr-maven-3.x.sh (original)
+++ lucene/dev/nightly/hudson-lucene-solr-maven-3.x.sh Tue Feb  8 00:06:02 2011
@@ -3,7 +3,6 @@
 
 #Update the Version # when doing a release
 MAVEN_ARTIFACT_VERSION=3.1-SNAPSHOT
-
-export JAVA_HOME=$JAVA_HOME_15
+SOLR_JAVA_HOME=$JAVA_HOME_15
 
 . $WORKSPACE/nightly/common-maven.sh

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=1068229&r1=1068228&r2=1068229&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh (original)
+++ lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh Tue Feb  8 00:06:02 2011
@@ -3,8 +3,7 @@
 
 #Update the Version # when doing a release
 MAVEN_ARTIFACT_VERSION=4.0-SNAPSHOT
-
-export JAVA_HOME=$JAVA_HOME_16
+SOLR_JAVA_HOME=$JAVA_HOME_16
 
 echo ">>> Ignoring BasicDistributedZkTest, which always fails on Hudson trunk under
Maven"
 perl -pi.bak -e 's/(?=public class BasicDistributedZkTest)/import org.junit.Ignore;\n\@Ignore\n/;'\



Mime
View raw message