This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 65b328a40f11999bc3682e8531f2281786b9887c Author: Benoit Tellier <[email protected]> AuthorDate: Thu Mar 19 14:16:49 2020 +0700 JAMES-3122 Upgrade to log4J2 in server/app LOG4J 1 is deprecated and had been reported not to play well with Java 9+ https://www.mail-archive.com/[email protected]/msg16315.html --- pom.xml | 17 ++++++++++++----- server/app/pom.xml | 10 +++++----- server/container/spring/pom.xml | 18 +++++++++--------- 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index 869e985..e987ecb 100644 --- a/pom.xml +++ b/pom.xml @@ -592,6 +592,7 @@ <apache.openjpa.version>3.1.0</apache.openjpa.version> <camel.version>2.24.1</camel.version> <derby.version>10.14.2.0</derby.version> + <log4j2.version>2.13.1</log4j2.version> <javax.inject.version>1</javax.inject.version> <javax.activation.groupId>javax.activation</javax.activation.groupId> <javax.activation.artifactId>activation</javax.activation.artifactId> @@ -2416,6 +2417,17 @@ <type>test-jar</type> </dependency> <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <version>${log4j2.version}</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4j2.version}</version> + <type>pom</type> + </dependency> + <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> <version>${maven-plugin-api.version}</version> @@ -2587,11 +2599,6 @@ <version>${slf4j.version}</version> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j.version}</version> - </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> <version>${spring.version}</version> diff --git a/server/app/pom.xml b/server/app/pom.xml index dbeebf2..4b4a87b 100644 --- a/server/app/pom.xml +++ b/server/app/pom.xml @@ -549,6 +549,11 @@ <scope>runtime</scope> </dependency> <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> <scope>runtime</scope> @@ -559,11 +564,6 @@ <artifactId>slf4j-api</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-jdbc</artifactId> <scope>runtime</scope> diff --git a/server/container/spring/pom.xml b/server/container/spring/pom.xml index a1a9969..678c4f8 100644 --- a/server/container/spring/pom.xml +++ b/server/container/spring/pom.xml @@ -119,11 +119,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.17</version> - </dependency> - <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-spring</artifactId> <version>${activemq.version}</version> @@ -153,6 +148,15 @@ <artifactId>commons-configuration2</artifactId> </dependency> <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j</artifactId> + <type>pom</type> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + </dependency> + <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> </dependency> @@ -165,10 +169,6 @@ <artifactId>slf4j-api</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> </dependency> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
