JAMES-2493 use log4j only as a slf4j binding in spring app
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/0e7b9cf4 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/0e7b9cf4 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/0e7b9cf4 Branch: refs/heads/master Commit: 0e7b9cf47bfa624b9df512407498e1b561d1f12c Parents: 2887540 Author: Matthieu Baechler <[email protected]> Authored: Wed Jul 25 15:18:51 2018 +0200 Committer: benwa <[email protected]> Committed: Tue Jul 31 09:25:22 2018 +0700 ---------------------------------------------------------------------- .../java/org/apache/james/mpt/DiscardProtocol.java | 12 ++++++------ mpt/pom.xml | 1 - pom.xml | 6 ------ server/container/spring/pom.xml | 1 + server/protocols/protocols-smtp/pom.xml | 15 +++++---------- 5 files changed, 12 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/0e7b9cf4/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java b/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java index d27bacc..2774079 100644 --- a/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java +++ b/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java @@ -30,9 +30,9 @@ import java.util.Collection; import java.util.LinkedList; import java.util.Queue; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.james.util.Port; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Simple <a href='http://tools.ietf.org/html/rfc863'>RFC 863</a> implementation. @@ -45,7 +45,7 @@ public class DiscardProtocol { private static final int IDLE_TIMEOUT = 120000; - private static final Log LOG = LogFactory.getLog(DiscardProtocol.class); + private static final Logger LOG = LoggerFactory.getLogger(DiscardProtocol.class); /** Serve on this port */ private Port port; @@ -162,7 +162,7 @@ public class DiscardProtocol { } } } catch (Exception e) { - LOG.fatal("Cannot accept connection", e); + LOG.error("Cannot accept connection", e); abort(); } } @@ -215,7 +215,7 @@ public class DiscardProtocol { public void run() { try { if (socketChannel == null) { - LOG.fatal("Socket channel must be set before instance is run."); + LOG.error("Socket channel must be set before instance is run."); } else { try { while (!socketChannel.finishConnect()) { @@ -231,7 +231,7 @@ public class DiscardProtocol { } } catch (Exception e) { - LOG.fatal("Socket communication failed", e); + LOG.error("Socket communication failed", e); aborted = true; // Tidy up http://git-wip-us.apache.org/repos/asf/james-project/blob/0e7b9cf4/mpt/pom.xml ---------------------------------------------------------------------- diff --git a/mpt/pom.xml b/mpt/pom.xml index 4adef84..c2f6595 100644 --- a/mpt/pom.xml +++ b/mpt/pom.xml @@ -59,7 +59,6 @@ <hbase.version>0.94.27</hbase.version> <jmock.version>2.6.0</jmock.version> <junit.version>4.11</junit.version> - <log4j.version>1.2.16</log4j.version> <lucene-core.version>3.6.0</lucene-core.version> <slf4j.version>1.7.25</slf4j.version> </properties> http://git-wip-us.apache.org/repos/asf/james-project/blob/0e7b9cf4/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 28e4e91..4d2712f 100644 --- a/pom.xml +++ b/pom.xml @@ -615,7 +615,6 @@ <junit.vintage.version>4.12.2</junit.vintage.version> <jmock.version>2.6.0</jmock.version> <concurrent.version>1.3.4</concurrent.version> - <log4j.version>1.2.17</log4j.version> <jcr.version>2.0</jcr.version> <xbean-spring.version>4.9</xbean-spring.version> <netty.version>3.10.6.Final</netty.version> @@ -1964,11 +1963,6 @@ <version>${junit.version}</version> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4j.version}</version> - </dependency> - <dependency> <groupId>net.javacrumbs.json-unit</groupId> <artifactId>json-unit-assertj</artifactId> <version>2.0.0.RC1</version> http://git-wip-us.apache.org/repos/asf/james-project/blob/0e7b9cf4/server/container/spring/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/spring/pom.xml b/server/container/spring/pom.xml index af76e95..00fc175 100644 --- a/server/container/spring/pom.xml +++ b/server/container/spring/pom.xml @@ -104,6 +104,7 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> + <version>1.2.17</version> </dependency> <dependency> <groupId>org.apache.activemq</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/0e7b9cf4/server/protocols/protocols-smtp/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/pom.xml b/server/protocols/protocols-smtp/pom.xml index 0ff3fe9..9291472 100644 --- a/server/protocols/protocols-smtp/pom.xml +++ b/server/protocols/protocols-smtp/pom.xml @@ -154,6 +154,11 @@ <artifactId>metrics-api</artifactId> </dependency> <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> </dependency> @@ -185,11 +190,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-annotation_1.1_spec</artifactId> </dependency> @@ -240,11 +240,6 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
