From 8ce351c74dac145f5034829e4d8ae4491b2d2e9d Mon Sep 17 00:00:00 2001
From: Lee Dongjin <dongjin@apache.org>
Date: Wed, 17 Mar 2021 14:14:11 +0900
Subject: [PATCH 1/2] Remove redundant allows in import-control.xml

1. Remove org.apache.log4j from allowed import list of shell, trogdor subpackage; they uses slf4j, not log4.
2. Remove org.slf4j from allowed import list of clients, server subpackage: org.slf4j is allowed globally.
---
 checkstyle/import-control.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/checkstyle/import-control.xml b/checkstyle/import-control.xml
index d9d504db178c5..1e3aa574d03b8 100644
--- a/checkstyle/import-control.xml
+++ b/checkstyle/import-control.xml
@@ -244,7 +244,6 @@
   </subpackage>
 
   <subpackage name="clients">
-    <allow pkg="org.slf4j" />
     <allow pkg="org.apache.kafka.common" />
     <allow pkg="org.apache.kafka.clients" exact-match="true"/>
     <allow pkg="org.apache.kafka.test" />
@@ -266,7 +265,6 @@
   </subpackage>
 
   <subpackage name="server">
-    <allow pkg="org.slf4j" />
     <allow pkg="org.apache.kafka.common" />
     <allow pkg="org.apache.kafka.test" />
   </subpackage>
@@ -283,7 +281,6 @@
     <allow pkg="org.apache.kafka.queue"/>
     <allow pkg="org.apache.kafka.raft"/>
     <allow pkg="org.apache.kafka.shell"/>
-    <allow pkg="org.apache.log4j" />
     <allow pkg="org.jline"/>
     <allow pkg="scala.compat"/>
   </subpackage>
@@ -310,7 +307,6 @@
     <allow pkg="org.apache.kafka.common" />
     <allow pkg="org.apache.kafka.test"/>
     <allow pkg="org.apache.kafka.trogdor" />
-    <allow pkg="org.apache.log4j" />
     <allow pkg="org.eclipse.jetty" />
     <allow pkg="org.glassfish.jersey" />
   </subpackage>

From 045c72cf9c0149031b4d4eea8a607ef9238d01e3 Mon Sep 17 00:00:00 2001
From: Lee Dongjin <dongjin@apache.org>
Date: Wed, 17 Mar 2021 16:09:19 +0900
Subject: [PATCH 2/2] Remove org.apache.log4j from streams subpackage's allowed
 import list

---
 checkstyle/import-control.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/checkstyle/import-control.xml b/checkstyle/import-control.xml
index 1e3aa574d03b8..5597df8ab0170 100644
--- a/checkstyle/import-control.xml
+++ b/checkstyle/import-control.xml
@@ -369,7 +369,6 @@
         <allow pkg="com.fasterxml.jackson" />
         <allow pkg="kafka.utils" />
         <allow pkg="org.apache.zookeeper" />
-        <allow pkg="org.apache.log4j" />
         <subpackage name="testutil">
           <allow pkg="org.apache.log4j" />
         </subpackage>