Merge pull request #947 from jeffgbutler/update-eclipse-dependencies

jeffgbutler · web-flow · commit 8adb2b65c341 · 2023-01-10T17:31:25.000-05:00
Eclipse Build Updates
diff --git a/eclipse/.gitignore b/eclipse/.gitignore
@@ -1,2 +1,3 @@
 /target/
 .mvn/wrapper/maven-wrapper.jar
+**/.polyglot.*
diff --git a/eclipse/.mvn/extensions.xml b/eclipse/.mvn/extensions.xml
@@ -20,6 +20,6 @@
   <extension>
     <groupId>org.eclipse.tycho</groupId>
     <artifactId>tycho-build</artifactId>
-    <version>2.7.0</version>
+    <version>3.0.1</version>
   </extension>
 </extensions>
diff --git a/eclipse/org.mybatis.generator.core/.classpath b/eclipse/org.mybatis.generator.core/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/main/resources"/>
diff --git a/eclipse/org.mybatis.generator.core/.settings/org.eclipse.jdt.core.prefs b/eclipse/org.mybatis.generator.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,14 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/eclipse/org.mybatis.generator.core/META-INF/MANIFEST.MF b/eclipse/org.mybatis.generator.core/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: MyBatis Generator Core
 Bundle-SymbolicName: org.mybatis.generator.core
 Bundle-Version: 1.4.2.qualifier
 Bundle-Vendor: mybatis.org
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.mybatis.generator.ant,
  org.mybatis.generator.api,
  org.mybatis.generator.api.dom,
@@ -45,5 +45,8 @@ 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.tools.ant;version="1.10.5";resolution:=optional,
- org.apache.tools.ant.types;version="1.10.5";resolution:=optional
+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
diff --git a/eclipse/org.mybatis.generator.core/build.properties b/eclipse/org.mybatis.generator.core/build.properties
@@ -26,6 +26,4 @@ src.includes = LICENSE,\
                NOTICE\
 
 customBuildCallbacks=customBuildCallbacks.xml
-jars.extra.classpath = lib/commons-logging-1.2.jar,\
-                       lib/log4j-api-2.12.1.jar,\
-                       lib/slf4j-api-1.7.28.jar
+jars.extra.classpath = lib/log4j-api-2.19.0.jar
diff --git a/eclipse/org.mybatis.generator.core/lib/commons-logging-1.2.jar b/eclipse/org.mybatis.generator.core/lib/commons-logging-1.2.jar
diff --git a/eclipse/org.mybatis.generator.core/lib/log4j-api-2.12.1.jar b/eclipse/org.mybatis.generator.core/lib/log4j-api-2.12.1.jar
diff --git a/eclipse/org.mybatis.generator.core/lib/log4j-api-2.19.0.jar b/eclipse/org.mybatis.generator.core/lib/log4j-api-2.19.0.jar
diff --git a/eclipse/org.mybatis.generator.core/lib/slf4j-api-1.7.28.jar b/eclipse/org.mybatis.generator.core/lib/slf4j-api-1.7.28.jar
diff --git a/eclipse/org.mybatis.generator.eclipse.core.tests/.classpath b/eclipse/org.mybatis.generator.eclipse.core.tests/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src">
 		<attributes>
diff --git a/eclipse/org.mybatis.generator.eclipse.core.tests/.settings/org.eclipse.jdt.core.prefs b/eclipse/org.mybatis.generator.eclipse.core.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/eclipse/org.mybatis.generator.eclipse.core.tests/META-INF/MANIFEST.MF b/eclipse/org.mybatis.generator.eclipse.core.tests/META-INF/MANIFEST.MF
@@ -4,10 +4,10 @@ Bundle-Name: Tests for MyBatis Generator Eclipse Core Support
 Bundle-SymbolicName: org.mybatis.generator.eclipse.core.tests
 Bundle-Version: 1.4.2.qualifier
 Fragment-Host: org.mybatis.generator.eclipse.core;bundle-version="1.4.2"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.hamcrest.core;bundle-version="1.3.0",
- org.junit.jupiter.api;bundle-version="5.3.1",
- org.junit;bundle-version="4.12.0",
+ org.junit.jupiter.api;bundle-version="5.7.1",
+ org.junit;bundle-version="4.13.0",
  org.mybatis.generator.eclipse.test.utilities;bundle-version="1.4.2"
 Automatic-Module-Name: org.mybatis.generator.eclipse.core.tests
 Export-Package: org.mybatis.generator.eclipse.core.tests,
