You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2012/12/01 21:28:07 UTC
[4/6] git commit: add logback implementation too
add logback implementation too
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/347026eb
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/347026eb
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/347026eb
Branch: refs/heads/dynamic-logging-impl
Commit: 347026ebbc97ee3d5f8bf0baf0d7e8807d9111d0
Parents: 2a64813
Author: olivier lamy <ol...@apache.org>
Authored: Sat Dec 1 16:56:51 2012 +0100
Committer: olivier lamy <ol...@apache.org>
Committed: Sat Dec 1 16:56:51 2012 +0100
----------------------------------------------------------------------
apache-maven/pom.xml | 12 +++++++++
apache-maven/src/bin/m2.conf | 3 ++
apache-maven/src/conf/logging/logback.xml | 31 ++++++++++++++++++++++++
apache-maven/src/main/assembly/bin.xml | 11 ++++++++
4 files changed, 57 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/347026eb/apache-maven/pom.xml
----------------------------------------------------------------------
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index b17eb35..cddf1cd 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -103,6 +103,18 @@
<artifactId>jansi</artifactId>
<version>1.9</version>
</dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ <version>1.0.7</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.0.7</version>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/maven/blob/347026eb/apache-maven/src/bin/m2.conf
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/m2.conf b/apache-maven/src/bin/m2.conf
index 7805d0a..8c7adf4 100644
--- a/apache-maven/src/bin/m2.conf
+++ b/apache-maven/src/bin/m2.conf
@@ -12,3 +12,6 @@ load ${maven.home}/slf4j-simple/*.jar
[log4j2]
load ${maven.home}/log4j2/*.jar
+
+[logback]
+load ${maven.home}/logback/*.jar
http://git-wip-us.apache.org/repos/asf/maven/blob/347026eb/apache-maven/src/conf/logging/logback.xml
----------------------------------------------------------------------
diff --git a/apache-maven/src/conf/logging/logback.xml b/apache-maven/src/conf/logging/logback.xml
new file mode 100644
index 0000000..5a192eb
--- /dev/null
+++ b/apache-maven/src/conf/logging/logback.xml
@@ -0,0 +1,31 @@
+<?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> <!-- debug="true" -->
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>[%-5level] %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <root level="${maven.logging.root.level}">
+ <appender-ref ref="STDOUT" />
+ </root>
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven/blob/347026eb/apache-maven/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/apache-maven/src/main/assembly/bin.xml b/apache-maven/src/main/assembly/bin.xml
index 6b6a2c2..e7bc646 100644
--- a/apache-maven/src/main/assembly/bin.xml
+++ b/apache-maven/src/main/assembly/bin.xml
@@ -41,6 +41,7 @@ under the License.
<exclude>org.apache.logging.log4j.adapters:log4j-slf4j-impl</exclude>
<exclude>org.apache.logging.log4j:*</exclude>
<exclude>org.slf4j:slf4j-simple</exclude>
+ <exclude>ch.qos.logback:*</exclude>
</excludes>
</dependencySet>
<dependencySet>
@@ -56,6 +57,16 @@ under the License.
<includes>
<include>org.apache.logging.log4j.adapters:log4j-slf4j-impl</include>
<include>org.apache.logging.log4j:*</include>
+ </includes>
+ <excludes>
+ <exclude>org.slf4j:slf4j-simple</exclude>
+ </excludes>
+ </dependencySet>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>logback</outputDirectory>
+ <includes>
+ <include>ch.qos.logback:*</include>
<include></include>
</includes>
<excludes>