This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jtimer. See http://git.chorem.org/jtimer.git commit c621a557a6fc959cd84c7d4d15d8a55d5a42e5b2 Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Feb 23 12:18:27 2016 +0100 refs #1320: Update log4j2 --- pom.xml | 12 ++++++--- src/main/resources/log4j.properties | 51 ------------------------------------- src/main/resources/log4j2.xml | 38 +++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 54 deletions(-) diff --git a/pom.xml b/pom.xml index 5bb391c..4601e82 100644 --- a/pom.xml +++ b/pom.xml @@ -317,9 +317,15 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.17</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>2.5</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <version>2.5</version> <scope>runtime</scope> </dependency> <dependency> diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties deleted file mode 100644 index d425f12..0000000 --- a/src/main/resources/log4j.properties +++ /dev/null @@ -1,51 +0,0 @@ -### -# #%L -# jTimer -# %% -# Copyright (C) 2007 - 2012 CodeLutin, Chatellier Eric -# %% -# 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% -### -# Global logging configuration -log4j.rootLogger=WARN, stdout - -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{yyyy/MM/dd HH:mm:ss} %5p (%F:%L) %m%n - -# File output... -#log4j.appender.fileout=org.apache.log4j.FileAppender -#log4j.appender.fileout.File=jtimer.log -#log4j.appender.fileout.Append=true -#log4j.appender.fileout.Threshold=DEBUG -#log4j.appender.fileout.layout=org.apache.log4j.PatternLayout -#log4j.appender.fileout.layout.ConversionPattern=%5p (%F:%L) %m%n - -# Rolling appender -#log4j.appender.rolling=org.apache.log4j.RollingFileAppender -#log4j.appender.rolling.File=jtimer.log -#log4j.appender.rolling.MaxFileSize=100KB -#log4j.appender.rolling.Append=true -#log4j.appender.rolling.MaxBackupIndex=30 -#log4j.appender.rolling.Threshold=INFO -#log4j.appender.rolling.layout=org.apache.log4j.PatternLayout -#log4j.appender.rolling.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n - -# package level -#log4j.logger.org.chorem.jtimer=DEBUG -#log4j.logger.org.chorem.jtimer.ws=DEBUG -#log4j.logger.org.chorem.jtimer.ui.report=DEBUG diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml new file mode 100644 index 0000000..60f69cc --- /dev/null +++ b/src/main/resources/log4j2.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + jTimer + %% + Copyright (C) 2016 CodeLutin, Chatellier Eric + %% + 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> + + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d{yyyy/MM/dd HH:mm:ss} %5p (%c:%L) - %m%n" /> + </Console> + </Appenders> + + <Loggers> + <!-- <Logger name="org.chorem.jtimer" level="debug"/> --> + + <Root level="warn"> + <AppenderRef ref="Console" /> + </Root> + </Loggers> +</Configuration> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.