diff --git a/pom.xml b/pom.xml
index 68395e6..1e5d669 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,11 +28,18 @@
test
- log4j
- log4j
- 1.2.17
+ org.slf4j
+ slf4j-api
+ 1.7.18
jar
+
+ org.slf4j
+ slf4j-jdk14
+ 1.7.18
+ jar
+ test
+
dnsjava
dnsjava
diff --git a/src/main/java/org/jitsi/dnssec/SMessage.java b/src/main/java/org/jitsi/dnssec/SMessage.java
index 0f69e33..22631f7 100644
--- a/src/main/java/org/jitsi/dnssec/SMessage.java
+++ b/src/main/java/org/jitsi/dnssec/SMessage.java
@@ -45,7 +45,8 @@
import java.util.LinkedList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xbill.DNS.Flags;
import org.xbill.DNS.Header;
import org.xbill.DNS.Message;
@@ -63,7 +64,7 @@
* @author davidb
*/
public class SMessage {
- private static final Logger logger = Logger.getLogger(SMessage.class);
+ private static final Logger logger = LoggerFactory.getLogger(SMessage.class);
private static final SRRset[] EMPTY_SRRSET_ARRAY = new SRRset[0];
private static final int NUM_SECTIONS = 3;
private static final int MAX_FLAGS = 16;
diff --git a/src/main/java/org/jitsi/dnssec/validator/DnsSecVerifier.java b/src/main/java/org/jitsi/dnssec/validator/DnsSecVerifier.java
index 740afc4..aa52bb5 100644
--- a/src/main/java/org/jitsi/dnssec/validator/DnsSecVerifier.java
+++ b/src/main/java/org/jitsi/dnssec/validator/DnsSecVerifier.java
@@ -44,8 +44,9 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.log4j.Logger;
import org.jitsi.dnssec.SecurityStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xbill.DNS.DNSKEYRecord;
import org.xbill.DNS.DNSSEC;
import org.xbill.DNS.DNSSEC.DNSSECException;
@@ -61,7 +62,7 @@
* @version $Revision: 361 $
*/
public class DnsSecVerifier {
- private static final Logger logger = Logger.getLogger(DnsSecVerifier.class);
+ private static final Logger logger = LoggerFactory.getLogger(DnsSecVerifier.class);
/**
* Find the matching DNSKEY(s) to an RRSIG within a DNSKEY rrset. Normally
diff --git a/src/main/java/org/jitsi/dnssec/validator/KeyEntry.java b/src/main/java/org/jitsi/dnssec/validator/KeyEntry.java
index 698ea2d..34b5605 100644
--- a/src/main/java/org/jitsi/dnssec/validator/KeyEntry.java
+++ b/src/main/java/org/jitsi/dnssec/validator/KeyEntry.java
@@ -40,7 +40,8 @@
package org.jitsi.dnssec.validator;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jitsi.dnssec.SRRset;
import org.xbill.DNS.Name;
@@ -48,7 +49,7 @@
* DNSKEY cache entry for a given {@link Name}, with or without actual keys.
*/
public final class KeyEntry {
- private static final Logger logger = Logger.getLogger(KeyEntry.class);
+ private static final Logger logger = LoggerFactory.getLogger(KeyEntry.class);
private SRRset rrset;
private Name name;
diff --git a/src/main/java/org/jitsi/dnssec/validator/NSEC3ValUtils.java b/src/main/java/org/jitsi/dnssec/validator/NSEC3ValUtils.java
index 1f26e94..9d1e4fd 100644
--- a/src/main/java/org/jitsi/dnssec/validator/NSEC3ValUtils.java
+++ b/src/main/java/org/jitsi/dnssec/validator/NSEC3ValUtils.java
@@ -52,7 +52,8 @@
import java.util.Properties;
import java.util.TreeMap;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jitsi.dnssec.SRRset;
import org.jitsi.dnssec.SecurityStatus;
import org.xbill.DNS.DNSKEYRecord;
@@ -71,7 +72,7 @@
*/
final class NSEC3ValUtils {
// The logger to use in static methods.
- private static final Logger logger = Logger.getLogger(NSEC3ValUtils.class);
+ private static final Logger logger = LoggerFactory.getLogger(NSEC3ValUtils.class);
private static final Name ASTERISK_LABEL = Name.fromConstantString("*");
diff --git a/src/main/java/org/jitsi/dnssec/validator/ValUtils.java b/src/main/java/org/jitsi/dnssec/validator/ValUtils.java
index 23605c0..8cb7251 100644
--- a/src/main/java/org/jitsi/dnssec/validator/ValUtils.java
+++ b/src/main/java/org/jitsi/dnssec/validator/ValUtils.java
@@ -43,7 +43,8 @@
import java.util.Iterator;
import java.util.Properties;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jitsi.dnssec.R;
import org.jitsi.dnssec.SMessage;
import org.jitsi.dnssec.SRRset;
@@ -71,7 +72,7 @@
* @author davidb
*/
public class ValUtils {
- private static final Logger logger = Logger.getLogger(ValUtils.class);
+ private static final Logger logger = LoggerFactory.getLogger(ValUtils.class);
private static final Name WILDCARD = Name.fromConstantString("*");
diff --git a/src/main/java/org/jitsi/dnssec/validator/ValidatingResolver.java b/src/main/java/org/jitsi/dnssec/validator/ValidatingResolver.java
index 1cc1c13..cc832b6 100644
--- a/src/main/java/org/jitsi/dnssec/validator/ValidatingResolver.java
+++ b/src/main/java/org/jitsi/dnssec/validator/ValidatingResolver.java
@@ -53,7 +53,8 @@
import java.util.Map;
import java.util.Properties;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jitsi.dnssec.SMessage;
import org.jitsi.dnssec.SRRset;
import org.jitsi.dnssec.SecurityStatus;
@@ -89,7 +90,7 @@ public class ValidatingResolver implements Resolver {
*/
public static final int VALIDATION_REASON_QCLASS = 65280;
- private static final Logger logger = Logger.getLogger(ValidatingResolver.class);
+ private static final Logger logger = LoggerFactory.getLogger(ValidatingResolver.class);
/**
* This is the TTL to use when a trust anchor priming query failed to
diff --git a/src/test/java/org/jitsi/dnssec/TestBase.java b/src/test/java/org/jitsi/dnssec/TestBase.java
index 2352935..9caf608 100644
--- a/src/test/java/org/jitsi/dnssec/TestBase.java
+++ b/src/test/java/org/jitsi/dnssec/TestBase.java
@@ -21,12 +21,8 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import java.util.logging.LogManager;
-import org.apache.log4j.Appender;
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
import org.jitsi.dnssec.validator.ValidatingResolver;
import org.joda.time.DateTime;
import org.joda.time.format.ISODateTimeFormat;
@@ -65,13 +61,12 @@ private final static boolean record = Boolean.getBoolean("org.jitsi.dnssecjava.r
protected ValidatingResolver resolver;
protected String testName;
- {
- Logger root = Logger.getRootLogger();
- if (root.getAppender("junit") == null) {
- root.setLevel(Level.ALL);
- Appender junit = new ConsoleAppender(new PatternLayout("%r %c{2}.%M.%L - %m%n"));
- junit.setName("junit");
- root.addAppender(junit);
+ static {
+ try {
+ LogManager.getLogManager().readConfiguration(TestBase.class.getResourceAsStream("logging.properties"));
+ }
+ catch (Exception e) {
+ throw new RuntimeException(e);
}
}
diff --git a/src/test/resources/org/jitsi/dnssec/logging.properties b/src/test/resources/org/jitsi/dnssec/logging.properties
new file mode 100644
index 0000000..60e297f
--- /dev/null
+++ b/src/test/resources/org/jitsi/dnssec/logging.properties
@@ -0,0 +1,5 @@
+# java.util.logging configuration
+
+handlers = java.util.logging.ConsoleHandler
+java.util.logging.ConsoleHandler.level = ALL
+.level = ALL