Skip to content

Commit 7b4c330

Browse files
authored
[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.
1 parent 1d7a2fb commit 7b4c330

File tree

7 files changed

+3
-32
lines changed

7 files changed

+3
-32
lines changed

src/main/java/org/apache/maven/plugins/pmd/CpdReport.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import org.apache.maven.plugins.pmd.exec.CpdRequest;
3232
import org.apache.maven.plugins.pmd.exec.CpdResult;
3333
import org.apache.maven.reporting.MavenReportException;
34-
import org.apache.maven.shared.utils.logging.MessageUtils;
3534
import org.apache.maven.toolchain.Toolchain;
3635

3736
import net.sourceforge.pmd.cpd.JavaTokenizer;
@@ -211,7 +210,6 @@ private void executeCpd()
211210
request.addFiles( filesToProcess.keySet() );
212211

213212
request.setShowPmdLog( showPmdLog );
214-
request.setColorizedLog( MessageUtils.isColorEnabled() );
215213
request.setLogLevel( determineCurrentRootLogLevel() );
216214

217215
request.setExcludeFromFailureFile( excludeFromFailureFile );

src/main/java/org/apache/maven/plugins/pmd/PmdReport.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import org.apache.maven.shared.artifact.filter.resolve.TransformableFilter;
4646
import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult;
4747
import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
48-
import org.apache.maven.shared.utils.logging.MessageUtils;
4948
import org.apache.maven.toolchain.Toolchain;
5049
import org.codehaus.plexus.resource.ResourceManager;
5150
import org.codehaus.plexus.resource.loader.FileResourceCreationException;
@@ -374,7 +373,6 @@ private void executePmd()
374373
request.setOutputEncoding( getOutputEncoding() );
375374
request.setFormat( format );
376375
request.setShowPmdLog( showPmdLog );
377-
request.setColorizedLog( MessageUtils.isColorEnabled() );
378376
request.setSkipPmdError( skipPmdError );
379377
request.setIncludeXmlInSite( includeXmlInSite );
380378
request.setReportOutputDirectory( getReportOutputDirectory().getAbsolutePath() );

src/main/java/org/apache/maven/plugins/pmd/exec/CpdExecutor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public CpdExecutor( CpdRequest request )
170170

171171
private CpdResult run() throws MavenReportException
172172
{
173-
setupPmdLogging( request.isShowPmdLog(), request.isColorizedLog(), request.getLogLevel() );
173+
setupPmdLogging( request.isShowPmdLog(), request.getLogLevel() );
174174

175175
try
176176
{

src/main/java/org/apache/maven/plugins/pmd/exec/CpdRequest.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ public class CpdRequest implements Serializable
4747
private List<File> files = new ArrayList<>();
4848

4949
private boolean showPmdLog;
50-
private boolean colorizedLog;
5150
private String logLevel;
5251

5352
private String excludeFromFailureFile;
@@ -122,11 +121,6 @@ public void setShowPmdLog( boolean showPmdLog )
122121
this.showPmdLog = showPmdLog;
123122
}
124123

125-
public void setColorizedLog( boolean colorizedLog )
126-
{
127-
this.colorizedLog = colorizedLog;
128-
}
129-
130124
public void setLogLevel( String logLevel )
131125
{
132126
this.logLevel = logLevel;
@@ -197,11 +191,6 @@ public boolean isShowPmdLog()
197191
return showPmdLog;
198192
}
199193

200-
public boolean isColorizedLog()
201-
{
202-
return colorizedLog;
203-
}
204-
205194
public String getLogLevel()
206195
{
207196
return logLevel;

src/main/java/org/apache/maven/plugins/pmd/exec/Executor.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636

3737
import org.apache.maven.cli.logging.Slf4jConfiguration;
3838
import org.apache.maven.cli.logging.Slf4jConfigurationFactory;
39-
import org.apache.maven.shared.utils.logging.MessageUtils;
4039
import org.codehaus.plexus.logging.console.ConsoleLogger;
4140
import org.slf4j.ILoggerFactory;
4241
import org.slf4j.Logger;
@@ -54,10 +53,8 @@ abstract class Executor
5453
*/
5554
private java.util.logging.Logger julLogger;
5655

57-
protected void setupPmdLogging( boolean showPmdLog, boolean colorizedLog, String logLevel )
56+
protected void setupPmdLogging( boolean showPmdLog, String logLevel )
5857
{
59-
MessageUtils.setColorEnabled( colorizedLog );
60-
6158
if ( !showPmdLog )
6259
{
6360
return;

src/main/java/org/apache/maven/plugins/pmd/exec/PmdExecutor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public PmdExecutor( PmdRequest request )
176176

177177
private PmdResult run() throws MavenReportException
178178
{
179-
setupPmdLogging( request.isShowPmdLog(), request.isColorizedLog(), request.getLogLevel() );
179+
setupPmdLogging( request.isShowPmdLog(), request.getLogLevel() );
180180

181181
PMDConfiguration configuration = new PMDConfiguration();
182182
LanguageVersion languageVersion = null;

src/main/java/org/apache/maven/plugins/pmd/exec/PmdRequest.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ public class PmdRequest implements Serializable
5050
private List<File> files = new ArrayList<>();
5151

5252
private boolean showPmdLog;
53-
private boolean colorizedLog;
5453
private String logLevel;
5554
private boolean skipPmdError;
5655

@@ -154,11 +153,6 @@ public void setShowPmdLog( boolean showPmdLog )
154153
this.showPmdLog = showPmdLog;
155154
}
156155

157-
public void setColorizedLog( boolean colorizedLog )
158-
{
159-
this.colorizedLog = colorizedLog;
160-
}
161-
162156
public void setLogLevel( String logLevel )
163157
{
164158
this.logLevel = logLevel;
@@ -263,11 +257,6 @@ public boolean isShowPmdLog()
263257
return showPmdLog;
264258
}
265259

266-
public boolean isColorizedLog()
267-
{
268-
return colorizedLog;
269-
}
270-
271260
public String getLogLevel()
272261
{
273262
return logLevel;

0 commit comments

Comments
 (0)