You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/04/25 20:50:56 UTC
svn commit: r1330484 - in /lucene/dev/nightly: common-maven.sh
hudson-lucene-solr-maven-trunk.sh hudson-lucene-trunk.sh
hudson-lusolr-tests-trunk.sh hudson-settings.sh hudson-solr-trunk.sh
Author: uschindler
Date: Wed Apr 25 18:50:55 2012
New Revision: 1330484
URL: http://svn.apache.org/viewvc?rev=1330484&view=rev
Log:
Nuke remaining JAVA 1.5, use JAVA_HOME as given by Jenkins
Modified:
lucene/dev/nightly/common-maven.sh
lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh
lucene/dev/nightly/hudson-lucene-trunk.sh
lucene/dev/nightly/hudson-lusolr-tests-trunk.sh
lucene/dev/nightly/hudson-settings.sh
lucene/dev/nightly/hudson-solr-trunk.sh
Modified: lucene/dev/nightly/common-maven.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/common-maven.sh?rev=1330484&r1=1330483&r2=1330484&view=diff
==============================================================================
--- lucene/dev/nightly/common-maven.sh (original)
+++ lucene/dev/nightly/common-maven.sh Wed Apr 25 18:50:55 2012
@@ -20,7 +20,7 @@ echo ">>> Done running the Maven build w
echo ">>> Running tests under Maven"
# Always use Java 1.6 to run tests - fewer bugs than 1.5
-JAVA_HOME=$JAVA_HOME_16 $M2_HOME/bin/mvn --batch-mode --fail-at-end test
+$M2_HOME/bin/mvn --batch-mode --fail-at-end test
echo ">>> Done running tests under Maven"
echo ">>> Preserving test results"
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=1330484&r1=1330483&r2=1330484&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh (original)
+++ lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh Wed Apr 25 18:50:55 2012
@@ -1,8 +1,6 @@
#!/bin/bash
. $WORKSPACE/nightly/hudson-settings.sh
-export JAVA_HOME=$JAVA_HOME_16
-
# PROBLEMATIC_TEST=$SOLR_DIR/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
#
# # Don't insert @Ignore if it's already there
Modified: lucene/dev/nightly/hudson-lucene-trunk.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-lucene-trunk.sh?rev=1330484&r1=1330483&r2=1330484&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-lucene-trunk.sh (original)
+++ lucene/dev/nightly/hudson-lucene-trunk.sh Wed Apr 25 18:50:55 2012
@@ -1,9 +1,6 @@
#!/bin/sh
. $WORKSPACE/nightly/hudson-settings.sh
-JAVA_HOME=$JAVA_HOME_16
-export JAVA_HOME
-
#Update the Version # when doing a release
VERSION=4.0-$BUILD_ID
Modified: lucene/dev/nightly/hudson-lusolr-tests-trunk.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-lusolr-tests-trunk.sh?rev=1330484&r1=1330483&r2=1330484&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-lusolr-tests-trunk.sh (original)
+++ lucene/dev/nightly/hudson-lusolr-tests-trunk.sh Wed Apr 25 18:50:55 2012
@@ -1,9 +1,6 @@
#!/bin/sh
. $WORKSPACE/nightly/hudson-settings.sh
-JAVA_HOME=$JAVA_HOME_16
-export JAVA_HOME
-
cd $WORKSPACE/$ROOT_DIR
$ANT_HOME/bin/ant \
clean-jars clean
@@ -26,14 +23,14 @@ if [ -z "$USE_JDK7" ]; then
# verify lucene core javadocs have no warnings
cd $WORKSPACE/$CORE_DIR
$ANT_HOME/bin/ant \
- -Djavadoc.link=$JAVADOC_HOME_16 \
+ -Djavadoc.link=$JAVADOC_HOME \
javadocs-lint
# verify solr javadocs have no warnings
cd $WORKSPACE/$SOLR_DIR
$ANT_HOME/bin/ant \
- -Djavadoc.link=$JAVADOC_HOME_16 \
- -Djavadoc.link.java=$JAVADOC_HOME_16 \
+ -Djavadoc.link=$JAVADOC_HOME \
+ -Djavadoc.link.java=$JAVADOC_HOME \
javadocs-lint
fi
Modified: lucene/dev/nightly/hudson-settings.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-settings.sh?rev=1330484&r1=1330483&r2=1330484&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-settings.sh (original)
+++ lucene/dev/nightly/hudson-settings.sh Wed Apr 25 18:50:55 2012
@@ -13,20 +13,8 @@ SVN_EXE=$HOME/tools/svn/svnkit/bin/jsvn
CLOVER=$HOME/tools/clover/clover2latest
RAT_JAR=$HOME/tools/rat/rat-latest.jar
-# we sometimes ignore hudson-supplied Java version and enforce 1.5 for compilation, but run tests in 1.6/1.7:
-JAVA_HOME_15=$HOME/tools/java/latest1.5
-
-if [ -z "$USE_JDK7" ]; then
- JAVA_HOME_16=$HOME/tools/java/latest1.6
-else
- JAVA_HOME_16=$HOME/tools/java/latest1.7
- # for now add a exclusion to prevent the hotspot issue in Java7 preview, which gets hopefully fixed soon
- # we have now patched openjdk: TEST_JVM_ARGS="-XX:CompileCommand=exclude,org/apache/lucene/analysis/en/PorterStemmer,ends -XX:CompileCommand=exclude,org/apache/lucene/analysis/PorterStemmer,ends"
-fi
-
# locations of javadocs used by the build
-JAVADOC_HOME_15=/usr/local/share/doc/jdk1.5/api
-JAVADOC_HOME_16=/usr/local/share/doc/jdk1.6/api
+JAVADOC_HOME=/usr/local/share/doc/jdk1.6/api
#dirs
ROOT_DIR=checkout
Modified: lucene/dev/nightly/hudson-solr-trunk.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-solr-trunk.sh?rev=1330484&r1=1330483&r2=1330484&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-solr-trunk.sh (original)
+++ lucene/dev/nightly/hudson-solr-trunk.sh Wed Apr 25 18:50:55 2012
@@ -11,9 +11,6 @@ mkdir -p $DOCUMENTATION_DIR
cd $WORKSPACE/$SOLR_DIR
-JAVA_HOME=$JAVA_HOME_16
-export JAVA_HOME
-
$ANT_HOME/bin/ant \
-Dversion=$VERSION \
-Dlucene_version=$VERSION \
@@ -23,7 +20,7 @@ $ANT_HOME/bin/ant \
-Dtests.jvms=$TESTS_PARALLELISM \
-Djunit.formatter=xml \
-Dargs="$TEST_JVM_ARGS" \
- -Dlucene.javadoc.url="https://builds.apache.org/job/Lucene-trunk/javadoc/all/" \
+ -Dlucene.javadoc.url="https://builds.apache.org/job/Lucene-trunk/javadoc/" \
clean-jars clean test package
# release it