diff --git a/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovyCompilerTestSuite.java b/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovyCompilerTestSuite.java
index e2e3687a79..7c54e4ffb2 100644
--- a/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovyCompilerTestSuite.java
+++ b/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovyCompilerTestSuite.java
@@ -130,7 +130,7 @@ protected String[] getDefaultClassPaths() {
                 System.arraycopy(cps, 0, newcps, 0, cps.length);
 
                 String[] ivyVersions = {"2.5.0", "2.4.0"};
-                String[] groovyVersions = {"3.0.3-indy", "2.5.11-indy", "2.4.19"};
+                String[] groovyVersions = {"3.0.3-indy", "2.5.12-indy", "2.4.19"};
                 try {
                     URL groovyJar = null;
                     for (String groovyVer : groovyVersions) {
diff --git a/base/org.codehaus.groovy25/.classpath b/base/org.codehaus.groovy25/.classpath
index 6c51831e12..a02f5c34de 100644
--- a/base/org.codehaus.groovy25/.classpath
+++ b/base/org.codehaus.groovy25/.classpath
@@ -9,14 +9,14 @@
             <attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy25/lib/ivy-2.4.0-javadoc.jar!/" />
         </attributes>
     </classpathentry>
-    <classpathentry kind="lib" path="lib/groovy-2.5.11-indy.jar" sourcepath="lib/groovy-2.5.11-sources.jar" exported="true">
+    <classpathentry kind="lib" path="lib/groovy-2.5.12-indy.jar" sourcepath="lib/groovy-2.5.12-sources.jar" exported="true">
         <attributes>
-            <attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy25/lib/groovy-2.5.11-javadoc.jar!/" />
+            <attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy25/lib/groovy-2.5.12-javadoc.jar!/" />
         </attributes>
     </classpathentry>
-    <classpathentry kind="lib" path="lib/groovy-test-2.5.11-indy.jar" sourcepath="lib/groovy-test-2.5.11-sources.jar" exported="true">
+    <classpathentry kind="lib" path="lib/groovy-test-2.5.12-indy.jar" sourcepath="lib/groovy-test-2.5.12-sources.jar" exported="true">
         <attributes>
-            <attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy25/lib/groovy-test-2.5.11-javadoc.jar!/" />
+            <attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy25/lib/groovy-test-2.5.12-javadoc.jar!/" />
         </attributes>
     </classpathentry>
 
diff --git a/base/org.codehaus.groovy25/META-INF/MANIFEST.MF b/base/org.codehaus.groovy25/META-INF/MANIFEST.MF
index b66b333c05..56c4d28ddc 100644
--- a/base/org.codehaus.groovy25/META-INF/MANIFEST.MF
+++ b/base/org.codehaus.groovy25/META-INF/MANIFEST.MF
@@ -4,94 +4,94 @@ Bundle-SymbolicName: org.codehaus.groovy
 Automatic-Module-Name: org.codehaus.groovy
 Bundle-Name: Apache Groovy
 Bundle-Vendor: Pivotal Software, Inc.
-Bundle-Version: 2.5.11.qualifier
+Bundle-Version: 2.5.12.qualifier
 Bundle-ClassPath: eclipse-trace.jar,
  groovy-eclipse.jar,
  lib/ivy-2.4.0.jar,
- lib/groovy-2.5.11-indy.jar,
- lib/groovy-test-2.5.11-indy.jar
-Export-Package: groovy.beans;version="2.5.11",
- groovy.cli;version="2.5.11",
- groovy.grape;version="2.5.11",
- groovy.inspect;version="2.5.11",
- groovy.io;version="2.5.11",
- groovy.lang;version="2.5.11",
- groovy.mock.interceptor;version="2.5.11",
- groovy.security;version="2.5.11",
- groovy.test;version="2.5.11",
- groovy.time;version="2.5.11",
- groovy.transform;version="2.5.11",
- groovy.transform.builder;version="2.5.11",
- groovy.transform.options;version="2.5.11",
- groovy.transform.stc;version="2.5.11",
- groovy.ui;version="2.5.11",
- groovy.util;version="2.5.11",
- groovy.util.logging;version="2.5.11",
- groovy.xml;version="2.5.11",
+ lib/groovy-2.5.12-indy.jar,
+ lib/groovy-test-2.5.12-indy.jar
+Export-Package: groovy.beans;version="2.5.12",
+ groovy.cli;version="2.5.12",
+ groovy.grape;version="2.5.12",
+ groovy.inspect;version="2.5.12",
+ groovy.io;version="2.5.12",
+ groovy.lang;version="2.5.12",
+ groovy.mock.interceptor;version="2.5.12",
+ groovy.security;version="2.5.12",
+ groovy.test;version="2.5.12",
+ groovy.time;version="2.5.12",
+ groovy.transform;version="2.5.12",
+ groovy.transform.builder;version="2.5.12",
+ groovy.transform.options;version="2.5.12",
+ groovy.transform.stc;version="2.5.12",
+ groovy.ui;version="2.5.12",
+ groovy.util;version="2.5.12",
+ groovy.util.logging;version="2.5.12",
+ groovy.xml;version="2.5.12",
  groovyjarjarantlr;x-friends:="org.codehaus.groovy.eclipse.refactoring",
- org.apache.groovy.ast.tools;version="2.5.11",
- org.apache.groovy.io;version="2.5.11",
- org.apache.groovy.lang.annotation;version="2.5.11",
- org.apache.groovy.metaclass;version="2.5.11",
- org.apache.groovy.plugin;version="2.5.11",
- org.apache.groovy.util;version="2.5.11",
- org.apache.groovy.util.concurrentlinkedhashmap;version="2.5.11",
- org.codehaus.groovy;version="2.5.11",
- org.codehaus.groovy.antlr;version="2.5.11",
- org.codehaus.groovy.antlr.parser;version="2.5.11",
- org.codehaus.groovy.ast;version="2.5.11",
- org.codehaus.groovy.ast.builder;version="2.5.11",
- org.codehaus.groovy.ast.decompiled;version="2.5.11",
- org.codehaus.groovy.ast.expr;version="2.5.11",
- org.codehaus.groovy.ast.stmt;version="2.5.11",
- org.codehaus.groovy.ast.tools;version="2.5.11",
- org.codehaus.groovy.classgen;version="2.5.11",
- org.codehaus.groovy.classgen.asm;version="2.5.11",
- org.codehaus.groovy.classgen.asm.indy;version="2.5.11",
- org.codehaus.groovy.classgen.asm.indy.sc;version="2.5.11",
- org.codehaus.groovy.classgen.asm.sc;version="2.5.11",
- org.codehaus.groovy.classgen.asm.util;version="2.5.11",
- org.codehaus.groovy.control;version="2.5.11",
- org.codehaus.groovy.control.customizers;version="2.5.11",
- org.codehaus.groovy.control.customizers.builder;version="2.5.11",
- org.codehaus.groovy.control.io;version="2.5.11",
- org.codehaus.groovy.control.messages;version="2.5.11",
+ org.apache.groovy.ast.tools;version="2.5.12",
+ org.apache.groovy.io;version="2.5.12",
+ org.apache.groovy.lang.annotation;version="2.5.12",
+ org.apache.groovy.metaclass;version="2.5.12",
+ org.apache.groovy.plugin;version="2.5.12",
+ org.apache.groovy.util;version="2.5.12",
+ org.apache.groovy.util.concurrentlinkedhashmap;version="2.5.12",
+ org.codehaus.groovy;version="2.5.12",
+ org.codehaus.groovy.antlr;version="2.5.12",
+ org.codehaus.groovy.antlr.parser;version="2.5.12",
+ org.codehaus.groovy.ast;version="2.5.12",
+ org.codehaus.groovy.ast.builder;version="2.5.12",
+ org.codehaus.groovy.ast.decompiled;version="2.5.12",
+ org.codehaus.groovy.ast.expr;version="2.5.12",
+ org.codehaus.groovy.ast.stmt;version="2.5.12",
+ org.codehaus.groovy.ast.tools;version="2.5.12",
+ org.codehaus.groovy.classgen;version="2.5.12",
+ org.codehaus.groovy.classgen.asm;version="2.5.12",
+ org.codehaus.groovy.classgen.asm.indy;version="2.5.12",
+ org.codehaus.groovy.classgen.asm.indy.sc;version="2.5.12",
+ org.codehaus.groovy.classgen.asm.sc;version="2.5.12",
+ org.codehaus.groovy.classgen.asm.util;version="2.5.12",
+ org.codehaus.groovy.control;version="2.5.12",
+ org.codehaus.groovy.control.customizers;version="2.5.12",
+ org.codehaus.groovy.control.customizers.builder;version="2.5.12",
+ org.codehaus.groovy.control.io;version="2.5.12",
+ org.codehaus.groovy.control.messages;version="2.5.12",
  org.codehaus.groovy.eclipse,
- org.codehaus.groovy.plugin;version="2.5.11",
- org.codehaus.groovy.reflection;version="2.5.11",
- org.codehaus.groovy.reflection.android;version="2.5.11",
- org.codehaus.groovy.reflection.stdclasses;version="2.5.11",
- org.codehaus.groovy.reflection.v7;version="2.5.11",
- org.codehaus.groovy.runtime;version="2.5.11",
- org.codehaus.groovy.runtime.callsite;version="2.5.11",
- org.codehaus.groovy.runtime.dgmimpl;version="2.5.11",
- org.codehaus.groovy.runtime.dgmimpl.arrays;version="2.5.11",
- org.codehaus.groovy.runtime.m12n;version="2.5.11",
- org.codehaus.groovy.runtime.memoize;version="2.5.11",
- org.codehaus.groovy.runtime.metaclass;version="2.5.11",
- org.codehaus.groovy.runtime.powerassert;version="2.5.11",
- org.codehaus.groovy.runtime.typehandling;version="2.5.11",
- org.codehaus.groovy.runtime.wrappers;version="2.5.11",
- org.codehaus.groovy.syntax;version="2.5.11",
- org.codehaus.groovy.tools;version="2.5.11",
- org.codehaus.groovy.tools.ast;version="2.5.11",
- org.codehaus.groovy.tools.gse;version="2.5.11",
- org.codehaus.groovy.tools.javac;version="2.5.11",
- org.codehaus.groovy.tools.shell;version="2.5.11",
- org.codehaus.groovy.tools.shell.util;version="2.5.11",
- org.codehaus.groovy.transform;version="2.5.11",
- org.codehaus.groovy.transform.sc;version="2.5.11",
- org.codehaus.groovy.transform.sc.transformers;version="2.5.11",
- org.codehaus.groovy.transform.stc;version="2.5.11",
- org.codehaus.groovy.transform.tailrec;version="2.5.11",
- org.codehaus.groovy.transform.trait;version="2.5.11",
- org.codehaus.groovy.util;version="2.5.11",
- org.codehaus.groovy.vmplugin;version="2.5.11",
- org.codehaus.groovy.vmplugin.v5;version="2.5.11",
- org.codehaus.groovy.vmplugin.v6;version="2.5.11",
- org.codehaus.groovy.vmplugin.v7;version="2.5.11",
- org.codehaus.groovy.vmplugin.v8;version="2.5.11",
- org.codehaus.groovy.vmplugin.v9;version="2.5.11"
+ org.codehaus.groovy.plugin;version="2.5.12",
+ org.codehaus.groovy.reflection;version="2.5.12",
+ org.codehaus.groovy.reflection.android;version="2.5.12",
+ org.codehaus.groovy.reflection.stdclasses;version="2.5.12",
+ org.codehaus.groovy.reflection.v7;version="2.5.12",
+ org.codehaus.groovy.runtime;version="2.5.12",
+ org.codehaus.groovy.runtime.callsite;version="2.5.12",
+ org.codehaus.groovy.runtime.dgmimpl;version="2.5.12",
+ org.codehaus.groovy.runtime.dgmimpl.arrays;version="2.5.12",
+ org.codehaus.groovy.runtime.m12n;version="2.5.12",
+ org.codehaus.groovy.runtime.memoize;version="2.5.12",
+ org.codehaus.groovy.runtime.metaclass;version="2.5.12",
+ org.codehaus.groovy.runtime.powerassert;version="2.5.12",
+ org.codehaus.groovy.runtime.typehandling;version="2.5.12",
+ org.codehaus.groovy.runtime.wrappers;version="2.5.12",
+ org.codehaus.groovy.syntax;version="2.5.12",
+ org.codehaus.groovy.tools;version="2.5.12",
+ org.codehaus.groovy.tools.ast;version="2.5.12",
+ org.codehaus.groovy.tools.gse;version="2.5.12",
+ org.codehaus.groovy.tools.javac;version="2.5.12",
+ org.codehaus.groovy.tools.shell;version="2.5.12",
+ org.codehaus.groovy.tools.shell.util;version="2.5.12",
+ org.codehaus.groovy.transform;version="2.5.12",
+ org.codehaus.groovy.transform.sc;version="2.5.12",
+ org.codehaus.groovy.transform.sc.transformers;version="2.5.12",
+ org.codehaus.groovy.transform.stc;version="2.5.12",
+ org.codehaus.groovy.transform.tailrec;version="2.5.12",
+ org.codehaus.groovy.transform.trait;version="2.5.12",
+ org.codehaus.groovy.util;version="2.5.12",
+ org.codehaus.groovy.vmplugin;version="2.5.12",
+ org.codehaus.groovy.vmplugin.v5;version="2.5.12",
+ org.codehaus.groovy.vmplugin.v6;version="2.5.12",
+ org.codehaus.groovy.vmplugin.v7;version="2.5.12",
+ org.codehaus.groovy.vmplugin.v8;version="2.5.12",
+ org.codehaus.groovy.vmplugin.v9;version="2.5.12"
 Require-Bundle: org.eclipse.core.runtime,
  org.junit;resolution:=optional
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/base/org.codehaus.groovy25/VERSION b/base/org.codehaus.groovy25/VERSION
index bc63bb89c1..3f395285ea 100644
--- a/base/org.codehaus.groovy25/VERSION
+++ b/base/org.codehaus.groovy25/VERSION
@@ -17,3 +17,4 @@
 2020-01-14: GROOVY_2_5_9
 2020-03-06: GROOVY_2_5_10
 2020-04-10: GROOVY_2_5_11
+2020-05-21: GROOVY_2_5_12
diff --git a/base/org.codehaus.groovy25/about.html b/base/org.codehaus.groovy25/about.html
index ca7adc2c8f..8f67436d0c 100644
--- a/base/org.codehaus.groovy25/about.html
+++ b/base/org.codehaus.groovy25/about.html
@@ -24,12 +24,12 @@ <h3>License</h3>
 
 <h3>Third Party Content</h3>
 
-<h4>groovy-2.5.11-indy.jar</h4>
-<h4>groovy-test-2.5.11-indy.jar</h4>
+<h4>groovy-2.5.12-indy.jar</h4>
+<h4>groovy-test-2.5.12-indy.jar</h4>
 
 <ul>
-<li>Obtained from: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-binary-2.5.11.zip">https://dl.bintray.com/groovy/maven/apache-groovy-binary-2.5.11.zip</a></li>
-<li>Sources available at: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-src-2.5.11.zip">https://dl.bintray.com/groovy/maven/apache-groovy-src-2.5.11.zip</a></li>
+<li>Obtained from: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-binary-2.5.12.zip">https://dl.bintray.com/groovy/maven/apache-groovy-binary-2.5.12.zip</a></li>
+<li>Sources available at: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-src-2.5.12.zip">https://dl.bintray.com/groovy/maven/apache-groovy-src-2.5.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,16 +45,16 @@ <h4>ivy-2.4.0.jar</h4>
 <li>License text: <a href="about_files/asl2-license.txt">asl2-license.txt</a></li>
 </ul>
 
-<h4>groovy-cli-picocli-2.5.11.jar</h4>
-<h4>groovy-console-2.5.11.jar</h4>
-<h4>groovy-groovysh-2.5.11.jar</h4>
-<h4>groovy-swing-2.5.11.jar</h4>
-<h4>groovy-templates-2.5.11.jar</h4>
-<h4>groovy-xml-2.5.11.jar</h4>
-<h4>picocli-4.0.1.jar</h4>
+<h4>groovy-cli-picocli-2.5.12.jar</h4>
+<h4>groovy-console-2.5.12.jar</h4>
+<h4>groovy-groovysh-2.5.12.jar</h4>
+<h4>groovy-swing-2.5.12.jar</h4>
+<h4>groovy-templates-2.5.12.jar</h4>
+<h4>groovy-xml-2.5.12.jar</h4>
+<h4>picocli-4.3.2.jar</h4>
 
 <ul>
-<li>Obtained from: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-sdk-2.5.11.zip">https://dl.bintray.com/groovy/maven/apache-groovy-sdk-2.5.11.zip</a></li>
+<li>Obtained from: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-sdk-2.5.12.zip">https://dl.bintray.com/groovy/maven/apache-groovy-sdk-2.5.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>
@@ -63,7 +63,7 @@ <h4>picocli-4.0.1.jar</h4>
 <h4>jline-2.14.6.jar</h4>
 
 <ul>
-<li>Obtained from: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-sdk-2.5.11.zip">https://dl.bintray.com/groovy/maven/apache-groovy-sdk-2.5.11.zip</a></li>
+<li>Obtained from: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-sdk-2.5.12.zip">https://dl.bintray.com/groovy/maven/apache-groovy-sdk-2.5.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>
diff --git a/base/org.codehaus.groovy25/build.antlr2x b/base/org.codehaus.groovy25/build.antlr2x
index 077e72dc3e..3ab771b8c4 100644
--- a/base/org.codehaus.groovy25/build.antlr2x
+++ b/base/org.codehaus.groovy25/build.antlr2x
@@ -1,7 +1,7 @@
 <project default="build">
 
     <target name="build" depends="clean">
-        <java classname="groovyjarjarantlr.Tool" classpath="../../../../../lib/groovy-2.5.11-indy.jar" dir="${basedir}" fork="true">
+        <java classname="groovyjarjarantlr.Tool" classpath="../../../../../lib/groovy-2.5.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.">
diff --git a/base/org.codehaus.groovy25/lib/console/groovy-cli-picocli-2.5.11.jar b/base/org.codehaus.groovy25/lib/console/groovy-cli-picocli-2.5.12.jar
similarity index 85%
rename from base/org.codehaus.groovy25/lib/console/groovy-cli-picocli-2.5.11.jar
rename to base/org.codehaus.groovy25/lib/console/groovy-cli-picocli-2.5.12.jar
index e442ab3223..fcf3bba9ed 100644
Binary files a/base/org.codehaus.groovy25/lib/console/groovy-cli-picocli-2.5.11.jar and b/base/org.codehaus.groovy25/lib/console/groovy-cli-picocli-2.5.12.jar differ
diff --git a/base/org.codehaus.groovy25/lib/console/groovy-console-2.5.11.jar b/base/org.codehaus.groovy25/lib/console/groovy-console-2.5.12.jar
similarity index 92%
rename from base/org.codehaus.groovy25/lib/console/groovy-console-2.5.11.jar
rename to base/org.codehaus.groovy25/lib/console/groovy-console-2.5.12.jar
index ed9aa0987d..0e6961d6ce 100644
Binary files a/base/org.codehaus.groovy25/lib/console/groovy-console-2.5.11.jar and b/base/org.codehaus.groovy25/lib/console/groovy-console-2.5.12.jar differ
diff --git a/base/org.codehaus.groovy25/lib/console/groovy-swing-2.5.11.jar b/base/org.codehaus.groovy25/lib/console/groovy-swing-2.5.12.jar
similarity index 91%
rename from base/org.codehaus.groovy25/lib/console/groovy-swing-2.5.11.jar
rename to base/org.codehaus.groovy25/lib/console/groovy-swing-2.5.12.jar
index 01bac051cc..1a30995d0f 100644
Binary files a/base/org.codehaus.groovy25/lib/console/groovy-swing-2.5.11.jar and b/base/org.codehaus.groovy25/lib/console/groovy-swing-2.5.12.jar differ
diff --git a/base/org.codehaus.groovy25/lib/console/groovy-templates-2.5.11.jar b/base/org.codehaus.groovy25/lib/console/groovy-templates-2.5.12.jar
similarity index 91%
rename from base/org.codehaus.groovy25/lib/console/groovy-templates-2.5.11.jar
rename to base/org.codehaus.groovy25/lib/console/groovy-templates-2.5.12.jar
index f9b8d97e9a..227048de19 100644
Binary files a/base/org.codehaus.groovy25/lib/console/groovy-templates-2.5.11.jar and b/base/org.codehaus.groovy25/lib/console/groovy-templates-2.5.12.jar differ
diff --git a/base/org.codehaus.groovy25/lib/console/groovy-xml-2.5.11.jar b/base/org.codehaus.groovy25/lib/console/groovy-xml-2.5.12.jar
similarity index 91%
rename from base/org.codehaus.groovy25/lib/console/groovy-xml-2.5.11.jar
rename to base/org.codehaus.groovy25/lib/console/groovy-xml-2.5.12.jar
index 0aeaaeddfa..b331138606 100644
Binary files a/base/org.codehaus.groovy25/lib/console/groovy-xml-2.5.11.jar and b/base/org.codehaus.groovy25/lib/console/groovy-xml-2.5.12.jar differ
diff --git a/base/org.codehaus.groovy25/lib/console/picocli-4.0.1.jar b/base/org.codehaus.groovy25/lib/console/picocli-4.0.1.jar
deleted file mode 100644
index 2eaf257530..0000000000
Binary files a/base/org.codehaus.groovy25/lib/console/picocli-4.0.1.jar and /dev/null differ
diff --git a/base/org.codehaus.groovy25/lib/console/picocli-4.3.2.jar b/base/org.codehaus.groovy25/lib/console/picocli-4.3.2.jar
new file mode 100644
index 0000000000..f338506d0a
Binary files /dev/null and b/base/org.codehaus.groovy25/lib/console/picocli-4.3.2.jar differ
diff --git a/base/org.codehaus.groovy25/lib/groovy-2.5.11-indy.jar b/base/org.codehaus.groovy25/lib/groovy-2.5.12-indy.jar
similarity index 85%
rename from base/org.codehaus.groovy25/lib/groovy-2.5.11-indy.jar
rename to base/org.codehaus.groovy25/lib/groovy-2.5.12-indy.jar
index 2430d4a24d..e50d141662 100644
Binary files a/base/org.codehaus.groovy25/lib/groovy-2.5.11-indy.jar and b/base/org.codehaus.groovy25/lib/groovy-2.5.12-indy.jar differ
diff --git a/base/org.codehaus.groovy25/lib/groovy-2.5.11-javadoc.jar b/base/org.codehaus.groovy25/lib/groovy-2.5.12-javadoc.jar
similarity index 50%
rename from base/org.codehaus.groovy25/lib/groovy-2.5.11-javadoc.jar
rename to base/org.codehaus.groovy25/lib/groovy-2.5.12-javadoc.jar
index 75b4fd213d..f5a242d67d 100644
Binary files a/base/org.codehaus.groovy25/lib/groovy-2.5.11-javadoc.jar and b/base/org.codehaus.groovy25/lib/groovy-2.5.12-javadoc.jar differ
diff --git a/base/org.codehaus.groovy25/lib/groovy-2.5.11-sources.jar b/base/org.codehaus.groovy25/lib/groovy-2.5.12-sources.jar
similarity index 91%
rename from base/org.codehaus.groovy25/lib/groovy-2.5.11-sources.jar
rename to base/org.codehaus.groovy25/lib/groovy-2.5.12-sources.jar
index 8b374d3eac..4543d008d0 100644
Binary files a/base/org.codehaus.groovy25/lib/groovy-2.5.11-sources.jar and b/base/org.codehaus.groovy25/lib/groovy-2.5.12-sources.jar differ
diff --git a/base/org.codehaus.groovy25/lib/groovy-test-2.5.11-indy.jar b/base/org.codehaus.groovy25/lib/groovy-test-2.5.12-indy.jar
similarity index 91%
rename from base/org.codehaus.groovy25/lib/groovy-test-2.5.11-indy.jar
rename to base/org.codehaus.groovy25/lib/groovy-test-2.5.12-indy.jar
index 1a3a3d58be..f60b4e3840 100644
Binary files a/base/org.codehaus.groovy25/lib/groovy-test-2.5.11-indy.jar and b/base/org.codehaus.groovy25/lib/groovy-test-2.5.12-indy.jar differ
diff --git a/base/org.codehaus.groovy25/lib/groovy-test-2.5.11-javadoc.jar b/base/org.codehaus.groovy25/lib/groovy-test-2.5.12-javadoc.jar
similarity index 81%
rename from base/org.codehaus.groovy25/lib/groovy-test-2.5.11-javadoc.jar
rename to base/org.codehaus.groovy25/lib/groovy-test-2.5.12-javadoc.jar
index b4849803b0..bd9a8b6ff6 100644
Binary files a/base/org.codehaus.groovy25/lib/groovy-test-2.5.11-javadoc.jar and b/base/org.codehaus.groovy25/lib/groovy-test-2.5.12-javadoc.jar differ
diff --git a/base/org.codehaus.groovy25/lib/groovy-test-2.5.11-sources.jar b/base/org.codehaus.groovy25/lib/groovy-test-2.5.12-sources.jar
similarity index 89%
rename from base/org.codehaus.groovy25/lib/groovy-test-2.5.11-sources.jar
rename to base/org.codehaus.groovy25/lib/groovy-test-2.5.12-sources.jar
index 524f8a3edf..86e18561b7 100644
Binary files a/base/org.codehaus.groovy25/lib/groovy-test-2.5.11-sources.jar and b/base/org.codehaus.groovy25/lib/groovy-test-2.5.12-sources.jar differ
diff --git a/base/org.codehaus.groovy25/lib/shell/groovy-cli-picocli-2.5.11.jar b/base/org.codehaus.groovy25/lib/shell/groovy-cli-picocli-2.5.12.jar
similarity index 85%
rename from base/org.codehaus.groovy25/lib/shell/groovy-cli-picocli-2.5.11.jar
rename to base/org.codehaus.groovy25/lib/shell/groovy-cli-picocli-2.5.12.jar
index e442ab3223..fcf3bba9ed 100644
Binary files a/base/org.codehaus.groovy25/lib/shell/groovy-cli-picocli-2.5.11.jar and b/base/org.codehaus.groovy25/lib/shell/groovy-cli-picocli-2.5.12.jar differ
diff --git a/base/org.codehaus.groovy25/lib/shell/groovy-groovysh-2.5.11.jar b/base/org.codehaus.groovy25/lib/shell/groovy-groovysh-2.5.12.jar
similarity index 93%
rename from base/org.codehaus.groovy25/lib/shell/groovy-groovysh-2.5.11.jar
rename to base/org.codehaus.groovy25/lib/shell/groovy-groovysh-2.5.12.jar
index 5b00b6fb3c..48dfc3c7e9 100644
Binary files a/base/org.codehaus.groovy25/lib/shell/groovy-groovysh-2.5.11.jar and b/base/org.codehaus.groovy25/lib/shell/groovy-groovysh-2.5.12.jar differ
diff --git a/base/org.codehaus.groovy25/lib/shell/picocli-4.0.1.jar b/base/org.codehaus.groovy25/lib/shell/picocli-4.0.1.jar
deleted file mode 100644
index 2eaf257530..0000000000
Binary files a/base/org.codehaus.groovy25/lib/shell/picocli-4.0.1.jar and /dev/null differ
diff --git a/base/org.codehaus.groovy25/lib/shell/picocli-4.3.2.jar b/base/org.codehaus.groovy25/lib/shell/picocli-4.3.2.jar
new file mode 100644
index 0000000000..f338506d0a
Binary files /dev/null and b/base/org.codehaus.groovy25/lib/shell/picocli-4.3.2.jar differ
diff --git a/base/org.codehaus.groovy25/pom.xml b/base/org.codehaus.groovy25/pom.xml
index 0b68edb231..b41e6ab232 100644
--- a/base/org.codehaus.groovy25/pom.xml
+++ b/base/org.codehaus.groovy25/pom.xml
@@ -8,7 +8,7 @@
   </parent>
   <groupId>org.codehaus.groovy.eclipse</groupId>
   <artifactId>org.codehaus.groovy</artifactId>
-  <version>2.5.11-SNAPSHOT</version>
+  <version>2.5.12-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/base/org.codehaus.groovy25/src/org/codehaus/groovy/classgen/AsmClassGenerator.java b/base/org.codehaus.groovy25/src/org/codehaus/groovy/classgen/AsmClassGenerator.java
index 971912ecc7..ad675a3939 100644
--- a/base/org.codehaus.groovy25/src/org/codehaus/groovy/classgen/AsmClassGenerator.java
+++ b/base/org.codehaus.groovy25/src/org/codehaus/groovy/classgen/AsmClassGenerator.java
@@ -979,11 +979,11 @@ private void visitAttributeOrProperty(PropertyExpression expression, MethodCalle
                         if (field==null && classNode instanceof InnerClassNode) {
                             ClassNode outer = classNode.getOuterClass();
                             FieldNode outerClassField;
-                            while (outer!=null) {
+                            while (outer != null) {
                                 outerClassField = outer.getDeclaredField(name);
-                                if (outerClassField!=null && outerClassField.isStatic()/*GROOVY-9501 && outerClassField.isFinal()*/) {
-                                    if (outer!=classNode.getOuterClass() && outerClassField.isPrivate()) {
-                                        throw new GroovyBugError("Trying to access private constant field ["+outerClassField.getDeclaringClass()+"#"+outerClassField.getName()+"] from inner class");
+                                if (outerClassField != null && outerClassField.isStatic()) {
+                                    if (outer != classNode.getOuterClass() && outerClassField.isPrivate()) {
+                                        throw new GroovyBugError("Trying to access private field [" + outerClassField.getDeclaringClass() + "#" + outerClassField.getName() + "] from inner class");
                                     }
                                     PropertyExpression pexp = new PropertyExpression(
                                             new ClassExpression(outer),
diff --git a/base/org.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/base/org.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index c55d511187..a4c1d29363 100644
--- a/base/org.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/base/org.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -1171,34 +1171,15 @@ private boolean addedReadOnlyPropertyError(Expression expr) {
         return true;
     }
 
-    private void addPrecisionErrors(ClassNode leftRedirect, ClassNode lhsType, ClassNode inferredrhsType, Expression rightExpression) {
-        if (isNumberType(leftRedirect) && isNumberType(inferredrhsType)) {
-            if (checkPossibleLossOfPrecision(leftRedirect, inferredrhsType, rightExpression)) {
-                addStaticTypeError("Possible loss of precision from " + inferredrhsType + " to " + leftRedirect, rightExpression);
+    private void addPrecisionErrors(ClassNode leftRedirect, ClassNode lhsType, ClassNode rhsType, Expression rightExpression) {
+        if (isNumberType(leftRedirect)) {
+            if (isNumberType(rhsType) && checkPossibleLossOfPrecision(leftRedirect, rhsType, rightExpression)) {
+                addStaticTypeError("Possible loss of precision from " + rhsType.toString(false) + " to " + lhsType.toString(false), rightExpression);
                 return;
             }
         }
-        // if left type is array, we should check the right component types
-        /* GRECLIPSE edit -- GROOVY-9517
-        if (!lhsType.isArray()) return;
-        ClassNode leftComponentType = lhsType.getComponentType();
-        ClassNode rightRedirect = rightExpression.getType().redirect();
-        if (rightRedirect.isArray()) {
-            ClassNode rightComponentType = rightRedirect.getComponentType();
-            if (!checkCompatibleAssignmentTypes(leftComponentType, rightComponentType)) {
-                addStaticTypeError("Cannot assign value of type " + rightComponentType.toString(false) + " into array of type " + lhsType.toString(false), rightExpression);
-            }
-        } else if (rightExpression instanceof ListExpression) {
-            for (Expression element : ((ListExpression) rightExpression).getExpressions()) {
-                ClassNode rightComponentType = this.getType(element);
-                if (!checkCompatibleAssignmentTypes(leftComponentType, rightComponentType)
-                        && !(isNullConstant(element) && !isPrimitiveType(leftComponentType))) {
-                    addStaticTypeError("Cannot assign value of type " + rightComponentType.toString(false) + " into array of type " + lhsType.toString(false), rightExpression);
-                }
-            }
-        }
-        */
         if (!leftRedirect.isArray()) return;
+        // left type is array, check the right component types
         if (rightExpression instanceof ListExpression) {
             ClassNode leftComponentType = leftRedirect.getComponentType();
             for (Expression expression : ((ListExpression) rightExpression).getExpressions()) {
@@ -1207,14 +1188,13 @@ private void addPrecisionErrors(ClassNode leftRedirect, ClassNode lhsType, Class
                     addStaticTypeError("Cannot assign value of type " + rightComponentType.toString(false) + " into array of type " + lhsType.toString(false), rightExpression);
                 }
             }
-        } else if (inferredrhsType.redirect().isArray()) {
+        } else if (rhsType.redirect().isArray()) {
             ClassNode leftComponentType = leftRedirect.getComponentType();
-            ClassNode rightComponentType = inferredrhsType.redirect().getComponentType();
+            ClassNode rightComponentType = rhsType.redirect().getComponentType();
             if (!checkCompatibleAssignmentTypes(leftComponentType, rightComponentType)) {
                 addStaticTypeError("Cannot assign value of type " + rightComponentType.toString(false) + " into array of type " + lhsType.toString(false), rightExpression);
             }
         }
-        // GRECLIPSE end
     }
 
     private void addListAssignmentConstructorErrors(
@@ -1506,7 +1486,7 @@ protected boolean existsProperty(final PropertyExpression pexp, final boolean re
         HashSet<ClassNode> handledNodes = new HashSet<ClassNode>();
         for (Receiver<String> receiver : receivers) {
             ClassNode testClass = receiver.getType();
-            // GRECLIPSE add
+
             if (testClass.isArray() && "length".equals(propertyName)) {
                 storeType(pexp, int_TYPE);
                 if (visitor != null) {
@@ -1515,7 +1495,7 @@ protected boolean existsProperty(final PropertyExpression pexp, final boolean re
                 }
                 return true;
             }
-            // GRECLIPSE end
+
             LinkedList<ClassNode> queue = new LinkedList<>();
             queue.add(testClass);
             if (isPrimitiveType(testClass)) {
@@ -2271,9 +2251,6 @@ protected void addClosureReturnType(ClassNode returnType) {
     public void visitConstructorCallExpression(ConstructorCallExpression call) {
         typeCheckingContext.pushEnclosingConstructorCall(call);
         try {
-            /* GRECLIPSE edit -- GROOVY-9518
-            super.visitConstructorCallExpression(call);
-            */
             if (extension.beforeMethodCall(call)) {
                 extension.afterMethodCall(call);
                 return;
@@ -2288,9 +2265,7 @@ public void visitConstructorCallExpression(ConstructorCallExpression call) {
             ArgumentListExpression argumentList = InvocationWriter.makeArgumentList(arguments);
 
             checkForbiddenSpreadArgument(argumentList);
-            // GRECLIPSE add -- GROOVY-9518
             visitMethodCallArguments(receiver, argumentList, false, null);
-            // GRECLIPSE end
 
             ClassNode[] args = getArgumentTypes(argumentList);
             if (args.length > 0 &&
@@ -2324,9 +2299,7 @@ && findMethod(receiver, "<init>", args).isEmpty()) {
                 }
                 if (node != null) {
                     storeTargetMethod(call, node);
-                    // GRECLIPSE add -- GROOVY-9518
                     visitMethodCallArguments(receiver, argumentList, true, node);
-                    // GRECLIPSE end
                 }
             }
             // GRECLIPSE add -- GROOVY-9327: check for AIC in STC method with non-STC enclosing class
diff --git a/extras/groovy-eclipse-batch-builder/build.properties b/extras/groovy-eclipse-batch-builder/build.properties
index 883b207a93..d179d61abf 100644
--- a/extras/groovy-eclipse-batch-builder/build.properties
+++ b/extras/groovy-eclipse-batch-builder/build.properties
@@ -1,6 +1,6 @@
 # version numbers
 version2.4=2.4.19-02
-version2.5=2.5.11-01
+version2.5=2.5.12-01
 version3.0=3.0.3-01
 
 # uncomment to do a particular build -- only one should be uncommented at a time
diff --git a/extras/groovy-eclipse-quickstart/src/main/resources/archetype-resources/pom.xml b/extras/groovy-eclipse-quickstart/src/main/resources/archetype-resources/pom.xml
index d6438fa89b..a51f18c6f4 100755
--- a/extras/groovy-eclipse-quickstart/src/main/resources/archetype-resources/pom.xml
+++ b/extras/groovy-eclipse-quickstart/src/main/resources/archetype-resources/pom.xml
@@ -19,13 +19,13 @@
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy</artifactId>
-      <version>2.5.11</version>
+      <version>2.5.12</version>
       <classifier>indy</classifier>
     </dependency>
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy-test</artifactId>
-      <version>2.5.11</version>
+      <version>2.5.12</version>
       <classifier>indy</classifier>
       <exclusions>
         <exclusion>
@@ -58,7 +58,7 @@
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-eclipse-batch</artifactId>
-            <version>2.5.11-01</version>
+            <version>2.5.12-01</version>
           </dependency>
         </dependencies>
       </plugin>
diff --git a/ide/Feature-org.codehaus.groovy25.feature/feature.xml b/ide/Feature-org.codehaus.groovy25.feature/feature.xml
index fa5a26a3f8..d459a37789 100644
--- a/ide/Feature-org.codehaus.groovy25.feature/feature.xml
+++ b/ide/Feature-org.codehaus.groovy25.feature/feature.xml
@@ -22,7 +22,7 @@
          id="org.codehaus.groovy"
          download-size="0"
          install-size="0"
-         version="2.5.11.qualifier"
+         version="2.5.12.qualifier"
    />
 
    <plugin