Update the Groovy plugin to 3.0.12

for #1380

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

@@ -133,7 +133,7 @@ protected String[] getDefaultClassPaths() {
                 String[] cps = super.getDefaultClassPaths();
                 String[] newcps = Arrays.copyOf(cps, cps.length + 2);
 
-                String[] groovyVersions = {"4.0.3", "3.0.11-indy", "2.5.18-indy"};
+                String[] groovyVersions = {"4.0.3", "3.0.12-indy", "2.5.18-indy"};
                 String[] ivyVersions = {"2.5.0", "2.4.0"};
                 try {
                     URL groovyJar = null;

base/org.codehaus.groovy30/.classpath

@@ -9,14 +9,14 @@
             <attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy30/lib/ivy-2.5.0-javadoc.jar!/" />
         </attributes>
     </classpathentry>
-    <classpathentry kind="lib" path="lib/groovy-3.0.11-indy.jar" sourcepath="lib/groovy-3.0.11-sources.jar" exported="true">
+    <classpathentry kind="lib" path="lib/groovy-3.0.12-indy.jar" sourcepath="lib/groovy-3.0.12-sources.jar" exported="true">
         <attributes>
-            <attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy30/lib/groovy-3.0.11-javadoc.jar!/" />
+            <attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy30/lib/groovy-3.0.12-javadoc.jar!/" />
         </attributes>
     </classpathentry>
-    <classpathentry kind="lib" path="lib/groovy-test-3.0.11-indy.jar" sourcepath="lib/groovy-test-3.0.11-sources.jar" exported="true">
+    <classpathentry kind="lib" path="lib/groovy-test-3.0.12-indy.jar" sourcepath="lib/groovy-test-3.0.12-sources.jar" exported="true">
         <attributes>
-            <attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy30/lib/groovy-test-3.0.11-javadoc.jar!/" />
+            <attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy30/lib/groovy-test-3.0.12-javadoc.jar!/" />
         </attributes>
     </classpathentry>
 

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

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

base/org.codehaus.groovy30/VERSION

@@ -17,3 +17,4 @@
 2021-09-06: GROOVY_3_0_9
 2022-03-03: GROOVY_3_0_10
 2022-05-30: GROOVY_3_0_11
+2022-07-20: GROOVY_3_0_12

base/org.codehaus.groovy30/about.html

@@ -24,12 +24,12 @@ <h3>License</h3>
 
 <h3>Third Party Content</h3>
 
-<h4>groovy-3.0.11-indy.jar</h4>
-<h4>groovy-test-3.0.11-indy.jar</h4>
+<h4>groovy-3.0.12-indy.jar</h4>
+<h4>groovy-test-3.0.12-indy.jar</h4>
 
 <ul>
-<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/3.0.11/distribution/apache-groovy-binary-3.0.11.zip">https://dist.apache.org/repos/dist/release/groovy/3.0.11/distribution/apache-groovy-binary-3.0.11.zip</a></li>
-<li>Sources available at: <a href="https://dist.apache.org/repos/dist/release/groovy/3.0.11/sources/apache-groovy-src-3.0.11.zip">https://dist.apache.org/repos/dist/release/groovy/3.0.11/sources/apache-groovy-src-3.0.11.zip</a></li>
+<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/3.0.12/distribution/apache-groovy-binary-3.0.12.zip">https://dist.apache.org/repos/dist/release/groovy/3.0.12/distribution/apache-groovy-binary-3.0.12.zip</a></li>
+<li>Sources available at: <a href="https://dist.apache.org/repos/dist/release/groovy/3.0.12/sources/apache-groovy-src-3.0.12.zip">https://dist.apache.org/repos/dist/release/groovy/3.0.12/sources/apache-groovy-src-3.0.12.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,14 +45,14 @@ <h4>ivy-2.5.0.jar</h4>
 <li>License text: <a href="about_files/asl2-license.txt">asl2-license.txt</a></li>
 </ul>
 
-<h4>groovy-console-3.0.11.jar</h4>
-<h4>groovy-groovysh-3.0.11.jar</h4>
-<h4>groovy-swing-3.0.11.jar</h4>
-<h4>groovy-templates-3.0.11.jar</h4>
-<h4>groovy-xml-3.0.11.jar</h4>
+<h4>groovy-console-3.0.12.jar</h4>
+<h4>groovy-groovysh-3.0.12.jar</h4>
+<h4>groovy-swing-3.0.12.jar</h4>
+<h4>groovy-templates-3.0.12.jar</h4>
+<h4>groovy-xml-3.0.12.jar</h4>
 
 <ul>
-<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/3.0.11/distribution/apache-groovy-binary-3.0.11.zip">https://dist.apache.org/repos/dist/release/groovy/3.0.11/distribution/apache-groovy-binary-3.0.11.zip</a></li>
+<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/3.0.12/distribution/apache-groovy-binary-3.0.12.zip">https://dist.apache.org/repos/dist/release/groovy/3.0.12/distribution/apache-groovy-binary-3.0.12.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>
@@ -61,7 +61,7 @@ <h4>groovy-xml-3.0.11.jar</h4>
 <h4>jline-2.14.6.jar</h4>
 
 <ul>
-<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/3.0.11/distribution/apache-groovy-binary-3.0.11.zip">https://dist.apache.org/repos/dist/release/groovy/3.0.11/distribution/apache-groovy-binary-3.0.11.zip</a></li>
+<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/3.0.12/distribution/apache-groovy-binary-3.0.12.zip">https://dist.apache.org/repos/dist/release/groovy/3.0.12/distribution/apache-groovy-binary-3.0.12.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.groovy30/build.antlr2x

@@ -1,7 +1,7 @@
 <project default="build">
 
     <target name="build" depends="clean">
-        <java classname="groovyjarjarantlr.Tool" classpath="../../../../../lib/groovy-3.0.11-indy.jar" dir="${basedir}" fork="true">
+        <java classname="groovyjarjarantlr.Tool" classpath="../../../../../lib/groovy-3.0.12-indy.jar" dir="${basedir}" fork="true">
             <arg line="-o parser groovy.g" />
         </java>
         <replaceregexp byline="true" flags="g" match="\bimport antlr." replace="import groovyjarjarantlr.">

base/org.codehaus.groovy30/pom.xml

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

base/org.codehaus.groovy30/src/GroovyParser.g4

@@ -1010,6 +1010,8 @@ options { baseContext = primary; }
     |   literal                                                                             #literalPrmrAlt
     |   gstring                                                                             #gstringPrmrAlt
     |   parExpression                                                                       #parenPrmrAlt
+    |   list                                                                                #listPrmrAlt
+    |   map                                                                                 #mapPrmrAlt
     ;
 
 namedArgPrimary