Need to use our own jars for optional build dependencies

Author: jeffgbutler

eclipse/org.mybatis.generator.core/META-INF/MANIFEST.MF

@@ -45,8 +45,3 @@ Export-Package: org.mybatis.generator.ant,
  org.mybatis.generator.runtime.kotlin,
  org.mybatis.generator.runtime.kotlin.elements
 Automatic-Module-Name: org.mybatis.generator.core
-Import-Package: org.apache.commons.logging;version="1.2.0";resolution:=optional,
- org.apache.tools.ant;version="1.10.10";resolution:=optional,
- org.apache.tools.ant.types;version="1.10.10";resolution:=optional,
- org.slf4j;version="1.7.30";resolution:=optional,
- org.slf4j.spi;version="1.7.30";resolution:=optional

eclipse/org.mybatis.generator.core/build.properties

@@ -26,4 +26,7 @@ src.includes = LICENSE,\
                NOTICE\
 
 customBuildCallbacks=customBuildCallbacks.xml
-jars.extra.classpath = lib/log4j-api-2.19.0.jar
+jars.extra.classpath = lib/log4j-api-2.19.0.jar,\
+                       lib/slf4j-api-2.0.6.jar,\
+                       lib/commons-logging-1.2.jar,\
+                       lib/ant-1.10.13.jar

eclipse/org.mybatis.generator.core/lib/ant-1.10.13.jar

@@ -30,7 +30,4 @@ Export-Package: org.mybatis.generator.eclipse.ui,
  org.mybatis.generator.eclipse.ui.launcher,
  org.mybatis.generator.eclipse.ui.launcher.tabs,
  org.mybatis.generator.eclipse.ui.wizards
-Import-Package: org.apache.commons.logging;version="1.2.0";resolution:=optional,
- org.slf4j;version="1.7.30";resolution:=optional,
- org.slf4j.spi;version="1.7.30";resolution:=optional
 Automatic-Module-Name: org.mybatis.generator.eclipse.ui

eclipse/org.mybatis.generator.core/lib/commons-logging-1.2.jar

@@ -40,10 +40,10 @@
 import org.mybatis.generator.eclipse.core.callback.EclipseProgressCallback;
 import org.mybatis.generator.eclipse.core.callback.EclipseShellCallback;
 import org.mybatis.generator.eclipse.ui.ant.logging.AntLogFactory;
-import org.mybatis.generator.eclipse.ui.ant.logging.LogException;
 import org.mybatis.generator.exception.InvalidConfigurationException;
 import org.mybatis.generator.exception.XMLParserException;
 import org.mybatis.generator.internal.util.StringUtility;
+import org.mybatis.generator.logging.LogException;
 import org.mybatis.generator.logging.LogFactory;
 
 /**

eclipse/org.mybatis.generator.core/lib/slf4j-api-2.0.6.jar

@@ -20,11 +20,13 @@
 
 import org.mybatis.generator.eclipse.ui.ant.logging.commons.JakartaCommonsLoggingLogFactory;
 import org.mybatis.generator.eclipse.ui.ant.logging.log4j2.Log4j2LoggingLogFactory;
-import org.mybatis.generator.eclipse.ui.ant.logging.slf4j.Slf4jLoggingLogFactory;
+import org.mybatis.generator.eclipse.ui.launcher.tabs.LoggingButtonData;
 import org.mybatis.generator.logging.AbstractLogFactory;
 import org.mybatis.generator.logging.Log;
+import org.mybatis.generator.logging.LogException;
 import org.mybatis.generator.logging.jdk14.Jdk14LoggingLogFactory;
 import org.mybatis.generator.logging.nologging.NoLoggingLogFactory;
+import org.mybatis.generator.logging.slf4j.Slf4jLoggingLogFactory;
 
 /**
  * Factory for creating loggers
@@ -39,13 +41,13 @@ public AntLogFactory(String loggingImplementation) throws LogException {
         if (loggingImplementation == null || loggingImplementation.length() == 0) {
             calculateDefaultImplementation();
         } else {
-            if ("SLF4J".equals(loggingImplementation)) { //$NON-NLS-1$
+            if (LoggingButtonData.SLF4J.name().equals(loggingImplementation)) {
                 setImplementation(new Slf4jLoggingLogFactory());
-            } else if ("COMMONS_LOGGING".equals(loggingImplementation)) { //$NON-NLS-1$
+            } else if (LoggingButtonData.COMMONS_LOGGING.name().equals(loggingImplementation)) {
                 setImplementation(new JakartaCommonsLoggingLogFactory());
-            } else if ("LOG4J2".equals(loggingImplementation)) { //$NON-NLS-1$
+            } else if (LoggingButtonData.LOG4J2.name().equals(loggingImplementation)) {
                 setImplementation(new Log4j2LoggingLogFactory());
-            } else if ("JDK".equals(loggingImplementation)) { //$NON-NLS-1$
+            } else if (LoggingButtonData.JDK.name().equals(loggingImplementation)) {
                 setImplementation(new Jdk14LoggingLogFactory());
             } else {
                 setImplementation(new NoLoggingLogFactory());

eclipse/org.mybatis.generator.eclipse.ui/META-INF/MANIFEST.MF

@@ -32,5 +32,7 @@ src.includes = LICENSE,\
                NOTICE,\
                icons/
 source.lib/antsupport.jar = antsrc/
-jars.extra.classpath = platform:/plugin/org.mybatis.generator.core/lib/log4j-api-2.19.0.jar
+jars.extra.classpath = platform:/plugin/org.mybatis.generator.core/lib/log4j-api-2.19.0.jar,\
+                       platform:/plugin/org.mybatis.generator.core/lib/slf4j-api-2.0.6.jar,\
+                       platform:/plugin/org.mybatis.generator.core/lib/commons-logging-1.2.jar