1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
|
From: Markus Koschany <apo@debian.org>
Date: Fri, 24 Jun 2022 20:43:44 +0200
Subject: maven-shared-utils 3.3.4 compatibility
Forwarded: not-needed
---
.../booterclient/DefaultForkConfiguration.java | 9 +++++++++
.../surefire/report/DefaultReporterFactory.java | 6 +++---
.../plugins/surefire/report/PluginConsoleLogger.java | 20 ++++----------------
3 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java
index 591491d..b9df82c 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java
@@ -27,6 +27,7 @@
import org.apache.maven.surefire.booter.StartupConfiguration;
import org.apache.maven.surefire.booter.SurefireBooterForkException;
import org.apache.maven.surefire.util.internal.ImmutableMap;
+import org.apache.maven.shared.utils.cli.CommandLineException;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -115,6 +116,9 @@ protected String extendJvmArgLine( @Nonnull String jvmArgLine )
public OutputStreamFlushableCommandline createCommandLine( @Nonnull StartupConfiguration config, int forkNumber )
throws SurefireBooterForkException
{
+ try
+ {
+
OutputStreamFlushableCommandline cli = new OutputStreamFlushableCommandline();
cli.setWorkingDirectory( getWorkingDirectory( forkNumber ).getAbsolutePath() );
@@ -143,6 +147,11 @@ public OutputStreamFlushableCommandline createCommandLine( @Nonnull StartupConfi
resolveClasspath( cli, findStartClass( config ), config );
return cli;
+ }
+ catch ( CommandLineException e )
+ {
+ throw new SurefireBooterForkException( e.getLocalizedMessage(), e );
+ }
}
@Nonnull
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
index 3db6ebd..88faab4 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
@@ -467,13 +467,13 @@ private void log( String s )
private void info( String s )
{
MessageBuilder builder = buffer();
- consoleLogger.info( builder.info( s ).toString() );
+ consoleLogger.info( builder.a( s ).toString() );
}
- private void err( String s )
+ private void warning( String s )
{
MessageBuilder builder = buffer();
- consoleLogger.error( builder.error( s ).toString() );
+ consoleLogger.warning( builder.warning( s ).toString() );
}
private void success( String s )
diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/PluginConsoleLogger.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/PluginConsoleLogger.java
index 0e0fb99..cf51d0e 100644
--- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/PluginConsoleLogger.java
+++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/PluginConsoleLogger.java
@@ -53,18 +53,12 @@ public boolean isDebugEnabled()
@Override
public void debug( String message )
{
- if ( mojoLogger.isDebugEnabled() )
- {
- mojoLogger.debug( createAnsiBuilder( message ).debug( message ).toString() );
- }
+ mojoLogger.debug( createAnsiBuilder( message ).a( message ).toString() );
}
public void debug( CharSequence content, Throwable error )
{
- if ( mojoLogger.isDebugEnabled() )
- {
- mojoLogger.debug( content, error );
- }
+ mojoLogger.debug( content, error );
}
@Override
@@ -76,10 +70,7 @@ public boolean isInfoEnabled()
@Override
public void info( String message )
{
- if ( mojoLogger.isInfoEnabled() )
- {
- mojoLogger.info( createAnsiBuilder( message ).info( message ).toString() );
- }
+ mojoLogger.info( createAnsiBuilder( message ).a( message ).toString() );
}
@Override
@@ -114,10 +105,7 @@ public boolean isErrorEnabled()
@Override
public void error( String message )
{
- if ( mojoLogger.isErrorEnabled() )
- {
- mojoLogger.error( createAnsiBuilder( message ).error( message ).toString() );
- }
+ mojoLogger.error( createAnsiBuilder( message ).failure( message ).toString() );
}
@Override
|
