Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 80DE4D382 for ; Mon, 6 Aug 2012 21:18:46 +0000 (UTC) Received: (qmail 31166 invoked by uid 500); 6 Aug 2012 21:18:46 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 31158 invoked by uid 99); 6 Aug 2012 21:18:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Aug 2012 21:18:46 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Aug 2012 21:18:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 05F7E23888CD; Mon, 6 Aug 2012 21:18:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1370024 - /lucene/dev/nightly/common-maven.sh Date: Mon, 06 Aug 2012 21:18:01 -0000 To: commits@lucene.apache.org From: sarowe@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120806211802.05F7E23888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sarowe Date: Mon Aug 6 21:18:01 2012 New Revision: 1370024 URL: http://svn.apache.org/viewvc?rev=1370024&view=rev Log: SOLR-1725: Add rhino javascript engine jars to maven jvm's test boot class path (moved to mvn cmdline invocation surefire -DargLine parameter) 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=1370024&r1=1370023&r2=1370024&view=diff ============================================================================== --- lucene/dev/nightly/common-maven.sh (original) +++ lucene/dev/nightly/common-maven.sh Mon Aug 6 21:18:01 2012 @@ -1,11 +1,6 @@ ## This script is sourced from the *-maven-*.sh scripts. ## The commands in this file should work in any branch/trunk. -# Append the rhino javascript engine jars to the boot class path -RHINO_LIBS_DIR=$HOME/tools/java/openjdk-missing-libs -RHINO_LIBS=$RHINO_LIBS_DIR/script-js.jar:$RHINO_LIBS_DIR/js.jar -export MAVEN_OPTS="-Xbootclasspath/a:$RHINO_LIBS" - export M2_HOME=$HOME/tools/maven/latest2.2 echo ">>> Removing Lucene/Solr artifacts from ~/.m2/repository/" @@ -26,7 +21,11 @@ $M2_HOME/bin/mvn --batch-mode --fail-at- echo ">>> Done running the Maven build without tests" echo ">>> Running tests under Maven" -$M2_HOME/bin/mvn --batch-mode --fail-at-end test +# Append the rhino javascript engine jars to the test boot class path +RHINO_LIBS_DIR=$HOME/tools/java/openjdk-missing-libs +RHINO_LIBS=$RHINO_LIBS_DIR/script-js.jar:$RHINO_LIBS_DIR/js.jar + +$M2_HOME/bin/mvn --batch-mode --fail-at-end export -DargLine="-Xbootclasspath/a:$RHINO_LIBS" test echo ">>> Done running tests under Maven" cd ..