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/01/08 09:02:28 UTC
[maven-pmd-plugin] branch pr-41 updated (1eb460f -> fb00aa5)
This is an automated email from the ASF dual-hosted git repository.
adangel pushed a change to branch pr-41
in repository https://gitbox.apache.org/repos/asf/maven-pmd-plugin.git.
omit 1eb460f [MPMD-314] Report extension not set correctly when custom format (class name) is specified Report extension is currently set to match the format, as in "csv", "html". This fails when you specify the format as a fully qualified class name. Since the renderer interface includes a method defaultFileExtension(), we should use this instead to set the file extension.
new 5ad9c53 [MPMD-314] Report extension not set correctly for custom format
new fb00aa5 [MPMD-314] - Avoid NPE for format "none"
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (1eb460f)
\
N -- N -- N refs/heads/pr-41 (fb00aa5)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/main/java/org/apache/maven/plugins/pmd/exec/PmdExecutor.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
[maven-pmd-plugin] 02/02: [MPMD-314] - Avoid NPE for format "none"
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adangel pushed a commit to branch pr-41
in repository https://gitbox.apache.org/repos/asf/maven-pmd-plugin.git
commit fb00aa5fa05c5e204218fdddb193d06cf612381a
Author: Andreas Dangel <ad...@apache.org>
AuthorDate: Fri Jan 8 10:01:42 2021 +0100
[MPMD-314] - Avoid NPE for format "none"
---
src/main/java/org/apache/maven/plugins/pmd/exec/PmdExecutor.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/pmd/exec/PmdExecutor.java b/src/main/java/org/apache/maven/plugins/pmd/exec/PmdExecutor.java
index 9fec621..0eaf8e6 100644
--- a/src/main/java/org/apache/maven/plugins/pmd/exec/PmdExecutor.java
+++ b/src/main/java/org/apache/maven/plugins/pmd/exec/PmdExecutor.java
@@ -376,7 +376,7 @@ public class PmdExecutor extends Executor
*/
private void writeXmlReport( Report report ) throws MavenReportException
{
- File targetFile = writeReport( report, new XMLRenderer( request.getOutputEncoding() ), "xml" );
+ File targetFile = writeReport( report, new XMLRenderer( request.getOutputEncoding() ) );
if ( request.isIncludeXmlInSite() )
{
File siteDir = new File( request.getReportOutputDirectory() );
@@ -392,7 +392,7 @@ public class PmdExecutor extends Executor
}
}
- private File writeReport( Report report, Renderer r, String extension ) throws MavenReportException
+ private File writeReport( Report report, Renderer r ) throws MavenReportException
{
if ( r == null )
{
@@ -401,6 +401,7 @@ public class PmdExecutor extends Executor
File targetDir = new File( request.getTargetDirectory() );
targetDir.mkdirs();
+ String extension = r.defaultFileExtension();
File targetFile = new File( targetDir, "pmd." + extension );
LOG.debug( "Target PMD output file: {}", targetFile );
try ( Writer writer = new OutputStreamWriter( new FileOutputStream( targetFile ),
@@ -430,7 +431,7 @@ public class PmdExecutor extends Executor
throws MavenReportException
{
Renderer renderer = createRenderer( request.getFormat(), request.getOutputEncoding() );
- writeReport( report, renderer, renderer.defaultFileExtension() );
+ writeReport( report, renderer );
}
/**
[maven-pmd-plugin] 01/02: [MPMD-314] Report extension not set
correctly for custom format
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adangel pushed a commit to branch pr-41
in repository https://gitbox.apache.org/repos/asf/maven-pmd-plugin.git
commit 5ad9c5322989411340e3533a7dde2d07b9c58c2e
Author: Hedley Proctor <he...@ICEInsureTech.com>
AuthorDate: Mon Jan 4 23:50:40 2021 +0000
[MPMD-314] Report extension not set correctly for custom format
Report file extension not set correctly when custom format (class name)
is specified. The extension is currently set to match the format,
as in "csv", "html". This fails when you specify the format as a fully
qualified class name. Since the renderer interface includes a method
defaultFileExtension(), we should use this instead to set the file
extension.
---
src/main/java/org/apache/maven/plugins/pmd/exec/PmdExecutor.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/maven/plugins/pmd/exec/PmdExecutor.java b/src/main/java/org/apache/maven/plugins/pmd/exec/PmdExecutor.java
index eae9253..9fec621 100644
--- a/src/main/java/org/apache/maven/plugins/pmd/exec/PmdExecutor.java
+++ b/src/main/java/org/apache/maven/plugins/pmd/exec/PmdExecutor.java
@@ -402,6 +402,7 @@ public class PmdExecutor extends Executor
File targetDir = new File( request.getTargetDirectory() );
targetDir.mkdirs();
File targetFile = new File( targetDir, "pmd." + extension );
+ LOG.debug( "Target PMD output file: {}", targetFile );
try ( Writer writer = new OutputStreamWriter( new FileOutputStream( targetFile ),
request.getOutputEncoding() ) )
{
@@ -429,7 +430,7 @@ public class PmdExecutor extends Executor
throws MavenReportException
{
Renderer renderer = createRenderer( request.getFormat(), request.getOutputEncoding() );
- writeReport( report, renderer, request.getFormat() );
+ writeReport( report, renderer, renderer.defaultFileExtension() );
}
/**
@@ -441,6 +442,7 @@ public class PmdExecutor extends Executor
*/
public static Renderer createRenderer( String format, String outputEncoding ) throws MavenReportException
{
+ LOG.debug( "Renderer requested: {}", format );
Renderer result = null;
if ( "xml".equals( format ) )
{