Merge pull request #624 from Vlatombe/JENKINS-15865

[JENKINS-15865] Jenkins build fails with fatal error for Maven 2 build
Thanks

changelog.html

@@ -80,6 +80,9 @@ Upcoming changes</a>
   <li class=bug>
     Duplicated / multiple "Jenkins CLI" entries under "Manage Jenkins".
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15732">issue 15732</a>)
+  <li class=bug>
+    Maven2 job fails when using maven-failsafe-plugin
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15865">issue 15865</a>)
 
 </ul>
 </div><!--=TRUNK-END=-->

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

@@ -319,7 +319,6 @@ public class SurefireArchiver extends MavenReporter {
 
     private boolean isSurefireOrFailsafeMojo(MojoInfo mojo) {
       return mojo.is("org.apache.maven.plugins", "maven-surefire-plugin", "test")
-          || mojo.is("org.apache.maven.plugins", "maven-failsafe-plugin", "integration-test")
           || mojo.is("org.apache.maven.plugins", "maven-failsafe-plugin", "verify");
     }