PIG-5434: Migrate from log4j to reload4j (rohini)
git-svn-id: https://svn.apache.org/repos/asf/pig/trunk@1906718 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 20cb3fc..82f8bf9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -26,6 +26,8 @@
IMPROVEMENTS
+PIG-5434: Migrate from log4j to reload4j (rohini)
+
PIG-5417: Replace guava's Files.createTempDir() (xiaoheipangzi via rohini)
PIG-5429: Update hbase version from 2.0.0 to 2.4.14 (knoguchi)
diff --git a/build.xml b/build.xml
index fc36d82..602ef21 100644
--- a/build.xml
+++ b/build.xml
@@ -794,7 +794,7 @@
<fileset dir="${ivy.lib.dir}" includes="commons-io-*.jar"/>
<fileset dir="${ivy.lib.dir}" includes="commons-logging-*.jar"/>
<fileset dir="${ivy.lib.dir}" includes="httpcore-*.jar"/>
- <fileset dir="${ivy.lib.dir}" includes="log4j-*.jar"/>
+ <fileset dir="${ivy.lib.dir}" includes="reload4j-*.jar"/>
<fileset dir="${ivy.lib.dir}" includes="slf4j-*.jar"/>
</copy>
</target>
@@ -826,7 +826,7 @@
<fileset dir="${ivy.lib.dir}" includes="commons-logging-*.jar"/>
<fileset dir="${ivy.lib.dir}" includes="httpclient-*.jar"/>
<fileset dir="${ivy.lib.dir}" includes="httpcore-*.jar"/>
- <fileset dir="${ivy.lib.dir}" includes="log4j-*.jar"/>
+ <fileset dir="${ivy.lib.dir}" includes="reload4j-*.jar"/>
<fileset dir="${ivy.lib.dir}" includes="slf4j-*.jar"/>
<fileset dir="${ivy.lib.dir}" includes="re2j-*.jar"/>
<fileset dir="${ivy.lib.dir}" includes="woodstox-core-*.jar"/>
diff --git a/ivy.xml b/ivy.xml
index 997c8c3..53a7e15 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -106,8 +106,6 @@
conf="hadoop2->master;hadoop3->master"/>
<dependency org="org.glassfish" name="javax.el" rev="${glassfish.el.version}"
conf="hadoop2->master;hadoop3->master"/>
- <dependency org="log4j" name="log4j" rev="${log4j.version}"
- conf="compile->master"/>
<dependency org="com.google.re2j" name="re2j" rev="${re2j.version}"
conf="hadoop3->master" />
<dependency org="com.codahale.metrics" name="metrics-core" rev="${codahale.metrics-core.version}"
@@ -183,7 +181,9 @@
<dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
conf="compile->master;checkstyle->master"/>
- <dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j-log4j12.version}"
+ <dependency org="org.slf4j" name="slf4j-reload4j" rev="${slf4j-reload4j.version}"
+ conf="compile->master;test->master"/>
+ <dependency org="ch.qos.reload4j" name="reload4j" rev="${reload4j.version}"
conf="compile->master;test->master"/>
<dependency org="commons-cli" name="commons-cli" rev="${commons-cli.version}"
conf="compile->master;checkstyle->master"/>
diff --git a/ivy/libraries.properties b/ivy/libraries.properties
index 1cde6b7..4468b27 100644
--- a/ivy/libraries.properties
+++ b/ivy/libraries.properties
@@ -62,10 +62,10 @@
rhino.version=1.7R2
antlr.version=3.4
stringtemplate.version=4.0.4
-log4j.version=1.2.16
rats-lib.version=0.5.1
-slf4j-api.version=1.6.1
-slf4j-log4j12.version=1.6.1
+slf4j-api.version=1.7.36
+slf4j-reload4j.version=1.7.36
+reload4j.version=1.2.24
spark1.version=1.6.1
spark2.version=2.4.8
xerces.version=2.10.0
