PHOENIX-6636 Replace bundled log4j libraries with reload4j

apache · Jan 31, 2022 · 4c26eaa · 4c26eaa
1 parent faa5da8
commit 4c26eaa
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 16 deletions.
diff --git a/phoenix-assembly/src/build/package-to-tar-all.xml b/phoenix-assembly/src/build/package-to-tar-all.xml
@@ -36,7 +36,7 @@
       <unpack>false</unpack>
       <outputDirectory>/lib</outputDirectory>
       <includes>
-        <include>org.slf4j:slf4j-log4j12</include>
+        <include>org.slf4j:slf4j-reload4j</include>
       </includes>
     </dependencySet>
   </dependencySets>

diff --git a/phoenix-client-parent/phoenix-client-embedded/pom.xml b/phoenix-client-parent/phoenix-client-embedded/pom.xml
@@ -70,10 +70,23 @@
       <groupId>org.apache.phoenix</groupId>
       <artifactId>phoenix-core</artifactId>
       <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-reload4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>ch.qos.reload4j</groupId>
+          <artifactId>reload4j</artifactId>
+        </exclusion>
+        <!-- These are coming from transitive dependencies -->
         <exclusion>
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-log4j12</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>

diff --git a/phoenix-client-parent/phoenix-client/pom.xml b/phoenix-client-parent/phoenix-client/pom.xml
@@ -77,12 +77,12 @@
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
+      <artifactId>slf4j-reload4j</artifactId>
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
+      <groupId>ch.qos.reload4j</groupId>
+      <artifactId>reload4j</artifactId>
       <scope>runtime</scope>
     </dependency>
     <dependency>

diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
@@ -194,7 +194,7 @@
               <artifactItems>
                 <artifactItem>
                   <groupId>org.slf4j</groupId>
-                  <artifactId>slf4j-log4j12</artifactId>
+                  <artifactId>slf4j-reload4j</artifactId>
                 </artifactItem>
                 <artifactItem>
                   <groupId>sqlline</groupId>

diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
@@ -117,8 +117,10 @@
                         <exclude>org.apache.phoenix:phoenix-server</exclude>
                         <exclude>sqlline:sqlline</exclude>
                         <exclude>log4j:log4j</exclude>
+                        <exclude>ch.qos.reload4j:reload4j</exclude>
                         <exclude>org.slf4j:slf4j-api</exclude>
                         <exclude>org.slf4j:slf4j-log4j12</exclude>
+                        <exclude>org.slf4j:slf4j-reload4j</exclude>
                     </excludes>
                 </artifactSet>
                 <filters>

diff --git a/phoenix-tracing-webapp/pom.xml b/phoenix-tracing-webapp/pom.xml
@@ -62,8 +62,8 @@
         <artifactId>slf4j-api</artifactId>
       </dependency>
       <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
+        <groupId>ch.qos.reload4j</groupId>
+        <artifactId>reload4j</artifactId>
         <scope>compile</scope>
       </dependency>
       <dependency>

diff --git a/pom.xml b/pom.xml
@@ -99,9 +99,9 @@
     <!-- Dependency versions -->
     <jackson.version>2.12.4</jackson.version>
     <antlr.version>3.5.2</antlr.version>
-    <log4j.version>1.2.17</log4j.version>
+    <reload4j.version>1.2.18.3</reload4j.version>
     <disruptor.version>3.3.6</disruptor.version>
-    <slf4j.version>1.7.25</slf4j.version>
+    <slf4j.version>1.7.35</slf4j.version>
     <!-- com.google repo will be used except on Aarch64 platform. -->
     <protobuf.group>com.google.protobuf</protobuf.group>
     <protobuf-java.version>2.5.0</protobuf-java.version>
@@ -373,7 +373,7 @@
                   org.apache.omid:omid-timestamp-storage-hbase2.x
                 </ignoredUnusedDeclaredDependency>
                 <ignoredUnusedDeclaredDependency>
-                  org.slf4j:slf4j-log4j12
+                  org.slf4j:slf4j-reload4j
                 </ignoredUnusedDeclaredDependency>
                 <ignoredUnusedDeclaredDependency>
                   org.apache.hbase:hbase-testing-util
@@ -1482,15 +1482,15 @@
       </dependency>
 
        <!-- Runtime dependencies -->
-       <dependency>
-         <groupId>log4j</groupId>
-         <artifactId>log4j</artifactId>
-         <version>${log4j.version}</version>
-         <scope>runtime</scope>
+      <dependency>
+        <groupId>ch.qos.reload4j</groupId>
+        <artifactId>reload4j</artifactId>
+        <version>${reload4j.version}</version>
+        <scope>runtime</scope>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-log4j12</artifactId>
+        <artifactId>slf4j-reload4j</artifactId>
         <version>${slf4j.version}</version>
         <scope>runtime</scope>
       </dependency>