Update the Groovy plugin to 4.0.21

for #1565

base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovyCompilerTestSuite.java

@@ -136,7 +136,7 @@ protected String[] getDefaultClassPaths() {
                 String[] cps = super.getDefaultClassPaths();
                 String[] newcps = Arrays.copyOf(cps, cps.length + 2);
 
-                String[] groovyVersions = {"5.0.0", "4.0.20", "3.0.21-indy"};
+                String[] groovyVersions = {"5.0.0", "4.0.21", "3.0.21-indy"};
                 String[] ivyVersions = {"2.5.2", "2.5.1", "2.5.0"};
                 try {
                     URL groovyJar = null;

base/org.codehaus.groovy40/.classpath

@@ -11,14 +11,14 @@
             <attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy40/lib/ivy-2.5.2-javadoc.jar!/" />
         </attributes>
     </classpathentry>
-    <classpathentry kind="lib" path="lib/groovy-4.0.20.jar" sourcepath="lib/groovy-4.0.20-sources.jar" exported="true">
+    <classpathentry kind="lib" path="lib/groovy-4.0.21.jar" sourcepath="lib/groovy-4.0.21-sources.jar" exported="true">
         <attributes>
-            <attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy40/lib/groovy-4.0.20-javadoc.jar!/" />
+            <attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy40/lib/groovy-4.0.21-javadoc.jar!/" />
         </attributes>
     </classpathentry>
-    <classpathentry kind="lib" path="lib/groovy-test-4.0.20.jar" sourcepath="lib/groovy-test-4.0.20-sources.jar" exported="true">
+    <classpathentry kind="lib" path="lib/groovy-test-4.0.21.jar" sourcepath="lib/groovy-test-4.0.21-sources.jar" exported="true">
         <attributes>
-            <attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy40/lib/groovy-test-4.0.20-javadoc.jar!/" />
+            <attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy40/lib/groovy-test-4.0.21-javadoc.jar!/" />
         </attributes>
     </classpathentry>
 

base/org.codehaus.groovy40/META-INF/MANIFEST.MF

@@ -4,99 +4,99 @@ Bundle-SymbolicName: org.codehaus.groovy
 Automatic-Module-Name: org.codehaus.groovy
 Bundle-Name: Apache Groovy
 Bundle-Vendor: Pivotal Software, Inc.
-Bundle-Version: 4.0.20.qualifier
+Bundle-Version: 4.0.21.qualifier
 Bundle-ClassPath: eclipse-trace.jar,
  groovy-eclipse.jar,
  groovy-parser2.jar,
  lib/ivy-2.5.2.jar,
- lib/groovy-4.0.20.jar,
- lib/groovy-test-4.0.20.jar
-Export-Package: groovy.beans;version="4.0.20",
- groovy.cli;version="4.0.20",
- groovy.grape;version="4.0.20",
- groovy.inspect;version="4.0.20",
- groovy.io;version="4.0.20",
- groovy.lang;version="4.0.20",
- groovy.lang.groovydoc;version="4.0.20",
- groovy.mock.interceptor;version="4.0.20",
- groovy.namespace;version="4.0.20",
- groovy.security;version="4.0.20",
- groovy.test;version="4.0.20",
- groovy.time;version="4.0.20",
- groovy.transform;version="4.0.20",
- groovy.transform.builder;version="4.0.20",
- groovy.transform.options;version="4.0.20",
- groovy.transform.stc;version="4.0.20",
- groovy.ui;version="4.0.20",
- groovy.util;version="4.0.20",
- groovy.util.logging;version="4.0.20",
+ lib/groovy-4.0.21.jar,
+ lib/groovy-test-4.0.21.jar
+Export-Package: groovy.beans;version="4.0.21",
+ groovy.cli;version="4.0.21",
+ groovy.grape;version="4.0.21",
+ groovy.inspect;version="4.0.21",
+ groovy.io;version="4.0.21",
+ groovy.lang;version="4.0.21",
+ groovy.lang.groovydoc;version="4.0.21",
+ groovy.mock.interceptor;version="4.0.21",
+ groovy.namespace;version="4.0.21",
+ groovy.security;version="4.0.21",
+ groovy.test;version="4.0.21",
+ groovy.time;version="4.0.21",
+ groovy.transform;version="4.0.21",
+ groovy.transform.builder;version="4.0.21",
+ groovy.transform.options;version="4.0.21",
+ groovy.transform.stc;version="4.0.21",
+ groovy.ui;version="4.0.21",
+ groovy.util;version="4.0.21",
+ groovy.util.logging;version="4.0.21",
  groovyjarjarantlr;x-friends:="org.codehaus.groovy.eclipse.refactoring",
- org.apache.groovy.antlr;version="4.0.20",
- org.apache.groovy.ast.tools;version="4.0.20",
- org.apache.groovy.io;version="4.0.20",
- org.apache.groovy.lang;version="4.0.20",
- org.apache.groovy.lang.annotation;version="4.0.20",
- org.apache.groovy.metaclass;version="4.0.20",
- org.apache.groovy.plugin;version="4.0.20",
- org.apache.groovy.test;version="4.0.20",
- org.apache.groovy.test.transform;version="4.0.20",
- org.apache.groovy.util;version="4.0.20",
- org.apache.groovy.util.concurrent;version="4.0.20",
- org.codehaus.groovy;version="4.0.20",
- org.codehaus.groovy.antlr;version="4.0.20",
- org.codehaus.groovy.antlr.parser;version="4.0.20",
- org.codehaus.groovy.ast;version="4.0.20",
- org.codehaus.groovy.ast.builder;version="4.0.20",
- org.codehaus.groovy.ast.decompiled;version="4.0.20",
- org.codehaus.groovy.ast.expr;version="4.0.20",
- org.codehaus.groovy.ast.stmt;version="4.0.20",
- org.codehaus.groovy.ast.tools;version="4.0.20",
- org.codehaus.groovy.classgen;version="4.0.20",
- org.codehaus.groovy.classgen.asm;version="4.0.20",
- org.codehaus.groovy.classgen.asm.indy;version="4.0.20",
- org.codehaus.groovy.classgen.asm.indy.sc;version="4.0.20",
- org.codehaus.groovy.classgen.asm.sc;version="4.0.20",
- org.codehaus.groovy.classgen.asm.util;version="4.0.20",
- org.codehaus.groovy.control;version="4.0.20",
- org.codehaus.groovy.control.customizers;version="4.0.20",
- org.codehaus.groovy.control.customizers.builder;version="4.0.20",
- org.codehaus.groovy.control.io;version="4.0.20",
- org.codehaus.groovy.control.messages;version="4.0.20",
+ org.apache.groovy.antlr;version="4.0.21",
+ org.apache.groovy.ast.tools;version="4.0.21",
+ org.apache.groovy.io;version="4.0.21",
+ org.apache.groovy.lang;version="4.0.21",
+ org.apache.groovy.lang.annotation;version="4.0.21",
+ org.apache.groovy.metaclass;version="4.0.21",
+ org.apache.groovy.plugin;version="4.0.21",
+ org.apache.groovy.test;version="4.0.21",
+ org.apache.groovy.test.transform;version="4.0.21",
+ org.apache.groovy.util;version="4.0.21",
+ org.apache.groovy.util.concurrent;version="4.0.21",
+ org.codehaus.groovy;version="4.0.21",
+ org.codehaus.groovy.antlr;version="4.0.21",
+ org.codehaus.groovy.antlr.parser;version="4.0.21",
+ org.codehaus.groovy.ast;version="4.0.21",
+ org.codehaus.groovy.ast.builder;version="4.0.21",
+ org.codehaus.groovy.ast.decompiled;version="4.0.21",
+ org.codehaus.groovy.ast.expr;version="4.0.21",
+ org.codehaus.groovy.ast.stmt;version="4.0.21",
+ org.codehaus.groovy.ast.tools;version="4.0.21",
+ org.codehaus.groovy.classgen;version="4.0.21",
+ org.codehaus.groovy.classgen.asm;version="4.0.21",
+ org.codehaus.groovy.classgen.asm.indy;version="4.0.21",
+ org.codehaus.groovy.classgen.asm.indy.sc;version="4.0.21",
+ org.codehaus.groovy.classgen.asm.sc;version="4.0.21",
+ org.codehaus.groovy.classgen.asm.util;version="4.0.21",
+ org.codehaus.groovy.control;version="4.0.21",
+ org.codehaus.groovy.control.customizers;version="4.0.21",
+ org.codehaus.groovy.control.customizers.builder;version="4.0.21",
+ org.codehaus.groovy.control.io;version="4.0.21",
+ org.codehaus.groovy.control.messages;version="4.0.21",
  org.codehaus.groovy.eclipse,
- org.codehaus.groovy.reflection;version="4.0.20",
- org.codehaus.groovy.reflection.android;version="4.0.20",
- org.codehaus.groovy.reflection.stdclasses;version="4.0.20",
- org.codehaus.groovy.reflection.v7;version="4.0.20",
- org.codehaus.groovy.runtime;version="4.0.20",
- org.codehaus.groovy.runtime.callsite;version="4.0.20",
- org.codehaus.groovy.runtime.dgmimpl;version="4.0.20",
- org.codehaus.groovy.runtime.dgmimpl.arrays;version="4.0.20",
- org.codehaus.groovy.runtime.m12n;version="4.0.20",
- org.codehaus.groovy.runtime.memoize;version="4.0.20",
- org.codehaus.groovy.runtime.metaclass;version="4.0.20",
- org.codehaus.groovy.runtime.powerassert;version="4.0.20",
- org.codehaus.groovy.runtime.typehandling;version="4.0.20",
- org.codehaus.groovy.runtime.wrappers;version="4.0.20",
- org.codehaus.groovy.syntax;version="4.0.20",
- org.codehaus.groovy.tools;version="4.0.20",
- org.codehaus.groovy.tools.ast;version="4.0.20",
- org.codehaus.groovy.tools.gse;version="4.0.20",
- org.codehaus.groovy.tools.javac;version="4.0.20",
- org.codehaus.groovy.tools.shell;version="4.0.20",
- org.codehaus.groovy.tools.shell.util;version="4.0.20",
- org.codehaus.groovy.transform;version="4.0.20",
- org.codehaus.groovy.transform.sc;version="4.0.20",
- org.codehaus.groovy.transform.sc.transformers;version="4.0.20",
- org.codehaus.groovy.transform.stc;version="4.0.20",
- org.codehaus.groovy.transform.tailrec;version="4.0.20",
- org.codehaus.groovy.transform.trait;version="4.0.20",
- org.codehaus.groovy.util;version="4.0.20",
- org.codehaus.groovy.vmplugin;version="4.0.20",
- org.codehaus.groovy.vmplugin.v7;version="4.0.20",
- org.codehaus.groovy.vmplugin.v8;version="4.0.20",
- org.codehaus.groovy.vmplugin.v9;version="4.0.20",
- org.codehaus.groovy.vmplugin.v10;version="4.0.20",
- org.codehaus.groovy.vmplugin.v16;version="4.0.20"
+ org.codehaus.groovy.reflection;version="4.0.21",
+ org.codehaus.groovy.reflection.android;version="4.0.21",
+ org.codehaus.groovy.reflection.stdclasses;version="4.0.21",
+ org.codehaus.groovy.reflection.v7;version="4.0.21",
+ org.codehaus.groovy.runtime;version="4.0.21",
+ org.codehaus.groovy.runtime.callsite;version="4.0.21",
+ org.codehaus.groovy.runtime.dgmimpl;version="4.0.21",
+ org.codehaus.groovy.runtime.dgmimpl.arrays;version="4.0.21",
+ org.codehaus.groovy.runtime.m12n;version="4.0.21",
+ org.codehaus.groovy.runtime.memoize;version="4.0.21",
+ org.codehaus.groovy.runtime.metaclass;version="4.0.21",
+ org.codehaus.groovy.runtime.powerassert;version="4.0.21",
+ org.codehaus.groovy.runtime.typehandling;version="4.0.21",
+ org.codehaus.groovy.runtime.wrappers;version="4.0.21",
+ org.codehaus.groovy.syntax;version="4.0.21",
+ org.codehaus.groovy.tools;version="4.0.21",
+ org.codehaus.groovy.tools.ast;version="4.0.21",
+ org.codehaus.groovy.tools.gse;version="4.0.21",
+ org.codehaus.groovy.tools.javac;version="4.0.21",
+ org.codehaus.groovy.tools.shell;version="4.0.21",
+ org.codehaus.groovy.tools.shell.util;version="4.0.21",
+ org.codehaus.groovy.transform;version="4.0.21",
+ org.codehaus.groovy.transform.sc;version="4.0.21",
+ org.codehaus.groovy.transform.sc.transformers;version="4.0.21",
+ org.codehaus.groovy.transform.stc;version="4.0.21",
+ org.codehaus.groovy.transform.tailrec;version="4.0.21",
+ org.codehaus.groovy.transform.trait;version="4.0.21",
+ org.codehaus.groovy.util;version="4.0.21",
+ org.codehaus.groovy.vmplugin;version="4.0.21",
+ org.codehaus.groovy.vmplugin.v7;version="4.0.21",
+ org.codehaus.groovy.vmplugin.v8;version="4.0.21",
+ org.codehaus.groovy.vmplugin.v9;version="4.0.21",
+ org.codehaus.groovy.vmplugin.v10;version="4.0.21",
+ org.codehaus.groovy.vmplugin.v16;version="4.0.21"
 Require-Bundle: org.eclipse.core.runtime,
  org.junit;resolution:=optional
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

base/org.codehaus.groovy40/VERSION

@@ -25,3 +25,4 @@
 2024-01-16: GROOVY_4_0_18
 2024-02-27: GROOVY_4_0_19
 2024-03-12: GROOVY_4_0_20
+2024-04-06: GROOVY_4_0_21

base/org.codehaus.groovy40/about.html

@@ -24,12 +24,12 @@ <h3>License</h3>
 
 <h3>Third Party Content</h3>
 
-<h4>groovy-4.0.20.jar</h4>
-<h4>groovy-test-4.0.20.jar</h4>
+<h4>groovy-4.0.21.jar</h4>
+<h4>groovy-test-4.0.21.jar</h4>
 
 <ul>
-<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/4.0.20/distribution/apache-groovy-binary-4.0.20.zip">https://dist.apache.org/repos/dist/release/groovy/4.0.20/distribution/apache-groovy-binary-4.0.20.zip</a></li>
-<li>Sources available at: <a href="https://dist.apache.org/repos/dist/release/groovy/4.0.20/sources/apache-groovy-src-4.0.20.zip">https://dist.apache.org/repos/dist/release/groovy/4.0.20/sources/apache-groovy-src-4.0.20.zip</a></li>
+<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/4.0.21/distribution/apache-groovy-binary-4.0.21.zip">https://dist.apache.org/repos/dist/release/groovy/4.0.21/distribution/apache-groovy-binary-4.0.21.zip</a></li>
+<li>Sources available at: <a href="https://dist.apache.org/repos/dist/release/groovy/4.0.21/sources/apache-groovy-src-4.0.21.zip">https://dist.apache.org/repos/dist/release/groovy/4.0.21/sources/apache-groovy-src-4.0.21.zip</a></li>
 <li>License kind: ASL</li>
 <li>License URL: <a href="https://www.apache.org/licenses/LICENSE-2.0.html">https://www.apache.org/licenses/LICENSE-2.0.html</a></li>
 <li>License text: <a href="about_files/asl2-license.txt">asl2-license.txt</a></li>
@@ -45,15 +45,15 @@ <h4>ivy-2.5.2.jar</h4>
 <li>License text: <a href="about_files/asl2-license.txt">asl2-license.txt</a></li>
 </ul>
 
-<h4>groovy-console-4.0.20.jar</h4>
-<h4>groovy-groovysh-4.0.20.jar</h4>
-<h4>groovy-swing-4.0.20.jar</h4>
-<h4>groovy-templates-4.0.20.jar</h4>
-<h4>groovy-xml-4.0.20.jar</h4>
-<h4>javaparser-core-3.25.9.jar</h4>
+<h4>groovy-console-4.0.21.jar</h4>
+<h4>groovy-groovysh-4.0.21.jar</h4>
+<h4>groovy-swing-4.0.21.jar</h4>
+<h4>groovy-templates-4.0.21.jar</h4>
+<h4>groovy-xml-4.0.21.jar</h4>
+<h4>javaparser-core-3.25.10.jar</h4>
 
 <ul>
-<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/4.0.20/distribution/apache-groovy-binary-4.0.20.zip">https://dist.apache.org/repos/dist/release/groovy/4.0.20/distribution/apache-groovy-binary-4.0.20.zip</a></li>
+<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/4.0.21/distribution/apache-groovy-binary-4.0.21.zip">https://dist.apache.org/repos/dist/release/groovy/4.0.21/distribution/apache-groovy-binary-4.0.21.zip</a></li>
 <li>License kind: ASL</li>
 <li>License URL: <a href="https://www.apache.org/licenses/LICENSE-2.0.html">https://www.apache.org/licenses/LICENSE-2.0.html</a></li>
 <li>License text: <a href="about_files/asl2-license.txt">asl2-license.txt</a></li>
@@ -62,7 +62,7 @@ <h4>javaparser-core-3.25.9.jar</h4>
 <h4>jline-2.14.6.jar</h4>
 
 <ul>
-<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/4.0.20/distribution/apache-groovy-binary-4.0.20.zip">https://dist.apache.org/repos/dist/release/groovy/4.0.20/distribution/apache-groovy-binary-4.0.20.zip</a></li>
+<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/4.0.21/distribution/apache-groovy-binary-4.0.21.zip">https://dist.apache.org/repos/dist/release/groovy/4.0.21/distribution/apache-groovy-binary-4.0.21.zip</a></li>
 <li>License kind: BSD</li>
 <li>License URL: <a href="https://www.opensource.org/licenses/bsd-license.php">https://www.opensource.org/licenses/bsd-license.php</a></li>
 <li>License text: <a href="about_files/jline2-license.txt">jline2-license.txt</a></li>

base/org.codehaus.groovy40/pom.xml

@@ -8,7 +8,7 @@
   </parent>
   <groupId>org.codehaus.groovy.eclipse</groupId>
   <artifactId>org.codehaus.groovy</artifactId>
-  <version>4.0.20-SNAPSHOT</version>
+  <version>4.0.21-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>

base/org.codehaus.groovy40/src/org/codehaus/groovy/control/CompilerConfiguration.java

@@ -99,6 +99,8 @@ public class CompilerConfiguration {
     public static final String JDK21 = "21";
     /** This (<code>"22"</code>) is the value for targetBytecode to compile for a JDK 22. */
     public static final String JDK22 = "22";
+    /** This (<code>"23"</code>) is the value for targetBytecode to compile for a JDK 23. */
+    public static final String JDK23 = "23";
 
     /**
      * This constant is for comparing targetBytecode to ensure it is set to JDK 1.5 or later.
@@ -136,7 +138,8 @@ public class CompilerConfiguration {
             JDK19, Opcodes.V19,
             JDK20, Opcodes.V20,
             JDK21, Opcodes.V21,
-            JDK22, Opcodes.V22
+            JDK22, Opcodes.V22,
+            JDK23, Opcodes.V23
     );
 
     /**