This is an automated email from the git hooks/post-receive script. New commit to branch sync-timebundle in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit 154157982302b3a6b454c0a2c2ef3ae71a24297f Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Mar 8 10:33:12 2017 +0100 Switch to logback --- pom.xml | 22 ++++++++--------- src/main/resources/{log4j2.xml => logback.xml} | 34 +++++++++++++------------- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/pom.xml b/pom.xml index 77060af..867be8b 100644 --- a/pom.xml +++ b/pom.xml @@ -126,6 +126,10 @@ <artifactId>commons-primitives</artifactId> </exclusion> <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </exclusion> @@ -170,15 +174,14 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>2.8.1</version> - <scope>runtime</scope> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <version>1.7.24</version> </dependency> <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jcl</artifactId> - <version>2.8.1</version> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + <version>1.2.1</version> <scope>runtime</scope> </dependency> <dependency> @@ -207,11 +210,6 @@ <version>3.5</version> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.2</version> - </dependency> - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <version>2.5</version> diff --git a/src/main/resources/log4j2.xml b/src/main/resources/logback.xml similarity index 56% rename from src/main/resources/log4j2.xml rename to src/main/resources/logback.xml index dd8ab84..bea6507 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/logback.xml @@ -3,37 +3,37 @@ #%L jTimer %% - Copyright (C) 2016 CodeLutin + Copyright (C) 2017 CodeLutin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<Configuration> +<configuration> - <Appenders> - <Console name="Console" target="SYSTEM_OUT"> - <PatternLayout pattern="%d{yyyy/MM/dd HH:mm:ss} %5p (%c:%L) - %m%n"/> - </Console> - </Appenders> + <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> + <!-- encoders are assigned the type + ch.qos.logback.classic.encoder.PatternLayoutEncoder by default --> + <encoder> + <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern> + </encoder> + </appender> - <Loggers> - <Logger name="org.chorem.jtimer" level="info"/> - <Logger name="org.chorem.jtimer.plugins.timebundle" level="debug"/> + <Logger name="org.chorem.jtimer" level="info"/> + <Logger name="org.chorem.jtimer.plugins.timebundle" level="debug"/> - <Root level="warn"> - <AppenderRef ref="Console"/> - </Root> - </Loggers> -</Configuration> + <root level="warn"> + <appender-ref ref="STDOUT" /> + </root> +</configuration> \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.