svn commit: r1798404 - in /maven/plugins/trunk/maven-checkstyle-plugin/src: it/MCHECKSTYLE-214-basedir-resource/verify.groovy main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java

[mi...@apache.org]

Author: michaelo
Date: Sun Jun 11 20:31:57 2017
New Revision: 1798404

URL: http://svn.apache.org/viewvc?rev=1798404&view=rev
Log:
Revert fix and IT changes for MCHECKSTYLE-314

The fix introduces another run of Checkstyle with default settings interfering with the one set in an execution.

Modified:
    maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-214-basedir-resource/verify.groovy
    maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java

Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-214-basedir-resource/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-214-basedir-resource/verify.groovy?rev=1798404&r1=1798403&r2=1798404&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-214-basedir-resource/verify.groovy (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-214-basedir-resource/verify.groovy Sun Jun 11 20:31:57 2017
@@ -20,8 +20,7 @@
 def buildLog = new File( basedir, 'build.log' )
 
 // LICENSE.txt has 2 errors, src/main/resources/README.txt has 1 error
-// MCHECKSTYLE-314 added 2 errors from target/checkstyle-header.txt
-assert buildLog.text.contains( "[INFO] There are 5 errors reported by Checkstyle" )
+assert buildLog.text.contains( "[INFO] There are 3 errors reported by Checkstyle" )
 
 def checkstyle = new XmlSlurper().parse( new File( basedir, "target/checkstyle-result.xml" ) )
-assert 3 == checkstyle.file.size()
+assert 2 == checkstyle.file.size()

Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java?rev=1798404&r1=1798403&r2=1798404&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java Sun Jun 11 20:31:57 2017
@@ -41,7 +41,6 @@ import org.apache.maven.plugin.MojoExecu
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
 import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.Execute;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
@@ -74,7 +73,6 @@ import com.puppycrawl.tools.checkstyle.a
  */
 @Mojo( name = "check", defaultPhase = LifecyclePhase.VERIFY, requiresDependencyResolution = ResolutionScope.TEST,
        threadSafe = true )
-@Execute( goal = "checkstyle" )
 public class CheckstyleViolationCheckMojo
     extends AbstractMojo
 {