From 2e656fc1602222d8023f8d57a5532ded47e2fb91 Mon Sep 17 00:00:00 2001 From: puug Date: Thu, 19 Jan 2012 17:51:41 +1000 Subject: [PATCH] Added maven-soapui-pro-plugin support as well --- .../java/hudson/maven/reporters/SurefireArchiver.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java b/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java index 5500f6a9bd..987b311749 100644 --- a/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java +++ b/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java @@ -76,7 +76,8 @@ public class SurefireArchiver extends MavenReporter { public boolean preExecute(MavenBuildProxy build, MavenProject pom, MojoInfo mojo, BuildListener listener) throws InterruptedException, IOException { if (isSurefireTest(mojo)) { if ((!mojo.is("org.apache.maven.plugins", "maven-failsafe-plugin", "integration-test")) - && (!mojo.is("eviware", "maven-soapui-plugin", "test"))) { + && (!mojo.is("eviware", "maven-soapui-plugin", "test")) + && (!mojo.is("eviware", "maven-soapui-pro-plugin", "test"))) { // tell surefire:test to keep going even if there was a failure, // so that we can record this as yellow. // note that because of the way Maven works, just updating system property at this point is too late @@ -242,7 +243,8 @@ public class SurefireArchiver extends MavenReporter { && (!mojo.is("com.jayway.maven.plugins.android.generation2", "android-maven-plugin", "internal-integration-test")) && (!mojo.is("org.apache.maven.plugins", "maven-surefire-plugin", "test")) && (!mojo.is("org.apache.maven.plugins", "maven-failsafe-plugin", "integration-test")) - && (!mojo.is("eviware", "maven-soapui-plugin", "test"))) + && (!mojo.is("eviware", "maven-soapui-plugin", "test")) + && (!mojo.is("eviware", "maven-soapui-pro-plugin", "test"))) return false; try { @@ -313,6 +315,11 @@ public class SurefireArchiver extends MavenReporter { if (((skipTests != null) && (skipTests))) { return false; } + } else if (mojo.is("eviware", "maven-soapui-pro-plugin", "test")) { + Boolean skipTests = mojo.getConfigurationValue("skip", Boolean.class); + if (((skipTests != null) && (skipTests))) { + return false; + } } } catch (ComponentConfigurationException e) { return false; -- GitLab