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 2022/09/01 07:13:01 UTC

[maven-pmd-plugin] branch master updated: [MPMD-353] - API incompatibility with jansi after upgrading m-shared-utils (#91)

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


The following commit(s) were added to refs/heads/master by this push:
     new 7b4c330  [MPMD-353] - API incompatibility with jansi after upgrading m-shared-utils (#91)
7b4c330 is described below

commit 7b4c330399faa65b8800b6a3dfd9d60a661178b8
Author: Andreas Dangel <ad...@apache.org>
AuthorDate: Thu Sep 1 09:12:57 2022 +0200

    [MPMD-353] - API incompatibility with jansi after upgrading m-shared-utils (#91)
    
    The call to `MessageUtils.setColorEnabled()` is not needed. Log output
    from PMD is correctly colored depending on the maven settings.
    No special handling is needed.
---
 src/main/java/org/apache/maven/plugins/pmd/CpdReport.java     |  2 --
 src/main/java/org/apache/maven/plugins/pmd/PmdReport.java     |  2 --
 .../java/org/apache/maven/plugins/pmd/exec/CpdExecutor.java   |  2 +-
 .../java/org/apache/maven/plugins/pmd/exec/CpdRequest.java    | 11 -----------
 src/main/java/org/apache/maven/plugins/pmd/exec/Executor.java |  5 +----
 .../java/org/apache/maven/plugins/pmd/exec/PmdExecutor.java   |  2 +-
 .../java/org/apache/maven/plugins/pmd/exec/PmdRequest.java    | 11 -----------
 7 files changed, 3 insertions(+), 32 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 1943c33..522b350 100644
--- a/src/main/java/org/apache/maven/plugins/pmd/CpdReport.java
+++ b/src/main/java/org/apache/maven/plugins/pmd/CpdReport.java
@@ -31,7 +31,6 @@ import org.apache.maven.plugins.pmd.exec.CpdExecutor;
 import org.apache.maven.plugins.pmd.exec.CpdRequest;
 import org.apache.maven.plugins.pmd.exec.CpdResult;
 import org.apache.maven.reporting.MavenReportException;
-import org.apache.maven.shared.utils.logging.MessageUtils;
 import org.apache.maven.toolchain.Toolchain;
 
 import net.sourceforge.pmd.cpd.JavaTokenizer;
@@ -211,7 +210,6 @@ public class CpdReport
             request.addFiles( filesToProcess.keySet() );
 
             request.setShowPmdLog( showPmdLog );
-            request.setColorizedLog( MessageUtils.isColorEnabled() );
             request.setLogLevel( determineCurrentRootLogLevel() );
 
             request.setExcludeFromFailureFile( excludeFromFailureFile );
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 9b0f202..72f923a 100644
--- a/src/main/java/org/apache/maven/plugins/pmd/PmdReport.java
+++ b/src/main/java/org/apache/maven/plugins/pmd/PmdReport.java
@@ -45,7 +45,6 @@ import org.apache.maven.shared.artifact.filter.resolve.ScopeFilter;
 import org.apache.maven.shared.artifact.filter.resolve.TransformableFilter;
 import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult;
 import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
-import org.apache.maven.shared.utils.logging.MessageUtils;
 import org.apache.maven.toolchain.Toolchain;
 import org.codehaus.plexus.resource.ResourceManager;
 import org.codehaus.plexus.resource.loader.FileResourceCreationException;
@@ -374,7 +373,6 @@ public class PmdReport
         request.setOutputEncoding( getOutputEncoding() );
         request.setFormat( format );
         request.setShowPmdLog( showPmdLog );
-        request.setColorizedLog( MessageUtils.isColorEnabled() );
         request.setSkipPmdError( skipPmdError );
         request.setIncludeXmlInSite( includeXmlInSite );
         request.setReportOutputDirectory( getReportOutputDirectory().getAbsolutePath() );
diff --git a/src/main/java/org/apache/maven/plugins/pmd/exec/CpdExecutor.java b/src/main/java/org/apache/maven/plugins/pmd/exec/CpdExecutor.java
index 4905eb9..998c8e3 100644
--- a/src/main/java/org/apache/maven/plugins/pmd/exec/CpdExecutor.java
+++ b/src/main/java/org/apache/maven/plugins/pmd/exec/CpdExecutor.java
@@ -170,7 +170,7 @@ public class CpdExecutor extends Executor
 
     private CpdResult run() throws MavenReportException
     {
-        setupPmdLogging( request.isShowPmdLog(), request.isColorizedLog(), request.getLogLevel() );
+        setupPmdLogging( request.isShowPmdLog(), request.getLogLevel() );
 
         try
         {
diff --git a/src/main/java/org/apache/maven/plugins/pmd/exec/CpdRequest.java b/src/main/java/org/apache/maven/plugins/pmd/exec/CpdRequest.java
index 694625b..51c333a 100644
--- a/src/main/java/org/apache/maven/plugins/pmd/exec/CpdRequest.java
+++ b/src/main/java/org/apache/maven/plugins/pmd/exec/CpdRequest.java
@@ -47,7 +47,6 @@ public class CpdRequest implements Serializable
     private List<File> files = new ArrayList<>();
 
     private boolean showPmdLog;
-    private boolean colorizedLog;
     private String logLevel;
 
     private String excludeFromFailureFile;
@@ -122,11 +121,6 @@ public class CpdRequest implements Serializable
         this.showPmdLog = showPmdLog;
     }
 
-    public void setColorizedLog( boolean colorizedLog )
-    {
-        this.colorizedLog = colorizedLog;
-    }
-
     public void setLogLevel( String logLevel )
     {
         this.logLevel = logLevel;
@@ -197,11 +191,6 @@ public class CpdRequest implements Serializable
         return showPmdLog;
     }
 
-    public boolean isColorizedLog()
-    {
-        return colorizedLog;
-    }
-
     public String getLogLevel()
     {
         return logLevel;
diff --git a/src/main/java/org/apache/maven/plugins/pmd/exec/Executor.java b/src/main/java/org/apache/maven/plugins/pmd/exec/Executor.java
index b4636d1..3b3679c 100644
--- a/src/main/java/org/apache/maven/plugins/pmd/exec/Executor.java
+++ b/src/main/java/org/apache/maven/plugins/pmd/exec/Executor.java
@@ -36,7 +36,6 @@ import java.util.logging.SimpleFormatter;
 
 import org.apache.maven.cli.logging.Slf4jConfiguration;
 import org.apache.maven.cli.logging.Slf4jConfigurationFactory;
-import org.apache.maven.shared.utils.logging.MessageUtils;
 import org.codehaus.plexus.logging.console.ConsoleLogger;
 import org.slf4j.ILoggerFactory;
 import org.slf4j.Logger;
@@ -54,10 +53,8 @@ abstract class Executor
      */
     private java.util.logging.Logger julLogger;
 
-    protected void setupPmdLogging( boolean showPmdLog, boolean colorizedLog, String logLevel )
+    protected void setupPmdLogging( boolean showPmdLog, String logLevel )
     {
-        MessageUtils.setColorEnabled( colorizedLog );
-
         if ( !showPmdLog )
         {
             return;
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 cdd12e7..cc25c80 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
@@ -176,7 +176,7 @@ public class PmdExecutor extends Executor
 
     private PmdResult run() throws MavenReportException
     {
-        setupPmdLogging( request.isShowPmdLog(), request.isColorizedLog(), request.getLogLevel() );
+        setupPmdLogging( request.isShowPmdLog(), request.getLogLevel() );
 
         PMDConfiguration configuration = new PMDConfiguration();
         LanguageVersion languageVersion = null;
diff --git a/src/main/java/org/apache/maven/plugins/pmd/exec/PmdRequest.java b/src/main/java/org/apache/maven/plugins/pmd/exec/PmdRequest.java
index 09b4e27..0c3a5e9 100644
--- a/src/main/java/org/apache/maven/plugins/pmd/exec/PmdRequest.java
+++ b/src/main/java/org/apache/maven/plugins/pmd/exec/PmdRequest.java
@@ -50,7 +50,6 @@ public class PmdRequest implements Serializable
     private List<File> files = new ArrayList<>();
 
     private boolean showPmdLog;
-    private boolean colorizedLog;
     private String logLevel;
     private boolean skipPmdError;
 
@@ -154,11 +153,6 @@ public class PmdRequest implements Serializable
         this.showPmdLog = showPmdLog;
     }
 
-    public void setColorizedLog( boolean colorizedLog )
-    {
-        this.colorizedLog = colorizedLog;
-    }
-
     public void setLogLevel( String logLevel )
     {
         this.logLevel = logLevel;
@@ -263,11 +257,6 @@ public class PmdRequest implements Serializable
         return showPmdLog;
     }
 
-    public boolean isColorizedLog()
-    {
-        return colorizedLog;
-    }
-
     public String getLogLevel()
     {
         return logLevel;