Ported equivalent changes from logback branch. - Should be the same as 7f9e280522379fc0f3ac09f4d81e8188cdb54192 only with log4j2 as the backing impl
Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0dfc6b4c Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0dfc6b4c Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0dfc6b4c Branch: refs/heads/slf4j-log4j2 Commit: 0dfc6b4c2b33e8c11a877e170ed994785ea56038 Parents: 4e24edb Author: Stephen Connolly <stephen.alan.conno...@gmail.com> Authored: Wed Dec 12 09:31:25 2012 +0000 Committer: Arnaud HeÌritier <aherit...@apache.org> Committed: Mon Jun 3 12:30:06 2013 +0200 ---------------------------------------------------------------------- apache-maven/pom.xml | 14 +++++++- apache-maven/src/conf/logging/log4j2-color.xml | 36 +++++++++++++++++++ apache-maven/src/conf/logging/log4j2.xml | 36 +++++++++++++++++++ maven-embedder/pom.xml | 12 +++++- pom.xml | 27 +++++++++++++- 5 files changed, 121 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/0dfc6b4c/apache-maven/pom.xml ---------------------------------------------------------------------- diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index 7e3dea8..1355c88 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -85,7 +85,19 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> + <artifactId>slf4j-ext</artifactId> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + </dependency> + <dependency> + <groupId>org.fusesource.jansi</groupId> + <artifactId>jansi</artifactId> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/maven/blob/0dfc6b4c/apache-maven/src/conf/logging/log4j2-color.xml ---------------------------------------------------------------------- diff --git a/apache-maven/src/conf/logging/log4j2-color.xml b/apache-maven/src/conf/logging/log4j2-color.xml new file mode 100644 index 0000000..bea1e76 --- /dev/null +++ b/apache-maven/src/conf/logging/log4j2-color.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> + + +<configuration> + <properties> + <property name="maven.logging.root.level">INFO</property> + </properties> + <appenders> + <Console name="console" target="SYSTEM_OUT"> + <PatternLayout pattern="%highlight{[%p{WARN=WARNING}]} %msg%n%throwable" /> + </Console> + </appenders> + <loggers> + <root level="${sys:maven.logging.root.level}"> + <appender-ref ref="console"/> + </root> + </loggers> +</configuration> http://git-wip-us.apache.org/repos/asf/maven/blob/0dfc6b4c/apache-maven/src/conf/logging/log4j2.xml ---------------------------------------------------------------------- diff --git a/apache-maven/src/conf/logging/log4j2.xml b/apache-maven/src/conf/logging/log4j2.xml new file mode 100644 index 0000000..6635597 --- /dev/null +++ b/apache-maven/src/conf/logging/log4j2.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> + + +<configuration> <!--status="debug"--> + <properties> + <property name="maven.logging.root.level">INFO</property> + </properties> + <appenders> + <Console name="console" target="SYSTEM_OUT"> + <PatternLayout pattern="[%p{WARN=WARNING}] %msg%n%throwable"/> + </Console> + </appenders> + <loggers> + <root level="${sys:maven.logging.root.level}"> + <appender-ref ref="console"/> + </root> + </loggers> +</configuration> http://git-wip-us.apache.org/repos/asf/maven/blob/0dfc6b4c/maven-embedder/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 609044c..3e842b5 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -76,14 +76,22 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> + <artifactId>slf4j-ext</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> <optional>true</optional> - </dependency> + </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> <optional>true</optional> - </dependency> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + </dependency> <!-- CLI --> <dependency> <groupId>commons-cli</groupId> http://git-wip-us.apache.org/repos/asf/maven/blob/0dfc6b4c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d3117fc..a92ee16 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,9 @@ <modelloVersion>1.7</modelloVersion> <jxpathVersion>1.3</jxpathVersion> <aetherVersion>0.9.0.M2</aetherVersion> - <slf4jVersion>1.7.4</slf4jVersion> + <slf4jVersion>1.7.5</slf4jVersion> + <log4j2Version>2.0-beta6</log4j2Version> + <jansiVersion>1.11</jansiVersion> <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile> <!-- Control the name of the distribution and information output by mvn --> <distributionId>apache-maven</distributionId> @@ -238,6 +240,29 @@ <version>1.0.7</version> <optional>true</optional> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-ext</artifactId> + <version>${slf4jVersion}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <version>${log4j2Version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>${log4j2Version}</version> + </dependency> + <dependency> + <groupId>org.fusesource.jansi</groupId> + <artifactId>jansi</artifactId> + <version>${jansiVersion}</version> + <scope>runtime</scope> + </dependency> <!-- Wagon --> <dependency> <groupId>org.apache.maven.wagon</groupId>
