From 0917b359856a73d8e2fd43025f5ae9d6777175de Mon Sep 17 00:00:00 2001 From: jasonchaffee Date: Tue, 18 Mar 2008 02:18:24 +0000 Subject: [PATCH] Issue number: 1340 Obtained from: Submitted by: Reviewed by: git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@7844 71c3de6d-444a-0410-be80-ed276b4c234a --- .../maven/reporters/SurefireArchiver.java | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/hudson/maven/reporters/SurefireArchiver.java b/core/src/main/java/hudson/maven/reporters/SurefireArchiver.java index 81b9dfd8f7..948f1d7388 100644 --- a/core/src/main/java/hudson/maven/reporters/SurefireArchiver.java +++ b/core/src/main/java/hudson/maven/reporters/SurefireArchiver.java @@ -106,13 +106,29 @@ public class SurefireArchiver extends MavenReporter { return false; try { - Boolean skip = mojo.getConfigurationValue("skip", Boolean.class); - Boolean skipExec = mojo.getConfigurationValue("skipExec", Boolean.class); - Boolean skipTests = mojo.getConfigurationValue("skipTests", Boolean.class); - - if (((skip != null) && (skip)) || ((skipExec != null) && (skipExec)) || ((skipTests != null) && (!skipTests))) { + + Boolean skip = mojo.getConfigurationValue("skip", Boolean.class); + + if (((skip != null) && (skip))) { return false; } + + if (mojo.pluginName.version.compareTo("2.3") >= 0) { + Boolean skipExec = mojo.getConfigurationValue("skipExec", Boolean.class); + + if (((skipExec != null) && (skipExec))) { + return false; + } + } + + if (mojo.pluginName.version.compareTo("2.4") >= 0) { + Boolean skipTests = mojo.getConfigurationValue("skipTests", Boolean.class); + + if (((skipTests != null) && (skipTests))) { + return false; + } + } + } catch (ComponentConfigurationException e) { return false; } -- GitLab