james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From btell...@apache.org
Subject [james-jdkim] 07/18: JDKIM-42 Upgrade log4j 1.2.16 -> log4j-core 2.12.1
Date Mon, 09 Sep 2019 05:09:03 GMT
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-jdkim.git

commit 53b48f74b95936d73d8188f0b57764539c8b7953
Author: Rene Cordier <rcordier@linagora.com>
AuthorDate: Wed Sep 4 15:55:13 2019 +0700

    JDKIM-42 Upgrade log4j 1.2.16 -> log4j-core 2.12.1
---
 mailets/pom.xml | 10 +++++-----
 main/pom.xml    |  4 ++--
 pom.xml         | 14 +++++++-------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/mailets/pom.xml b/mailets/pom.xml
index afa6cc7..aa79325 100644
--- a/mailets/pom.xml
+++ b/mailets/pom.xml
@@ -90,11 +90,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-activation_1.1_spec</artifactId>
         </dependency>
@@ -103,6 +98,11 @@
             <artifactId>geronimo-javamail_1.4_mail</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>ca.juliusdavies</groupId>
             <artifactId>not-yet-commons-ssl</artifactId>
         </dependency>
diff --git a/main/pom.xml b/main/pom.xml
index 850e0c1..99e1a91 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -78,8 +78,8 @@
             <artifactId>apache-mime4j-dom</artifactId>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index 3e4b6e0..563152b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
         <dnsjava.version>2.1.9</dnsjava.version>
         <not-yet-commons-ssl.version>0.3.11</not-yet-commons-ssl.version>
         <apache-mime4j.version>0.8.1</apache-mime4j.version>
-        <log4j.version>1.2.16</log4j.version>
+        <log4j.version>2.12.1</log4j.version>
         <target.jdk>1.6</target.jdk>
         <james-skin.version>1.8</james-skin.version>
     </properties>
@@ -187,12 +187,6 @@
                 </exclusions>
             </dependency>
             <dependency>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
-                <scope>runtime</scope>
-                <version>${log4j.version}</version>
-            </dependency>
-            <dependency>
                 <groupId>dnsjava</groupId>
                 <artifactId>dnsjava</artifactId>
                 <version>${dnsjava.version}</version>
@@ -215,6 +209,12 @@
                 <version>${project.version}</version>
             </dependency>
             <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-core</artifactId>
+                <scope>runtime</scope>
+                <version>${log4j.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>ca.juliusdavies</groupId>
                 <artifactId>not-yet-commons-ssl</artifactId>
                 <version>${not-yet-commons-ssl.version}</version>


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message