You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ad...@apache.org on 2021/09/02 08:22:37 UTC
[maven-pmd-plugin] 04/04: [MPMD-322] Display when PMD/CPD is skipped
This is an automated email from the ASF dual-hosted git repository.
adangel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-pmd-plugin.git
commit 45a5e545ba3f53ccbe61dc5971ee5b623fa75cf7
Author: Andreas Dangel <ad...@apache.org>
AuthorDate: Thu Sep 2 10:13:48 2021 +0200
[MPMD-322] Display when PMD/CPD is skipped
---
src/main/java/org/apache/maven/plugins/pmd/CpdReport.java | 1 +
.../java/org/apache/maven/plugins/pmd/CpdViolationCheckMojo.java | 7 +++++--
src/main/java/org/apache/maven/plugins/pmd/PmdReport.java | 1 +
.../java/org/apache/maven/plugins/pmd/PmdViolationCheckMojo.java | 7 +++++--
src/test/java/org/apache/maven/plugins/pmd/PmdReportTest.java | 4 ++++
5 files changed, 16 insertions(+), 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
index 20277f9..1af30da 100644
--- 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 class CpdReport
{
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
index 1175dfb..56bd004 100644
--- 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 class 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
index 12c029b..6becd50 100644
--- 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 class PmdReport
{
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
index c4bc9a6..3f6200e 100644
--- 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 class 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
index 5420ba6..f8e4683 100644
--- 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 class PmdReportTest
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()