[MPMD-322] Display when PMD/CPD is skipped

apache · Sep 2, 2021 · 45a5e54 · 45a5e54
1 parent b8fc018
commit 45a5e54
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/src/main/java/org/apache/maven/plugins/pmd/CpdReport.java b/src/main/java/org/apache/maven/plugins/pmd/CpdReport.java
@@ -170,6 +170,7 @@ public boolean canGenerateReport()
     {
         if ( skip )
         {
+            getLog().info( "Skipping CPD execution" );
             return false;
         }
 

diff --git a/src/main/java/org/apache/maven/plugins/pmd/CpdViolationCheckMojo.java b/src/main/java/org/apache/maven/plugins/pmd/CpdViolationCheckMojo.java
@@ -75,10 +75,13 @@ public CpdViolationCheckMojo()
     public void execute()
         throws MojoExecutionException, MojoFailureException
     {
-        if ( !skip )
+        if ( skip )
         {
-            executeCheck( "cpd.xml", "duplication", "CPD duplication", 10 );
+            getLog().info( "Skipping CPD execution" );
+            return;
         }
+
+        executeCheck( "cpd.xml", "duplication", "CPD duplication", 10 );
     }
 
     /**

diff --git a/src/main/java/org/apache/maven/plugins/pmd/PmdReport.java b/src/main/java/org/apache/maven/plugins/pmd/PmdReport.java
@@ -315,6 +315,7 @@ public boolean canGenerateReport()
     {
         if ( skip )
         {
+            getLog().info( "Skipping PMD execution" );
             return false;
         }
 

diff --git a/src/main/java/org/apache/maven/plugins/pmd/PmdViolationCheckMojo.java b/src/main/java/org/apache/maven/plugins/pmd/PmdViolationCheckMojo.java
@@ -84,10 +84,13 @@ public PmdViolationCheckMojo()
     public void execute()
         throws MojoExecutionException, MojoFailureException
     {
-        if ( !skip )
+        if ( skip )
         {
-            executeCheck( "pmd.xml", "violation", "PMD violation", failurePriority );
+            getLog().info( "Skipping PMD execution" );
+            return;
         }
+
+        executeCheck( "pmd.xml", "violation", "PMD violation", failurePriority );
     }
 
     /**

diff --git a/src/test/java/org/apache/maven/plugins/pmd/PmdReportTest.java b/src/test/java/org/apache/maven/plugins/pmd/PmdReportTest.java
@@ -365,6 +365,10 @@ public void testSkipConfiguration()
 
         generatedFile = new File( getBasedir(), "target/test/unit/custom-configuration/target/site/pmd.html" );
         assertFalse( FileUtils.fileExists( generatedFile.getAbsolutePath() ) );
+
+        // the fact, the PMD execution has been skipped, should be logged
+        String output = CapturingPrintStream.getOutput();
+        assertTrue ( output.contains( "Skipping PMD execution" ) );
     }
 
     public void testSkipEmptyReportConfiguration()
-Original file line number
+Diff line change
@@ Expand Up / @@ -170,6 +170,7 @@ public boolean canGenerateReport() @@
         {
             if ( skip )
             {
+                getLog().info( "Skipping CPD execution" );
                 return false;
             }
@@ Expand Down @@