Author: pfeuffer

maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java

@@ -62,12 +62,14 @@ public class SurefireArchiver extends MavenReporter {
 
     public boolean preExecute(MavenBuildProxy build, MavenProject pom, MojoInfo mojo, BuildListener listener) throws InterruptedException, IOException {
         if (isSurefireTest(mojo)) {
-            // 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
-            XmlPlexusConfiguration c = (XmlPlexusConfiguration) mojo.configuration.getChild("testFailureIgnore");
-            if(c!=null && c.getValue().equals("${maven.test.failure.ignore}") && System.getProperty("maven.test.failure.ignore")==null)
-                c.setValue("true");
+            if (!mojo.is("org.apache.maven.plugins", "maven-failsafe-plugin", "integration-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
+                XmlPlexusConfiguration c = (XmlPlexusConfiguration) mojo.configuration.getChild("testFailureIgnore");
+                if(c!=null && c.getValue().equals("${maven.test.failure.ignore}") && System.getProperty("maven.test.failure.ignore")==null)
+                    c.setValue("true");
+            }
         }
         return true;
     }
@@ -78,7 +80,8 @@ public boolean postExecute(MavenBuildProxy build, MavenProject pom, MojoInfo moj
         listener.getLogger().println(Messages.SurefireArchiver_Recording());
 
         File reportsDir;
-        if (mojo.is("org.apache.maven.plugins", "maven-surefire-plugin", "test")) {
+        if (mojo.is("org.apache.maven.plugins", "maven-surefire-plugin", "test") ||
+            mojo.is("org.apache.maven.plugins", "maven-failsafe-plugin", "integration-test")) {
             try {
                 reportsDir = mojo.getConfigurationValue("reportsDirectory", File.class);
             } catch (ComponentConfigurationException e) {
@@ -158,7 +161,8 @@ public Collection<? extends Action> getProjectActions(MavenModule module) {
 
     private boolean isSurefireTest(MojoInfo mojo) {
         if ((!mojo.is("com.sun.maven", "maven-junit-plugin", "test"))
-            && (!mojo.is("org.apache.maven.plugins", "maven-surefire-plugin", "test")))
+            && (!mojo.is("org.apache.maven.plugins", "maven-surefire-plugin", "test"))
+            && (!mojo.is("org.apache.maven.plugins", "maven-failsafe-plugin", "integration-test")))
             return false;
 
         try {