File tree Expand file tree Collapse file tree 7 files changed +3
-32
lines changed
src/main/java/org/apache/maven/plugins/pmd Expand file tree Collapse file tree 7 files changed +3
-32
lines changed Original file line number Diff line number Diff line change 31
31
import org .apache .maven .plugins .pmd .exec .CpdRequest ;
32
32
import org .apache .maven .plugins .pmd .exec .CpdResult ;
33
33
import org .apache .maven .reporting .MavenReportException ;
34
- import org .apache .maven .shared .utils .logging .MessageUtils ;
35
34
import org .apache .maven .toolchain .Toolchain ;
36
35
37
36
import net .sourceforge .pmd .cpd .JavaTokenizer ;
@@ -211,7 +210,6 @@ private void executeCpd()
211
210
request .addFiles ( filesToProcess .keySet () );
212
211
213
212
request .setShowPmdLog ( showPmdLog );
214
- request .setColorizedLog ( MessageUtils .isColorEnabled () );
215
213
request .setLogLevel ( determineCurrentRootLogLevel () );
216
214
217
215
request .setExcludeFromFailureFile ( excludeFromFailureFile );
Original file line number Diff line number Diff line change 45
45
import org .apache .maven .shared .artifact .filter .resolve .TransformableFilter ;
46
46
import org .apache .maven .shared .transfer .artifact .resolve .ArtifactResult ;
47
47
import org .apache .maven .shared .transfer .dependencies .resolve .DependencyResolver ;
48
- import org .apache .maven .shared .utils .logging .MessageUtils ;
49
48
import org .apache .maven .toolchain .Toolchain ;
50
49
import org .codehaus .plexus .resource .ResourceManager ;
51
50
import org .codehaus .plexus .resource .loader .FileResourceCreationException ;
@@ -374,7 +373,6 @@ private void executePmd()
374
373
request .setOutputEncoding ( getOutputEncoding () );
375
374
request .setFormat ( format );
376
375
request .setShowPmdLog ( showPmdLog );
377
- request .setColorizedLog ( MessageUtils .isColorEnabled () );
378
376
request .setSkipPmdError ( skipPmdError );
379
377
request .setIncludeXmlInSite ( includeXmlInSite );
380
378
request .setReportOutputDirectory ( getReportOutputDirectory ().getAbsolutePath () );
Original file line number Diff line number Diff line change @@ -170,7 +170,7 @@ public CpdExecutor( CpdRequest request )
170
170
171
171
private CpdResult run () throws MavenReportException
172
172
{
173
- setupPmdLogging ( request .isShowPmdLog (), request .isColorizedLog (), request . getLogLevel () );
173
+ setupPmdLogging ( request .isShowPmdLog (), request .getLogLevel () );
174
174
175
175
try
176
176
{
Original file line number Diff line number Diff line change @@ -47,7 +47,6 @@ public class CpdRequest implements Serializable
47
47
private List <File > files = new ArrayList <>();
48
48
49
49
private boolean showPmdLog ;
50
- private boolean colorizedLog ;
51
50
private String logLevel ;
52
51
53
52
private String excludeFromFailureFile ;
@@ -122,11 +121,6 @@ public void setShowPmdLog( boolean showPmdLog )
122
121
this .showPmdLog = showPmdLog ;
123
122
}
124
123
125
- public void setColorizedLog ( boolean colorizedLog )
126
- {
127
- this .colorizedLog = colorizedLog ;
128
- }
129
-
130
124
public void setLogLevel ( String logLevel )
131
125
{
132
126
this .logLevel = logLevel ;
@@ -197,11 +191,6 @@ public boolean isShowPmdLog()
197
191
return showPmdLog ;
198
192
}
199
193
200
- public boolean isColorizedLog ()
201
- {
202
- return colorizedLog ;
203
- }
204
-
205
194
public String getLogLevel ()
206
195
{
207
196
return logLevel ;
Original file line number Diff line number Diff line change 36
36
37
37
import org .apache .maven .cli .logging .Slf4jConfiguration ;
38
38
import org .apache .maven .cli .logging .Slf4jConfigurationFactory ;
39
- import org .apache .maven .shared .utils .logging .MessageUtils ;
40
39
import org .codehaus .plexus .logging .console .ConsoleLogger ;
41
40
import org .slf4j .ILoggerFactory ;
42
41
import org .slf4j .Logger ;
@@ -54,10 +53,8 @@ abstract class Executor
54
53
*/
55
54
private java .util .logging .Logger julLogger ;
56
55
57
- protected void setupPmdLogging ( boolean showPmdLog , boolean colorizedLog , String logLevel )
56
+ protected void setupPmdLogging ( boolean showPmdLog , String logLevel )
58
57
{
59
- MessageUtils .setColorEnabled ( colorizedLog );
60
-
61
58
if ( !showPmdLog )
62
59
{
63
60
return ;
Original file line number Diff line number Diff line change @@ -176,7 +176,7 @@ public PmdExecutor( PmdRequest request )
176
176
177
177
private PmdResult run () throws MavenReportException
178
178
{
179
- setupPmdLogging ( request .isShowPmdLog (), request .isColorizedLog (), request . getLogLevel () );
179
+ setupPmdLogging ( request .isShowPmdLog (), request .getLogLevel () );
180
180
181
181
PMDConfiguration configuration = new PMDConfiguration ();
182
182
LanguageVersion languageVersion = null ;
Original file line number Diff line number Diff line change @@ -50,7 +50,6 @@ public class PmdRequest implements Serializable
50
50
private List <File > files = new ArrayList <>();
51
51
52
52
private boolean showPmdLog ;
53
- private boolean colorizedLog ;
54
53
private String logLevel ;
55
54
private boolean skipPmdError ;
56
55
@@ -154,11 +153,6 @@ public void setShowPmdLog( boolean showPmdLog )
154
153
this .showPmdLog = showPmdLog ;
155
154
}
156
155
157
- public void setColorizedLog ( boolean colorizedLog )
158
- {
159
- this .colorizedLog = colorizedLog ;
160
- }
161
-
162
156
public void setLogLevel ( String logLevel )
163
157
{
164
158
this .logLevel = logLevel ;
@@ -263,11 +257,6 @@ public boolean isShowPmdLog()
263
257
return showPmdLog ;
264
258
}
265
259
266
- public boolean isColorizedLog ()
267
- {
268
- return colorizedLog ;
269
- }
270
-
271
260
public String getLogLevel ()
272
261
{
273
262
return logLevel ;
You can’t perform that action at this time.
0 commit comments