From 951580fb1854611ce4eee31f84e15849b4199643 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 17 Mar 2011 22:27:13 +0100 Subject: [PATCH] fix some typo regarding token macro in MAVEN_OPTS in maven plugin --- maven-plugin/src/main/java/hudson/maven/MavenBuild.java | 5 +++-- .../src/main/java/hudson/maven/MavenModuleSetBuild.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenBuild.java index c1db80fc45..e4214f6b44 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenBuild.java @@ -27,6 +27,7 @@ import hudson.EnvVars; import hudson.FilePath; import hudson.maven.agent.AbortException; import hudson.maven.reporters.SurefireArchiver; +import hudson.model.AbstractBuild; import hudson.model.BuildListener; import hudson.model.Computer; import hudson.model.Environment; @@ -682,9 +683,9 @@ public class MavenBuild extends AbstractMavenBuild { String opts = mms.getMavenOpts(); if (opts == null ) return null; try { - Class clazz = Class.forName( "org.jenkinsci.plugins.tokenmacro.MacroEvaluationException" ); + Class clazz = Class.forName( "org.jenkinsci.plugins.tokenmacro.TokenMacro" ); Method expandMethod = - ReflectionUtils.findMethod(clazz, "expand", new Class[]{ this.getClass(), listener.getClass(), String.class} ); + ReflectionUtils.findMethod(clazz, "expand", new Class[]{ AbstractBuild.class, TaskListener.class, String.class} ); opts = (String) expandMethod.invoke( null, this, listener, opts ); //opts = TokenMacro.expand(this, listener, opts); //} catch (MacroEvaluationException e) { diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java index 49c811776c..1d1886a34d 100755 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -35,6 +35,7 @@ import hudson.Util; import hudson.maven.MavenBuild.ProxyImpl2; import hudson.maven.reporters.MavenFingerprinter; import hudson.maven.reporters.MavenMailer; +import hudson.model.AbstractBuild; import hudson.model.AbstractProject; import hudson.model.Action; import hudson.model.Build; @@ -526,9 +527,9 @@ public class MavenModuleSetBuild extends AbstractMavenBuild clazz = Class.forName( "org.jenkinsci.plugins.tokenmacro.MacroEvaluationException" ); + Class clazz = Class.forName( "org.jenkinsci.plugins.tokenmacro.TokenMacro" ); Method expandMethod = - ReflectionUtils.findMethod(clazz, "expand", new Class[]{ this.getClass(), listener.getClass(), String.class} ); + ReflectionUtils.findMethod(clazz, "expand", new Class[]{ AbstractBuild.class, TaskListener.class, String.class} ); opts = (String) expandMethod.invoke( null, this, listener, opts ); //opts = TokenMacro.expand(this, listener, opts); //} catch (MacroEvaluationException e) {