diff --git a/eclipse/org.mybatis.generator.eclipse.core/.classpath b/eclipse/org.mybatis.generator.eclipse.core/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/eclipse/org.mybatis.generator.eclipse.core/.settings/org.eclipse.jdt.core.prefs b/eclipse/org.mybatis.generator.eclipse.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,14 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/eclipse/org.mybatis.generator.eclipse.core/META-INF/MANIFEST.MF b/eclipse/org.mybatis.generator.eclipse.core/META-INF/MANIFEST.MF
@@ -4,12 +4,12 @@ Bundle-Name: MyBatis Generator Eclipse Core Support
 Bundle-SymbolicName: org.mybatis.generator.eclipse.core
 Bundle-Version: 1.4.2.qualifier
 Bundle-Vendor: mybatis.org
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.mybatis.generator.core;bundle-version="1.4.2";visibility:=reexport,
- org.eclipse.jdt.core;bundle-version="3.16.0",
- org.eclipse.jface.text;bundle-version="3.15.0",
- org.eclipse.core.resources;bundle-version="3.13.200",
- org.eclipse.core.runtime;bundle-version="3.15.100"
+ org.eclipse.jdt.core;bundle-version="3.26.0",
+ org.eclipse.jface.text;bundle-version="3.18.0",
+ org.eclipse.core.resources;bundle-version="3.15.0",
+ org.eclipse.core.runtime;bundle-version="3.22.0"
 Export-Package: org.mybatis.generator.eclipse.core.callback,
  org.mybatis.generator.eclipse.core.merge,
  org.mybatis.generator.eclipse.core.merge.visitors
