Author: jdillon
Date: Sat Jan 27 16:31:11 2007
New Revision: 500712
URL: http://svn.apache.org/viewvc?view=rev&rev=500712
Log:
Use included mvn
Modified:
geronimo/sandbox/build-support/harness/trunk/lib/buildharness/commands/maven.groovy
geronimo/sandbox/build-support/harness/trunk/lib/buildharness/commands/tck/report.groovy
Modified: geronimo/sandbox/build-support/harness/trunk/lib/buildharness/commands/maven.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/harness/trunk/lib/buildharness/commands/maven.groovy?view=diff&rev=500712&r1=500711&r2=500712
==============================================================================
--- geronimo/sandbox/build-support/harness/trunk/lib/buildharness/commands/maven.groovy (original)
+++ geronimo/sandbox/build-support/harness/trunk/lib/buildharness/commands/maven.groovy Sat
Jan 27 16:31:11 2007
@@ -73,16 +73,14 @@
def args = context.get('args')
println "Using args: ${args}"
+ def mavenHome = context.resolveFile('tools/maven')
+ println "Using MAVEN_HOME: ${mavenHome}"
+
// Execute Maven
Line.display()
try {
- //
- // TODO: May eventually want to control which 'mvn' to execute,
- // perhaps using tools/maven/bin/mvn or something
- //
-
- ant.exec(executable: 'mvn', failonerror: true) {
+ ant.exec(executable: "${mavenHome}/bin/mvn", failonerror: true) {
// Get a reference to the current node so we can conditionally set attributes
def node = current.wrapper
@@ -92,6 +90,9 @@
def millis = timeout * 1000
node.setAttribute('timeout', "${millis}")
}
+
+ env(key: 'MAVEN_HOME', value: mavenHome)
+ env(key: 'M2_HOME', value: mavenHome)
if (javaHome != null) {
env(key: 'JAVA_HOME', file: javaHome)
Modified: geronimo/sandbox/build-support/harness/trunk/lib/buildharness/commands/tck/report.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/harness/trunk/lib/buildharness/commands/tck/report.groovy?view=diff&rev=500712&r1=500711&r2=500712
==============================================================================
--- geronimo/sandbox/build-support/harness/trunk/lib/buildharness/commands/tck/report.groovy
(original)
+++ geronimo/sandbox/build-support/harness/trunk/lib/buildharness/commands/tck/report.groovy
Sat Jan 27 16:31:11 2007
@@ -76,9 +76,19 @@
ant.copy(file: file, tofile: "${summariesDir}/${uuid}.properties")
}
+ //
+ // FIXME: Forward to maven command instead
+ //
+
+ def mavenHome = context.resolveFile('tools/maven')
+ println "Using MAVEN_HOME: ${mavenHome}"
+
// Generate a report from captured TCK output
def runDir = sections.getParentFile() // must run from the dir where sections props
lives
- ant.exec(executable: 'mvn', dir: runDir, failonerror: true) {
+ ant.exec(executable: "${mavenHome}/bin/mvn", dir: runDir, failonerror: true) {
+ env(key: 'MAVEN_HOME', value: mavenHome)
+ env(key: 'M2_HOME', value: mavenHome)
+
// Assume that our repo is filled with the right bits
arg(value: '--offline')
|