Update the Groovy plugin to 4.0.16

for #1521

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.15", "3.0.19-indy"};
+                String[] groovyVersions = {"5.0.0", "4.0.16", "3.0.19-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.15.jar" sourcepath="lib/groovy-4.0.15-sources.jar" exported="true">
+    <classpathentry kind="lib" path="lib/groovy-4.0.16.jar" sourcepath="lib/groovy-4.0.16-sources.jar" exported="true">
         <attributes>
-            <attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy40/lib/groovy-4.0.15-javadoc.jar!/" />
+            <attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy40/lib/groovy-4.0.16-javadoc.jar!/" />
         </attributes>
     </classpathentry>
-    <classpathentry kind="lib" path="lib/groovy-test-4.0.15.jar" sourcepath="lib/groovy-test-4.0.15-sources.jar" exported="true">
+    <classpathentry kind="lib" path="lib/groovy-test-4.0.16.jar" sourcepath="lib/groovy-test-4.0.16-sources.jar" exported="true">
         <attributes>
-            <attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy40/lib/groovy-test-4.0.15-javadoc.jar!/" />
+            <attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy40/lib/groovy-test-4.0.16-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.15.qualifier
+Bundle-Version: 4.0.16.qualifier
 Bundle-ClassPath: eclipse-trace.jar,
  groovy-eclipse.jar,
  groovy-parser2.jar,
  lib/ivy-2.5.2.jar,
- lib/groovy-4.0.15.jar,
- lib/groovy-test-4.0.15.jar
-Export-Package: groovy.beans;version="4.0.15",
- groovy.cli;version="4.0.15",
- groovy.grape;version="4.0.15",
- groovy.inspect;version="4.0.15",
- groovy.io;version="4.0.15",
- groovy.lang;version="4.0.15",
- groovy.lang.groovydoc;version="4.0.15",
- groovy.mock.interceptor;version="4.0.15",
- groovy.namespace;version="4.0.15",
- groovy.security;version="4.0.15",
- groovy.test;version="4.0.15",
- groovy.time;version="4.0.15",
- groovy.transform;version="4.0.15",
- groovy.transform.builder;version="4.0.15",
- groovy.transform.options;version="4.0.15",
- groovy.transform.stc;version="4.0.15",
- groovy.ui;version="4.0.15",
- groovy.util;version="4.0.15",
- groovy.util.logging;version="4.0.15",
+ lib/groovy-4.0.16.jar,
+ lib/groovy-test-4.0.16.jar
+Export-Package: groovy.beans;version="4.0.16",
+ groovy.cli;version="4.0.16",
+ groovy.grape;version="4.0.16",
+ groovy.inspect;version="4.0.16",
+ groovy.io;version="4.0.16",
+ groovy.lang;version="4.0.16",
+ groovy.lang.groovydoc;version="4.0.16",
+ groovy.mock.interceptor;version="4.0.16",
+ groovy.namespace;version="4.0.16",
+ groovy.security;version="4.0.16",
+ groovy.test;version="4.0.16",
+ groovy.time;version="4.0.16",
+ groovy.transform;version="4.0.16",
+ groovy.transform.builder;version="4.0.16",
+ groovy.transform.options;version="4.0.16",
+ groovy.transform.stc;version="4.0.16",
+ groovy.ui;version="4.0.16",
+ groovy.util;version="4.0.16",
+ groovy.util.logging;version="4.0.16",
  groovyjarjarantlr;x-friends:="org.codehaus.groovy.eclipse.refactoring",
- org.apache.groovy.antlr;version="4.0.15",
- org.apache.groovy.ast.tools;version="4.0.15",
- org.apache.groovy.io;version="4.0.15",
- org.apache.groovy.lang;version="4.0.15",
- org.apache.groovy.lang.annotation;version="4.0.15",
- org.apache.groovy.metaclass;version="4.0.15",
- org.apache.groovy.plugin;version="4.0.15",
- org.apache.groovy.test;version="4.0.15",
- org.apache.groovy.test.transform;version="4.0.15",
- org.apache.groovy.util;version="4.0.15",
- org.apache.groovy.util.concurrent;version="4.0.15",
- org.codehaus.groovy;version="4.0.15",
- org.codehaus.groovy.antlr;version="4.0.15",
- org.codehaus.groovy.antlr.parser;version="4.0.15",
- org.codehaus.groovy.ast;version="4.0.15",
- org.codehaus.groovy.ast.builder;version="4.0.15",
- org.codehaus.groovy.ast.decompiled;version="4.0.15",
- org.codehaus.groovy.ast.expr;version="4.0.15",
- org.codehaus.groovy.ast.stmt;version="4.0.15",
- org.codehaus.groovy.ast.tools;version="4.0.15",
- org.codehaus.groovy.classgen;version="4.0.15",
- org.codehaus.groovy.classgen.asm;version="4.0.15",
- org.codehaus.groovy.classgen.asm.indy;version="4.0.15",
- org.codehaus.groovy.classgen.asm.indy.sc;version="4.0.15",
- org.codehaus.groovy.classgen.asm.sc;version="4.0.15",
- org.codehaus.groovy.classgen.asm.util;version="4.0.15",
- org.codehaus.groovy.control;version="4.0.15",
- org.codehaus.groovy.control.customizers;version="4.0.15",
- org.codehaus.groovy.control.customizers.builder;version="4.0.15",
- org.codehaus.groovy.control.io;version="4.0.15",
- org.codehaus.groovy.control.messages;version="4.0.15",
+ org.apache.groovy.antlr;version="4.0.16",
+ org.apache.groovy.ast.tools;version="4.0.16",
+ org.apache.groovy.io;version="4.0.16",
+ org.apache.groovy.lang;version="4.0.16",
+ org.apache.groovy.lang.annotation;version="4.0.16",
+ org.apache.groovy.metaclass;version="4.0.16",
+ org.apache.groovy.plugin;version="4.0.16",
+ org.apache.groovy.test;version="4.0.16",
+ org.apache.groovy.test.transform;version="4.0.16",
+ org.apache.groovy.util;version="4.0.16",
+ org.apache.groovy.util.concurrent;version="4.0.16",
+ org.codehaus.groovy;version="4.0.16",
+ org.codehaus.groovy.antlr;version="4.0.16",
+ org.codehaus.groovy.antlr.parser;version="4.0.16",
+ org.codehaus.groovy.ast;version="4.0.16",
+ org.codehaus.groovy.ast.builder;version="4.0.16",
+ org.codehaus.groovy.ast.decompiled;version="4.0.16",
+ org.codehaus.groovy.ast.expr;version="4.0.16",
+ org.codehaus.groovy.ast.stmt;version="4.0.16",
+ org.codehaus.groovy.ast.tools;version="4.0.16",
+ org.codehaus.groovy.classgen;version="4.0.16",
+ org.codehaus.groovy.classgen.asm;version="4.0.16",
+ org.codehaus.groovy.classgen.asm.indy;version="4.0.16",
+ org.codehaus.groovy.classgen.asm.indy.sc;version="4.0.16",
+ org.codehaus.groovy.classgen.asm.sc;version="4.0.16",
+ org.codehaus.groovy.classgen.asm.util;version="4.0.16",
+ org.codehaus.groovy.control;version="4.0.16",
+ org.codehaus.groovy.control.customizers;version="4.0.16",
+ org.codehaus.groovy.control.customizers.builder;version="4.0.16",
+ org.codehaus.groovy.control.io;version="4.0.16",
+ org.codehaus.groovy.control.messages;version="4.0.16",
  org.codehaus.groovy.eclipse,
- org.codehaus.groovy.reflection;version="4.0.15",
- org.codehaus.groovy.reflection.android;version="4.0.15",
- org.codehaus.groovy.reflection.stdclasses;version="4.0.15",
- org.codehaus.groovy.reflection.v7;version="4.0.15",
- org.codehaus.groovy.runtime;version="4.0.15",
- org.codehaus.groovy.runtime.callsite;version="4.0.15",
- org.codehaus.groovy.runtime.dgmimpl;version="4.0.15",
- org.codehaus.groovy.runtime.dgmimpl.arrays;version="4.0.15",
- org.codehaus.groovy.runtime.m12n;version="4.0.15",
- org.codehaus.groovy.runtime.memoize;version="4.0.15",
- org.codehaus.groovy.runtime.metaclass;version="4.0.15",
- org.codehaus.groovy.runtime.powerassert;version="4.0.15",
- org.codehaus.groovy.runtime.typehandling;version="4.0.15",
- org.codehaus.groovy.runtime.wrappers;version="4.0.15",
- org.codehaus.groovy.syntax;version="4.0.15",
- org.codehaus.groovy.tools;version="4.0.15",
- org.codehaus.groovy.tools.ast;version="4.0.15",
- org.codehaus.groovy.tools.gse;version="4.0.15",
- org.codehaus.groovy.tools.javac;version="4.0.15",
- org.codehaus.groovy.tools.shell;version="4.0.15",
- org.codehaus.groovy.tools.shell.util;version="4.0.15",
- org.codehaus.groovy.transform;version="4.0.15",
- org.codehaus.groovy.transform.sc;version="4.0.15",
- org.codehaus.groovy.transform.sc.transformers;version="4.0.15",
- org.codehaus.groovy.transform.stc;version="4.0.15",
- org.codehaus.groovy.transform.tailrec;version="4.0.15",
- org.codehaus.groovy.transform.trait;version="4.0.15",
- org.codehaus.groovy.util;version="4.0.15",
- org.codehaus.groovy.vmplugin;version="4.0.15",
- org.codehaus.groovy.vmplugin.v7;version="4.0.15",
- org.codehaus.groovy.vmplugin.v8;version="4.0.15",
- org.codehaus.groovy.vmplugin.v9;version="4.0.15",
- org.codehaus.groovy.vmplugin.v10;version="4.0.15",
- org.codehaus.groovy.vmplugin.v16;version="4.0.15"
+ org.codehaus.groovy.reflection;version="4.0.16",
+ org.codehaus.groovy.reflection.android;version="4.0.16",
+ org.codehaus.groovy.reflection.stdclasses;version="4.0.16",
+ org.codehaus.groovy.reflection.v7;version="4.0.16",
+ org.codehaus.groovy.runtime;version="4.0.16",
+ org.codehaus.groovy.runtime.callsite;version="4.0.16",
+ org.codehaus.groovy.runtime.dgmimpl;version="4.0.16",
+ org.codehaus.groovy.runtime.dgmimpl.arrays;version="4.0.16",
+ org.codehaus.groovy.runtime.m12n;version="4.0.16",
+ org.codehaus.groovy.runtime.memoize;version="4.0.16",
+ org.codehaus.groovy.runtime.metaclass;version="4.0.16",
+ org.codehaus.groovy.runtime.powerassert;version="4.0.16",
+ org.codehaus.groovy.runtime.typehandling;version="4.0.16",
+ org.codehaus.groovy.runtime.wrappers;version="4.0.16",
+ org.codehaus.groovy.syntax;version="4.0.16",
+ org.codehaus.groovy.tools;version="4.0.16",
+ org.codehaus.groovy.tools.ast;version="4.0.16",
+ org.codehaus.groovy.tools.gse;version="4.0.16",
+ org.codehaus.groovy.tools.javac;version="4.0.16",
+ org.codehaus.groovy.tools.shell;version="4.0.16",
+ org.codehaus.groovy.tools.shell.util;version="4.0.16",
+ org.codehaus.groovy.transform;version="4.0.16",
+ org.codehaus.groovy.transform.sc;version="4.0.16",
+ org.codehaus.groovy.transform.sc.transformers;version="4.0.16",
+ org.codehaus.groovy.transform.stc;version="4.0.16",
+ org.codehaus.groovy.transform.tailrec;version="4.0.16",
+ org.codehaus.groovy.transform.trait;version="4.0.16",
+ org.codehaus.groovy.util;version="4.0.16",
+ org.codehaus.groovy.vmplugin;version="4.0.16",
+ org.codehaus.groovy.vmplugin.v7;version="4.0.16",
+ org.codehaus.groovy.vmplugin.v8;version="4.0.16",
+ org.codehaus.groovy.vmplugin.v9;version="4.0.16",
+ org.codehaus.groovy.vmplugin.v10;version="4.0.16",
+ org.codehaus.groovy.vmplugin.v16;version="4.0.16"
 Require-Bundle: org.eclipse.core.runtime,
  org.junit;resolution:=optional
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

base/org.codehaus.groovy40/VERSION

@@ -20,3 +20,4 @@
 2023-06-26: GROOVY_4_0_13
 2023-08-22: GROOVY_4_0_14
 2023-09-12: GROOVY_4_0_15
+2023-11-28: GROOVY_4_0_16

base/org.codehaus.groovy40/about.html

@@ -24,12 +24,12 @@ <h3>License</h3>
 
 <h3>Third Party Content</h3>
 
-<h4>groovy-4.0.15.jar</h4>
-<h4>groovy-test-4.0.15.jar</h4>
+<h4>groovy-4.0.16.jar</h4>
+<h4>groovy-test-4.0.16.jar</h4>
 
 <ul>
-<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/4.0.15/distribution/apache-groovy-binary-4.0.15.zip">https://dist.apache.org/repos/dist/release/groovy/4.0.15/distribution/apache-groovy-binary-4.0.15.zip</a></li>
-<li>Sources available at: <a href="https://dist.apache.org/repos/dist/release/groovy/4.0.15/sources/apache-groovy-src-4.0.15.zip">https://dist.apache.org/repos/dist/release/groovy/4.0.15/sources/apache-groovy-src-4.0.15.zip</a></li>
+<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/4.0.16/distribution/apache-groovy-binary-4.0.16.zip">https://dist.apache.org/repos/dist/release/groovy/4.0.16/distribution/apache-groovy-binary-4.0.16.zip</a></li>
+<li>Sources available at: <a href="https://dist.apache.org/repos/dist/release/groovy/4.0.16/sources/apache-groovy-src-4.0.16.zip">https://dist.apache.org/repos/dist/release/groovy/4.0.16/sources/apache-groovy-src-4.0.16.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.15.jar</h4>
-<h4>groovy-groovysh-4.0.15.jar</h4>
-<h4>groovy-swing-4.0.15.jar</h4>
-<h4>groovy-templates-4.0.15.jar</h4>
-<h4>groovy-xml-4.0.15.jar</h4>
-<h4>javaparser-core-3.25.5.jar</h4>
+<h4>groovy-console-4.0.16.jar</h4>
+<h4>groovy-groovysh-4.0.16.jar</h4>
+<h4>groovy-swing-4.0.16.jar</h4>
+<h4>groovy-templates-4.0.16.jar</h4>
+<h4>groovy-xml-4.0.16.jar</h4>
+<h4>javaparser-core-3.25.6.jar</h4>
 
 <ul>
-<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/4.0.15/distribution/apache-groovy-binary-4.0.15.zip">https://dist.apache.org/repos/dist/release/groovy/4.0.15/distribution/apache-groovy-binary-4.0.15.zip</a></li>
+<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/4.0.16/distribution/apache-groovy-binary-4.0.16.zip">https://dist.apache.org/repos/dist/release/groovy/4.0.16/distribution/apache-groovy-binary-4.0.16.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.5.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.15/distribution/apache-groovy-binary-4.0.15.zip">https://dist.apache.org/repos/dist/release/groovy/4.0.15/distribution/apache-groovy-binary-4.0.15.zip</a></li>
+<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/4.0.16/distribution/apache-groovy-binary-4.0.16.zip">https://dist.apache.org/repos/dist/release/groovy/4.0.16/distribution/apache-groovy-binary-4.0.16.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/build.antlr4x

@@ -19,7 +19,7 @@
 
     <target name="build" depends="clean">
         <resolve-dependencies pathid="classpath.antlr4">
-            <dependency org="me.sunlan" name="antlr4" rev="4.11.1.4">
+            <dependency org="me.sunlan" name="antlr4" rev="4.13.1.2">
                 <exclude name="org.abego.treelayout.core" />
             </dependency>
         </resolve-dependencies>

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.15-SNAPSHOT</version>
+  <version>4.0.16-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>

base/org.codehaus.groovy40/src/org/apache/groovy/ast/tools/ExpressionUtils.java

@@ -231,16 +231,22 @@ public static Expression transformInlineConstants(final Expression exp) {
             if (pe.getObjectExpression() instanceof ClassExpression) {
                 ClassNode clazz = pe.getObjectExpression().getType();
                 FieldNode field = ClassNodeUtils.getField(clazz, pe.getPropertyAsString());
-                if (field != null && field.isStatic() && field.isFinal() && !field.isEnum()
-                        && field.getInitialValueExpression() instanceof ConstantExpression) {
-                    ConstantExpression value = (ConstantExpression) field.getInitialValueExpression();
-                    value = new ConstantExpression(value.getValue());
-                    // GROOVY-10068, et al.: retain field's type
-                    if (!value.getType().equals(field.getType())
-                            && ClassHelper.isNumberType(field.getType()))
-                        value.setType(field.getType());
-                    // TODO: Boolean, Character, String
-                    return configure(exp, value);
+                if (field != null && !field.isEnum() && field.isFinal() && field.isStatic()) {
+                    Expression value = transformInlineConstants(field.getInitialValueExpression(), field.getType()); // GROOVY-10750, GROOVY-10068
+                    if (value instanceof ConstantExpression) {
+                        return configure(exp, new ConstantExpression(((ConstantExpression) value).getValue()));
+                    }
+                }
+            }
+        } else if (exp instanceof VariableExpression) {
+            VariableExpression ve = (VariableExpression) exp;
+            if (ve.getAccessedVariable() instanceof FieldNode) {
+                FieldNode field = (FieldNode) ve.getAccessedVariable();
+                if (!field.isEnum() && field.isFinal() && field.isStatic()) {
+                    Expression value = transformInlineConstants(field.getInitialValueExpression(), field.getType()); // GROOVY-11207, GROOVY-10068
+                    if (value instanceof ConstantExpression) {
+                        return configure(exp, new ConstantExpression(((ConstantExpression) value).getValue()));
+                    }
                 }
             }
         } else if (exp instanceof BinaryExpression) {

base/org.codehaus.groovy40/src/org/apache/groovy/parser/antlr4/GroovyLexer.java

@@ -1,4 +1,4 @@
-// Generated from GroovyLexer.g4 by ANTLR 4.11.1.4
+// Generated from GroovyLexer.g4 by ANTLR 4.13.1.2
 package org.apache.groovy.parser.antlr4;
 
     import java.util.*;