[avro] branch branch-1.11 updated: AVRO-3304: Drop-in reload4j to mitigate log4j 1.x (#1464)

[mgrigorov]

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

mgrigorov pushed a commit to branch branch-1.11
in repository https://gitbox.apache.org/repos/asf/avro.git


The following commit(s) were added to refs/heads/branch-1.11 by this push:
     new 742a767  AVRO-3304: Drop-in reload4j to  mitigate log4j 1.x (#1464)
742a767 is described below

commit 742a7679ec2845ac746469fe5a96f4e8963de56a
Author: Ryan Skraba <r...@skraba.com>
AuthorDate: Wed Jan 19 12:36:02 2022 +0100

    AVRO-3304: Drop-in reload4j to  mitigate log4j 1.x (#1464)
    
    (cherry picked from commit bd4e91ac09d2dc6cc25e2369697dde57fb3ad2a8)
---
 lang/java/pom.xml       |  1 +
 lang/java/tools/pom.xml | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/lang/java/pom.xml b/lang/java/pom.xml
index 20fff49..2926f0d 100644
--- a/lang/java/pom.xml
+++ b/lang/java/pom.xml
@@ -47,6 +47,7 @@
     <protobuf.version>3.19.1</protobuf.version>
     <thrift.version>0.15.0</thrift.version>
     <slf4j.version>1.7.32</slf4j.version>
+    <reload4j.version>1.2.18.0</reload4j.version>
     <snappy.version>1.1.8.4</snappy.version>
     <velocity.version>2.3</velocity.version>
     <maven.version>3.8.4</maven.version>
diff --git a/lang/java/tools/pom.xml b/lang/java/tools/pom.xml
index bd888c2..b5d9ff2 100644
--- a/lang/java/tools/pom.xml
+++ b/lang/java/tools/pom.xml
@@ -272,6 +272,18 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
       <version>${slf4j.version}</version>
+      <!-- AVRO-3304: Drop-in reload4j replacement while waiting for 
downstream to bump log4j -->
+      <exclusions>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.reload4j</groupId>
+      <artifactId>reload4j</artifactId>
+      <version>${reload4j.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
@@ -302,6 +314,11 @@
           <groupId>org.apache.curator</groupId>
           <artifactId>curator-client</artifactId>
         </exclusion>
+        <!-- AVRO-3304: Drop-in reload4j replacement while waiting for 
downstream to bump log4j -->
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>