From dffcda65bf42fe0e245dfff55de5ba94215ddf43 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Tue, 23 Nov 2021 20:29:39 -0500
Subject: [PATCH] [pom] Prefer slf4j over legacy (unsupported) logging and
 including log4j2

---
 core/mybatis-generator-core/pom.xml | 16 +++++++++++-----
 core/pom.xml                        | 17 +++++++++++------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/core/mybatis-generator-core/pom.xml b/core/mybatis-generator-core/pom.xml
index fa7efbbe8f..49b55d5488 100644
--- a/core/mybatis-generator-core/pom.xml
+++ b/core/mybatis-generator-core/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2006-2020 the original author or authors.
+       Copyright 2006-2021 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -165,8 +165,8 @@
   
   <dependencies>
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
@@ -183,8 +183,14 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-to-slf4j</artifactId>
+      <scope>provided</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
diff --git a/core/pom.xml b/core/pom.xml
index b86ef7a879..e84b4c4592 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -181,9 +181,9 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <version>1.2.17</version>
+        <groupId>org.slf4j</groupId>
+        <artifactId>log4j-over-slf4j</artifactId>
+        <version>1.7.32</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
@@ -196,9 +196,14 @@
         <version>2.14.1</version>
       </dependency>
       <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <version>1.2</version>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-to-slf4j</artifactId>
+        <version>2.14.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>jcl-over-slf4j</artifactId>
+        <version>1.7.32</version>
       </dependency>
       <dependency>
         <groupId>org.apache.ant</groupId>