diff --git a/pom.xml b/pom.xml
index fa7ad3f..36d0605 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,11 +25,11 @@
2.8.0
4.13.2
2.7.3
- 1.2.17
+ 2.23.1
2.0.2-beta
1.3.0
1.2.0
- 11.4
+ 12.4
4.14.1
2.0.4
4.0.0.RELEASE
@@ -77,6 +77,19 @@
webmagic-coverage
+
+
+ org.apache.logging.log4j
+ log4j-core
+ test
+
+
+ org.apache.logging.log4j
+ log4j-slf4j2-impl
+ test
+
+
+
@@ -101,6 +114,16 @@
httpcore
${httpcore.version}
+
+ org.apache.logging.log4j
+ log4j-core
+ ${log4j2.version}
+
+
+ org.apache.logging.log4j
+ log4j-slf4j2-impl
+ ${log4j2.version}
+
com.google.guava
guava
@@ -116,11 +139,6 @@
slf4j-api
${slf4j.version}
-
- org.slf4j
- slf4j-log4j12
- ${slf4j.version}
-
us.codecraft
xsoup
@@ -143,11 +161,6 @@
-
- log4j
- log4j
- ${log4j.version}
-
org.assertj
assertj-core
@@ -274,11 +287,6 @@
org.apache.maven.plugins
maven-jar-plugin
-
-
- log4j.xml
-
-
org.apache.maven.plugins
diff --git a/webmagic-core/pom.xml b/webmagic-core/pom.xml
index 98e513c..37f1d00 100644
--- a/webmagic-core/pom.xml
+++ b/webmagic-core/pom.xml
@@ -45,12 +45,6 @@
mockito-all
-
- org.slf4j
- slf4j-log4j12
- true
-
-
org.apache.commons
commons-collections4
diff --git a/webmagic-core/src/main/resources/log4j.xml b/webmagic-core/src/main/resources/log4j.xml
deleted file mode 100644
index c2b5a2f..0000000
--- a/webmagic-core/src/main/resources/log4j.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/webmagic-core/src/test/resources/log4j.xml b/webmagic-core/src/test/resources/log4j.xml
deleted file mode 100644
index c2b5a2f..0000000
--- a/webmagic-core/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/webmagic-core/src/test/resources/log4j2-test.xml b/webmagic-core/src/test/resources/log4j2-test.xml
new file mode 100644
index 0000000..86aee5f
--- /dev/null
+++ b/webmagic-core/src/test/resources/log4j2-test.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/webmagic-extension/src/main/resources/log4j.xml b/webmagic-extension/src/main/resources/log4j.xml
deleted file mode 100644
index c2b5a2f..0000000
--- a/webmagic-extension/src/main/resources/log4j.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/webmagic-extension/src/test/resources/log4j.xml b/webmagic-extension/src/test/resources/log4j.xml
deleted file mode 100644
index c2b5a2f..0000000
--- a/webmagic-extension/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/webmagic-extension/src/test/resources/log4j2-test.xml b/webmagic-extension/src/test/resources/log4j2-test.xml
new file mode 100644
index 0000000..86aee5f
--- /dev/null
+++ b/webmagic-extension/src/test/resources/log4j2-test.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/webmagic-samples/src/main/resources/log4j.xml b/webmagic-samples/src/main/resources/log4j.xml
deleted file mode 100644
index a6630f8..0000000
--- a/webmagic-samples/src/main/resources/log4j.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/webmagic-samples/src/main/resources/log4j2.xml b/webmagic-samples/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..f3bad53
--- /dev/null
+++ b/webmagic-samples/src/main/resources/log4j2.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/webmagic-scripts/pom.xml b/webmagic-scripts/pom.xml
index 02d4400..243eb82 100644
--- a/webmagic-scripts/pom.xml
+++ b/webmagic-scripts/pom.xml
@@ -13,6 +13,14 @@
+
+ org.apache.logging.log4j
+ log4j-core
+
+
+ org.apache.logging.log4j
+ log4j-slf4j2-impl
+
org.jruby
jruby
@@ -40,10 +48,6 @@
webmagic-core
${project.version}
-
- org.slf4j
- slf4j-log4j12
-
${project.groupId}
webmagic-extension
diff --git a/webmagic-scripts/src/main/java/us/codecraft/webmagic/scripts/ScriptConsole.java b/webmagic-scripts/src/main/java/us/codecraft/webmagic/scripts/ScriptConsole.java
index 0423e58..2ccfe7f 100755
--- a/webmagic-scripts/src/main/java/us/codecraft/webmagic/scripts/ScriptConsole.java
+++ b/webmagic-scripts/src/main/java/us/codecraft/webmagic/scripts/ScriptConsole.java
@@ -1,8 +1,10 @@
package us.codecraft.webmagic.scripts;
import org.apache.commons.cli.*;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.core.Logger;
+import org.slf4j.LoggerFactory;
+
import us.codecraft.webmagic.ResultItems;
import us.codecraft.webmagic.Spider;
import us.codecraft.webmagic.Task;
@@ -166,7 +168,7 @@ public class ScriptConsole {
}
private static void configLogger(String value) {
- Logger rootLogger = Logger.getRootLogger();
+ Logger rootLogger = (Logger) LoggerFactory.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME);
if ("debug".equalsIgnoreCase(value)) {
rootLogger.setLevel(Level.DEBUG);
} else if ("info".equalsIgnoreCase(value)) {
diff --git a/webmagic-scripts/src/main/resources/log4j.xml b/webmagic-scripts/src/main/resources/log4j.xml
deleted file mode 100755
index 474269c..0000000
--- a/webmagic-scripts/src/main/resources/log4j.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/webmagic-scripts/src/test/resouces/log4j.xml b/webmagic-scripts/src/test/resouces/log4j.xml
deleted file mode 100755
index 1f64d8d..0000000
--- a/webmagic-scripts/src/test/resouces/log4j.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/webmagic-scripts/src/test/resources/log4j2-test.xml b/webmagic-scripts/src/test/resources/log4j2-test.xml
new file mode 100644
index 0000000..e2fab66
--- /dev/null
+++ b/webmagic-scripts/src/test/resources/log4j2-test.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+