This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MNG-6065 in repository https://gitbox.apache.org/repos/asf/maven.git
commit 32968a58547648983b091a75a5ecb6c1051b5a38 Author: Martin Kanters <[email protected]> AuthorDate: Wed Oct 2 21:16:22 2019 +0200 Log fail-level option. Submitted by: Luc Klaassen and Martin Kanters. Tidying up some loose ends. --- maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java | 2 +- .../src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java | 2 +- maven-slf4j-wrapper/pom.xml | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java index de8a725..f7f92d6 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java @@ -1644,7 +1644,7 @@ public class MavenCli if ( commandLine.hasOption( CLIManager.SET_SYSTEM_PROPERTY ) ) { String[] defStrs = commandLine.getOptionValues( CLIManager.SET_SYSTEM_PROPERTY ); - + if ( defStrs != null ) { for ( String defStr : defStrs ) diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java index f7088a7..85c895e 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java @@ -141,7 +141,7 @@ public class ExecutionEventLogger extends AbstractExecutionListener if ( ( (MavenSlf4jWrapperFactory) iLoggerFactory ).threwLogsOfBreakingLevel() ) { event.getSession().getResult().addException( new Exception( - "Build failed due to log statements above WARN. " + "Build failed due to log statements with a higher severity than allowed. " + "Fix the logged issues or remove flag --fail-level (-fl)." ) ); } } diff --git a/maven-slf4j-wrapper/pom.xml b/maven-slf4j-wrapper/pom.xml index 02481a3..28d2323 100644 --- a/maven-slf4j-wrapper/pom.xml +++ b/maven-slf4j-wrapper/pom.xml @@ -31,9 +31,8 @@ under the License. <artifactId>maven-slf4j-wrapper</artifactId> <name>Maven SLF4J Wrapper</name> - <!-- TODO: Fill in a more detailed description.. --> <description> - Maven SLF4J Wrapper. + This modules provides an ILoggerFactory interface which avoids a cyclic dependency between maven-embedder and maven-slf4j-provider. </description> <dependencies>
