mybatis · jeffgbutler · Nov 29, 2021 · Nov 29, 2021 · Nov 29, 2021
diff --git 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.
@@ -164,12 +164,6 @@
   </build>
 
   <dependencies>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>provided</scope>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>

diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/LogFactory.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/LogFactory.java
@@ -1,5 +1,5 @@
 /*
- *    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.
@@ -19,7 +19,6 @@
 
 import org.mybatis.generator.logging.commons.JakartaCommonsLoggingLogFactory;
 import org.mybatis.generator.logging.jdk14.Jdk14LoggingLogFactory;
-import org.mybatis.generator.logging.log4j.Log4jLoggingLogFactory;
 import org.mybatis.generator.logging.log4j2.Log4j2LoggingLogFactory;
 import org.mybatis.generator.logging.nologging.NoLoggingLogFactory;
 import org.mybatis.generator.logging.slf4j.Slf4jLoggingLogFactory;
@@ -38,7 +37,6 @@ public class LogFactory {
         tryImplementation(new Slf4jLoggingLogFactory());
         tryImplementation(new JakartaCommonsLoggingLogFactory());
         tryImplementation(new Log4j2LoggingLogFactory());
-        tryImplementation(new Log4jLoggingLogFactory());
         tryImplementation(new Jdk14LoggingLogFactory());
         tryImplementation(new NoLoggingLogFactory());
     }
@@ -74,10 +72,6 @@ public static synchronized void forceCommonsLogging() {
         setImplementation(new JakartaCommonsLoggingLogFactory());
     }
 
-    public static synchronized void forceLog4jLogging() {
-        setImplementation(new Log4jLoggingLogFactory());
-    }
-
     public static synchronized void forceLog4j2Logging() {
         setImplementation(new Log4j2LoggingLogFactory());
     }

diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/log4j/Log4jImpl.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/log4j/Log4jImpl.java
diff --git a/...erator-core/src/main/java/org/mybatis/generator/logging/log4j/Log4jLoggingLogFactory.java b/...erator-core/src/main/java/org/mybatis/generator/logging/log4j/Log4jLoggingLogFactory.java
diff --git a/core/mybatis-generator-core/src/site/xhtml/whatsNew.xhtml b/core/mybatis-generator-core/src/site/xhtml/whatsNew.xhtml
@@ -112,6 +112,7 @@ required:</p>
     <li>Removed the deprecated MyBatis3DynamicSqlV1 runtime</li>
     <li>Removed the Java client property "useLegacyBuilder" as it created code that has been deprecated
     in MyBatis since version 3.2</li>
+    <li>Removed support for Log4J version 1.x</li>
 </ul>
 
 <h2>Version 1.4.0</h2>

diff --git a/core/pom.xml b/core/pom.xml
@@ -180,11 +180,6 @@
 
   <dependencyManagement>
     <dependencies>
-      <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <version>1.2.17</version>
-      </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>

diff --git a/eclipse/org.mybatis.generator.core/META-INF/MANIFEST.MF b/eclipse/org.mybatis.generator.core/META-INF/MANIFEST.MF
@@ -35,7 +35,6 @@ Export-Package: org.mybatis.generator.ant,
  org.mybatis.generator.logging,
  org.mybatis.generator.logging.commons,
  org.mybatis.generator.logging.jdk14,
- org.mybatis.generator.logging.log4j,
  org.mybatis.generator.logging.log4j2,
  org.mybatis.generator.logging.nologging,
  org.mybatis.generator.logging.slf4j,

diff --git a/eclipse/org.mybatis.generator.core/build.properties b/eclipse/org.mybatis.generator.core/build.properties
@@ -9,7 +9,6 @@ src.includes = LICENSE,\
                NOTICE\
 
 customBuildCallbacks=customBuildCallbacks.xml
-jars.extra.classpath = lib/log4j-1.2.17.jar,\
-                       lib/commons-logging-1.2.jar,\
+jars.extra.classpath = lib/commons-logging-1.2.jar,\
                        lib/log4j-api-2.12.1.jar,\
                        lib/slf4j-api-1.7.28.jar
diff --git a/eclipse/org.mybatis.generator.core/lib/log4j-1.2.17.jar b/eclipse/org.mybatis.generator.core/lib/log4j-1.2.17.jar
diff --git a/eclipse/org.mybatis.generator.eclipse.doc/html-src/eclipseui/releasenotes.html b/eclipse/org.mybatis.generator.eclipse.doc/html-src/eclipseui/releasenotes.html
@@ -8,6 +8,11 @@
 </head>
 <body>
 <h1>MyBatis Generator Eclipse Feature Release Notes</h1>
+<h2>Version 1.4.1</h2>
+<ul>
+  <li>Removed Log4J Version 1.x support in the Ant logger configuration.</li>
+</ul>
+
 <h2>Version 1.4.0</h2>
 <ul>
   <li>Added an environment tab to the launch configuration where properties can be set. Properties set on this tab will be available

diff --git a/eclipse/org.mybatis.generator.eclipse.doc/html-src/eclipseui/usingAnt.html b/eclipse/org.mybatis.generator.eclipse.doc/html-src/eclipseui/usingAnt.html
@@ -97,7 +97,6 @@ <h2>Integrated Ant Task Detail</h2>
         <li>SLF4J</li>
         <li>COMMONS_LOGGING</li>
         <li>LOG4J2</li>
-        <li>LOG4J</li>
         <li>JDK</li>
       </ol>
       <p>If you don't specify a value, the task will search for an implementation in the order

diff --git a/...nerator.eclipse.ui/antsrc/org/mybatis/generator/eclipse/ui/ant/logging/AntLogFactory.java b/...nerator.eclipse.ui/antsrc/org/mybatis/generator/eclipse/ui/ant/logging/AntLogFactory.java
@@ -18,7 +18,6 @@
 import static org.mybatis.generator.internal.util.messages.Messages.getString;
 
 import org.mybatis.generator.eclipse.ui.ant.logging.commons.JakartaCommonsLoggingLogFactory;
-import org.mybatis.generator.eclipse.ui.ant.logging.log4j.Log4jLoggingLogFactory;
 import org.mybatis.generator.eclipse.ui.ant.logging.log4j2.Log4j2LoggingLogFactory;
 import org.mybatis.generator.eclipse.ui.ant.logging.slf4j.Slf4jLoggingLogFactory;
 import org.mybatis.generator.logging.AbstractLogFactory;
@@ -45,8 +44,6 @@ public AntLogFactory(String loggingImplementation) throws LogException {
                 setImplementation(new JakartaCommonsLoggingLogFactory());
             } else if ("LOG4J2".equals(loggingImplementation)) { //$NON-NLS-1$
                 setImplementation(new Log4j2LoggingLogFactory());
-            } else if ("LOG4J".equals(loggingImplementation)) { //$NON-NLS-1$
-                setImplementation(new Log4jLoggingLogFactory());
             } else if ("JDK".equals(loggingImplementation)) { //$NON-NLS-1$
                 setImplementation(new Jdk14LoggingLogFactory());
             } else {
@@ -59,7 +56,6 @@ private void calculateDefaultImplementation() {
         tryImplementation(new Slf4jLoggingLogFactory());
         tryImplementation(new JakartaCommonsLoggingLogFactory());
         tryImplementation(new Log4j2LoggingLogFactory());
-        tryImplementation(new Log4jLoggingLogFactory());
         tryImplementation(new Jdk14LoggingLogFactory());
         tryImplementation(new NoLoggingLogFactory());
     }

diff --git a/...rator.eclipse.ui/antsrc/org/mybatis/generator/eclipse/ui/ant/logging/log4j/Log4jImpl.java b/...rator.eclipse.ui/antsrc/org/mybatis/generator/eclipse/ui/ant/logging/log4j/Log4jImpl.java
diff --git a/....ui/antsrc/org/mybatis/generator/eclipse/ui/ant/logging/log4j/Log4jLoggingLogFactory.java b/....ui/antsrc/org/mybatis/generator/eclipse/ui/ant/logging/log4j/Log4jLoggingLogFactory.java
diff --git a/eclipse/org.mybatis.generator.eclipse.ui/build.properties b/eclipse/org.mybatis.generator.eclipse.ui/build.properties
@@ -16,7 +16,6 @@ src.includes = LICENSE,\
                icons/
 source.lib/antsupport.jar = antsrc/
 jars.extra.classpath = platform:/plugin/org.mybatis.generator.core/lib/commons-logging-1.2.jar,\
-                       platform:/plugin/org.mybatis.generator.core/lib/log4j-1.2.17.jar,\
                        platform:/plugin/org.mybatis.generator.core/lib/log4j-api-2.12.1.jar,\
                        platform:/plugin/org.mybatis.generator.core/lib/slf4j-api-1.7.28.jar