svn commit: r1906718 - in /pig/trunk: CHANGES.txt build.xml ivy.xml ivy/libraries.properties

[ro...@apache.org]

Author: rohini
Date: Tue Jan 17 00:53:44 2023
New Revision: 1906718

URL: http://svn.apache.org/viewvc?rev=1906718&view=rev
Log:
PIG-5434: Migrate from log4j to reload4j (rohini)

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/build.xml
    pig/trunk/ivy.xml
    pig/trunk/ivy/libraries.properties

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1906718&r1=1906717&r2=1906718&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Tue Jan 17 00:53:44 2023
@@ -26,6 +26,8 @@ PIG-5282: Upgade to Java 8 (satishsaley
  
 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)

Modified: pig/trunk/build.xml
URL: http://svn.apache.org/viewvc/pig/trunk/build.xml?rev=1906718&r1=1906717&r2=1906718&view=diff
==============================================================================
--- pig/trunk/build.xml (original)
+++ pig/trunk/build.xml Tue Jan 17 00:53:44 2023
@@ -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"/>

Modified: pig/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/pig/trunk/ivy.xml?rev=1906718&r1=1906717&r2=1906718&view=diff
==============================================================================
--- pig/trunk/ivy.xml (original)
+++ pig/trunk/ivy.xml Tue Jan 17 00:53:44 2023
@@ -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"/>

Modified: pig/trunk/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/pig/trunk/ivy/libraries.properties?rev=1906718&r1=1906717&r2=1906718&view=diff
==============================================================================
--- pig/trunk/ivy/libraries.properties (original)
+++ pig/trunk/ivy/libraries.properties Tue Jan 17 00:53:44 2023
@@ -62,10 +62,10 @@ kryo.version=3.0.3
 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