branch develop updated (f92ff6f -> 7b5a7f1)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git from f92ff6f Try to fix Sonar build new 7b5a7f1 Update libs. Switch to logback. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 7b5a7f1bde61efe2e04edbfc8c2735608f2b18c4 Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Oct 16 17:45:26 2019 +0200 Update libs. Switch to logback. Summary of changes: pom.xml | 47 ++++++++++++++++---------- src/main/resources/{log4j2.xml => logback.xml} | 31 +++++++---------- 2 files changed, 42 insertions(+), 36 deletions(-) rename src/main/resources/{log4j2.xml => logback.xml} (61%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit 7b5a7f1bde61efe2e04edbfc8c2735608f2b18c4 Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Oct 16 17:45:26 2019 +0200 Update libs. Switch to logback. --- pom.xml | 47 ++++++++++++++++---------- src/main/resources/{log4j2.xml => logback.xml} | 31 +++++++---------- 2 files changed, 42 insertions(+), 36 deletions(-) diff --git a/pom.xml b/pom.xml index 89c9af0..e56ec04 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> - <version>1.5.3-SNAPSHOT</version> + <version>1.6-SNAPSHOT</version> <name>jTimer</name> <description> @@ -134,6 +134,10 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -167,46 +171,53 @@ <dependency> <groupId>net.java.dev.jna</groupId> <artifactId>jna</artifactId> - <version>5.3.1</version> + <version>5.4.0</version> <scope>compile</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>2.12.0</version> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>2.0.0-alpha1</version> <scope>runtime</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jcl</artifactId> - <version>2.12.0</version> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <version>2.0.0-alpha1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + <version>1.3.0-alpha4</version> <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> - <version>2.3.28</version> + <version>2.3.29</version> </dependency> <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> - <version>1.24</version> + <version>1.25</version> </dependency> <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.8.5</version> + <version>2.8.6</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> <version>3.9</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> @@ -217,7 +228,7 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>6.14.3</version> + <version>7.0.0</version> <scope>test</scope> <exclusions> <exclusion> @@ -332,7 +343,7 @@ <plugin> <groupId>com.akathist.maven.plugins.launch4j</groupId> <artifactId>launch4j-maven-plugin</artifactId> - <version>1.7.21</version> + <version>1.7.25</version> <executions> <execution> <id>launch4j</id> diff --git a/src/main/resources/log4j2.xml b/src/main/resources/logback.xml similarity index 61% rename from src/main/resources/log4j2.xml rename to src/main/resources/logback.xml index 2b970c9..5dddfd6 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/logback.xml @@ -1,38 +1,33 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- #%L jTimer %% - Copyright (C) 2016 - 2018 CodeLutin + Copyright (C) 2019 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> - - <Appenders> - <Console name="Console" target="SYSTEM_OUT"> - <PatternLayout pattern="%d{yyyy/MM/dd HH:mm:ss} %5p (%c:%L) - %m%n"/> - </Console> - </Appenders> +<configuration> - <Loggers> - <Logger name="org.chorem.jtimer" level="info"/> + <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> + <encoder> + <pattern>%d{yyyy/MM/dd HH:mm:ss} %-5level %logger{36} - %msg%n</pattern> + </encoder> + </appender> - <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>.
participants (1)
-
chorem.org scm