You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ps...@apache.org on 2023/05/31 08:25:38 UTC

[hbase-filesystem] branch master updated: Revert "HBASE-27884 Use log4j2 instead of log4j for logging (#37)" (#38)

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

psomogyi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase-filesystem.git


The following commit(s) were added to refs/heads/master by this push:
     new 38963e0  Revert "HBASE-27884 Use log4j2 instead of log4j for logging (#37)" (#38)
38963e0 is described below

commit 38963e0bfa9194aa5cfe1051bda51f4a86f7fe83
Author: Peter Somogyi <ps...@apache.org>
AuthorDate: Wed May 31 10:25:32 2023 +0200

    Revert "HBASE-27884 Use log4j2 instead of log4j for logging (#37)" (#38)
    
    This reverts commit 80574e2c8772ab42453bfbdeb4fefa5aec0a2442.
---
 hbase-oss/pom.xml | 24 +++---------------------
 pom.xml           |  4 ++--
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/hbase-oss/pom.xml b/hbase-oss/pom.xml
index 922728c..aaf8744 100644
--- a/hbase-oss/pom.xml
+++ b/hbase-oss/pom.xml
@@ -348,27 +348,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-api</artifactId>
-      <version>${log4j2.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-core</artifactId>
-      <version>${log4j2.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j-impl</artifactId>
-      <version>${log4j2.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-1.2-api</artifactId>
-      <version>${log4j2.version}</version>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j.version}</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index d3ff766..638419c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,10 +54,10 @@
     <enforcer.version>3.0.0-M3</enforcer.version>
     <extra.enforcer.version>1.2</extra.enforcer.version>
     <hadoop.version>3.3.2</hadoop.version>
-    <hbase.version>2.5.4</hbase.version>
+    <hbase.version>2.3.6</hbase.version>
     <hbase-thirdparty.version>3.5.1</hbase-thirdparty.version>
     <junit.version>4.12</junit.version>
-    <log4j2.version>2.17.2</log4j2.version>
+    <log4j.version>1.2.17</log4j.version>
     <slf4j.version>1.7.25</slf4j.version>
     <!-- Keep this in sync with the version of ZK
          that the corresponding HBase version is using. -->