diff --git a/eclipse/org.mybatis.generator.eclipse.core/src/org/mybatis/generator/eclipse/core/merge/EclipseDomUtils.java b/eclipse/org.mybatis.generator.eclipse.core/src/org/mybatis/generator/eclipse/core/merge/EclipseDomUtils.java
@@ -66,9 +66,9 @@ public static boolean typesMatch(Type type1, Type type2) {
     }
     
     public static CompilationUnit getCompilationUnitFromSource(String javaSource) {
-        ASTParser astParser = ASTParser.newParser(AST.JLS11);
+        ASTParser astParser = ASTParser.newParser(AST.JLS16);
         Map<String, String> options = JavaCore.getDefaultOptions();
-        JavaCore.setComplianceOptions(JavaCore.VERSION_11, options);
+        JavaCore.setComplianceOptions(JavaCore.VERSION_16, options);
         astParser.setCompilerOptions(options);
         astParser.setSource(javaSource.toCharArray());
         CompilationUnit cu = (CompilationUnit) astParser.createAST(null);
diff --git a/eclipse/org.mybatis.generator.eclipse.test.utilities.tests/.classpath b/eclipse/org.mybatis.generator.eclipse.test.utilities.tests/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src">
 		<attributes>
diff --git a/eclipse/org.mybatis.generator.eclipse.test.utilities.tests/.settings/org.eclipse.jdt.core.prefs b/eclipse/org.mybatis.generator.eclipse.test.utilities.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/eclipse/org.mybatis.generator.eclipse.test.utilities.tests/META-INF/MANIFEST.MF b/eclipse/org.mybatis.generator.eclipse.test.utilities.tests/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.mybatis.generator.eclipse.test.utilities.tests
 Bundle-Version: 1.4.2.qualifier
 Fragment-Host: org.mybatis.generator.eclipse.test.utilities;bundle-version="1.4.2"
 Automatic-Module-Name: org.mybatis.generator.eclipse.test.utilities.tests
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.junit.jupiter.api;bundle-version="5.3.1",
- org.junit;bundle-version="4.12.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Require-Bundle: org.junit.jupiter.api;bundle-version="5.7.1",
+ org.junit;bundle-version="4.13.0"
 Bundle-Vendor: mybatis.org
diff --git a/eclipse/org.mybatis.generator.eclipse.test.utilities/.classpath b/eclipse/org.mybatis.generator.eclipse.test.utilities/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/eclipse/org.mybatis.generator.eclipse.test.utilities/.settings/org.eclipse.jdt.core.prefs b/eclipse/org.mybatis.generator.eclipse.test.utilities/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/eclipse/org.mybatis.generator.eclipse.test.utilities/META-INF/MANIFEST.MF b/eclipse/org.mybatis.generator.eclipse.test.utilities/META-INF/MANIFEST.MF
@@ -4,9 +4,9 @@ Bundle-Name: MyBatis Generator Merger Test Utilities
 Bundle-SymbolicName: org.mybatis.generator.eclipse.test.utilities
 Bundle-Version: 1.4.2.qualifier
 Automatic-Module-Name: org.mybatis.generator.eclipse.test.utilities
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.hamcrest.core;bundle-version="1.3.0",
- org.eclipse.jdt.core;bundle-version="3.16.0",
+ org.eclipse.jdt.core;bundle-version="3.26.0",
  org.mybatis.generator.eclipse.core;bundle-version="1.4.2"
 Export-Package: org.mybatis.generator.eclipse.test,
  org.mybatis.generator.eclipse.test.matchers,
diff --git a/eclipse/org.mybatis.generator.eclipse.ui.tests/.classpath b/eclipse/org.mybatis.generator.eclipse.ui.tests/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src">
 		<attributes>
diff --git a/eclipse/org.mybatis.generator.eclipse.ui.tests/.settings/org.eclipse.jdt.core.prefs b/eclipse/org.mybatis.generator.eclipse.ui.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/eclipse/org.mybatis.generator.eclipse.ui.tests/META-INF/MANIFEST.MF b/eclipse/org.mybatis.generator.eclipse.ui.tests/META-INF/MANIFEST.MF
@@ -5,8 +5,8 @@ Bundle-SymbolicName: org.mybatis.generator.eclipse.ui.tests
 Bundle-Version: 1.4.2.qualifier
 Fragment-Host: org.mybatis.generator.eclipse.ui;bundle-version="1.4.2"
 Automatic-Module-Name: org.mybatis.generator.eclipse.ui.tests
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.junit.jupiter.api;bundle-version="5.3.1",
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Require-Bundle: org.junit.jupiter.api;bundle-version="5.7.1",
  org.hamcrest.core;bundle-version="1.3.0",
- org.junit;bundle-version="4.12.0"
+ org.junit;bundle-version="4.13.0"
 Bundle-Vendor: mybatis.org
diff --git a/eclipse/org.mybatis.generator.eclipse.ui/.classpath b/eclipse/org.mybatis.generator.eclipse.ui/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" output="antbin" path="antsrc"/>
diff --git a/eclipse/org.mybatis.generator.eclipse.ui/.settings/org.eclipse.jdt.core.prefs b/eclipse/org.mybatis.generator.eclipse.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,14 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/eclipse/org.mybatis.generator.eclipse.ui/META-INF/MANIFEST.MF b/eclipse/org.mybatis.generator.eclipse.ui/META-INF/MANIFEST.MF
@@ -5,29 +5,32 @@ Bundle-SymbolicName: org.mybatis.generator.eclipse.ui;singleton:=true
 Bundle-Version: 1.4.2.qualifier
 Bundle-Activator: org.mybatis.generator.eclipse.ui.Activator
 Bundle-Vendor: mybatis.org
-Require-Bundle: org.eclipse.ui;bundle-version="3.111.0",
- org.eclipse.core.runtime;bundle-version="3.15.100",
- org.apache.ant;bundle-version="1.10.5",
- org.eclipse.ant.core;bundle-version="3.5.200",
+Require-Bundle: org.eclipse.ui;bundle-version="3.119.0",
+ org.eclipse.core.runtime;bundle-version="3.22.0",
+ org.apache.ant;bundle-version="1.10.10",
+ org.eclipse.ant.core;bundle-version="3.6.0",
  org.mybatis.generator.eclipse.core;bundle-version="1.4.2",
- org.eclipse.jdt.core;bundle-version="3.16.0",
- org.eclipse.core.resources;bundle-version="3.13.200",
- org.eclipse.ui.ide;bundle-version="3.14.200",
- org.eclipse.jdt.ui;bundle-version="3.16.0",
- org.eclipse.debug.core;bundle-version="3.13.100",
- org.eclipse.debug.ui;bundle-version="3.13.200",
- org.eclipse.jdt.launching;bundle-version="3.12.0",
- org.eclipse.jdt.debug.ui;bundle-version="3.10.100",
- org.eclipse.core.expressions;bundle-version="3.6.200",
- org.eclipse.core.variables;bundle-version="3.4.300",
- org.eclipse.equinox.security;bundle-version="1.3.0",
- org.eclipse.ui.console;bundle-version="3.8.300"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+ org.eclipse.jdt.core;bundle-version="3.26.0",
+ org.eclipse.core.resources;bundle-version="3.15.0",
+ org.eclipse.ui.ide;bundle-version="3.18.200",
+ org.eclipse.jdt.ui;bundle-version="3.23.0",
+ org.eclipse.debug.core;bundle-version="3.18.100",
+ org.eclipse.debug.ui;bundle-version="3.15.0",
+ org.eclipse.jdt.launching;bundle-version="3.19.200",
+ org.eclipse.jdt.debug.ui;bundle-version="3.12.300",
+ org.eclipse.core.expressions;bundle-version="3.7.100",
+ org.eclipse.core.variables;bundle-version="3.5.0",
+ org.eclipse.equinox.security;bundle-version="1.3.600",
+ org.eclipse.ui.console;bundle-version="3.11.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Export-Package: org.mybatis.generator.eclipse.ui,
  org.mybatis.generator.eclipse.ui.ant,
  org.mybatis.generator.eclipse.ui.content,
  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
diff --git a/eclipse/org.mybatis.generator.eclipse.ui/build.properties b/eclipse/org.mybatis.generator.eclipse.ui/build.properties
@@ -32,7 +32,5 @@ src.includes = LICENSE,\
                NOTICE,\
                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-api-2.12.1.jar,\
-                       platform:/plugin/org.mybatis.generator.core/lib/slf4j-api-1.7.28.jar
+jars.extra.classpath = platform:/plugin/org.mybatis.generator.core/lib/log4j-api-2.19.0.jar
 
diff --git a/eclipse/pom.xml b/eclipse/pom.xml
diff --git a/eclipse/releng/2019-12.target b/eclipse/releng/2019-12.target
diff --git a/eclipse/releng/2021-06.target b/eclipse/releng/2021-06.target
diff --git a/eclipse/releng/2021-12.target b/eclipse/releng/2021-12.target
diff --git a/eclipse/releng/README.md b/eclipse/releng/README.md

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`/target/`
`2`	`2`	`.mvn/wrapper/maven-wrapper.jar`
	`3`	`+*/.polyglot.`