You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by rc...@apache.org on 2021/12/22 04:17:06 UTC

[james-jspf] branch master updated (5003673 -> 6b12046)

This is an automated email from the ASF dual-hosted git repository.

rcordier pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/james-jspf.git.


    from 5003673  Upgrade logback-classic 1.2.3 -> 1.2.6
     new 625f23e  Remove unused logger from SPFQuery
     new 6b12046  Drop Log4J

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 assemble/pom.xml                                        |  4 ----
 pom.xml                                                 |  5 -----
 resolver/pom.xml                                        |  4 ----
 .../main/java/org/apache/james/jspf/impl/SPFQuery.java  | 17 -----------------
 4 files changed, 30 deletions(-)

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


[james-jspf] 01/02: Remove unused logger from SPFQuery

Posted by rc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-jspf.git

commit 625f23e71c8421aada163172224625826f68070d
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Sun Dec 19 21:14:33 2021 +0700

    Remove unused logger from SPFQuery
---
 .../main/java/org/apache/james/jspf/impl/SPFQuery.java  | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/resolver/src/main/java/org/apache/james/jspf/impl/SPFQuery.java b/resolver/src/main/java/org/apache/james/jspf/impl/SPFQuery.java
index 008a260..a1f53a9 100644
--- a/resolver/src/main/java/org/apache/james/jspf/impl/SPFQuery.java
+++ b/resolver/src/main/java/org/apache/james/jspf/impl/SPFQuery.java
@@ -28,10 +28,6 @@ import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.PosixParser;
 import org.apache.james.jspf.core.exceptions.SPFErrorConstants;
 import org.apache.james.jspf.executor.SPFResult;
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.SimpleLayout;
 
 /**
  * This class is used for commandline usage of JSPF
@@ -79,8 +75,6 @@ public class SPFQuery {
     private final static String CMD_TRUSTED_FORWARDER = "enable-trusted-forwarder";
     private final static char CHAR_TRUSTED_FORWARDER = 't';
 
-    private static Logger logger = Logger.getRootLogger();
-
     /**
      * @param args
      *            The commandline arguments to parse
@@ -94,12 +88,6 @@ public class SPFQuery {
         boolean useBestGuess = false;
         boolean useTrustedForwarder = false;
 
-        SimpleLayout layout = new SimpleLayout();
-        ConsoleAppender consoleAppender = new ConsoleAppender(layout);
-        logger.addAppender(consoleAppender);
-
-        logger.setLevel(Level.ERROR);
-
         Options options = generateOptions();
         CommandLineParser parser = new PosixParser();
 
@@ -115,11 +103,6 @@ public class SPFQuery {
             // check if all needed values was set
             if (ip != null && sender != null && helo != null) {
 
-                if (line.hasOption(CHAR_DEBUG))
-                    logger.setLevel(Level.DEBUG);
-                if (line.hasOption(CHAR_VERBOSE))
-                    logger.setLevel(Level.TRACE);
-
                 SPF spf = new DefaultSPF();
 
                 // Check if we should set a costum default explanation

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


[james-jspf] 02/02: Drop Log4J

Posted by rc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-jspf.git

commit 6b12046c67d1a3edea8c226a143e86ef76fc6922
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Sun Dec 19 21:14:46 2021 +0700

    Drop Log4J
---
 assemble/pom.xml | 4 ----
 pom.xml          | 5 -----
 resolver/pom.xml | 4 ----
 3 files changed, 13 deletions(-)

diff --git a/assemble/pom.xml b/assemble/pom.xml
index 0421cb4..45caa92 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -47,10 +47,6 @@
             <artifactId>dnsjnio</artifactId>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
-        <dependency>
             <groupId>net.java.dev</groupId>
             <artifactId>jvyaml</artifactId>
         </dependency>
diff --git a/pom.xml b/pom.xml
index 718cb0e..3a25551 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,11 +99,6 @@
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
-                <version>1.2.17</version>
-            </dependency>
-            <dependency>
                 <groupId>net.java.dev</groupId>
                 <artifactId>jvyaml</artifactId>
                 <version>0.2.1</version>
diff --git a/resolver/pom.xml b/resolver/pom.xml
index 68fffbf..323bd69 100644
--- a/resolver/pom.xml
+++ b/resolver/pom.xml
@@ -55,10 +55,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.james.jspf</groupId>
             <artifactId>apache-jspf-tester</artifactId>
             <scope>test</scope>

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