Skip to content

Commit

Permalink
Update the Groovy plug-in to 2.5.12
Browse files Browse the repository at this point in the history 
#1114
  • Loading branch information
@eric-milles
eric-milles committed May 21, 2020
1 parent aff7837 commit bc4fca7
Show file tree
Hide file tree
Showing 29 changed files with 122 additions and 148 deletions.
2 changes: 1 addition & 1 deletion ...e.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovyCompilerTestSuite.java
View file
Expand Up @@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions base/org.codehaus.groovy25/.classpath
View file
Expand Up @@ -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>

Expand Down
166 changes: 83 additions & 83 deletions base/org.codehaus.groovy25/META-INF/MANIFEST.MF
View file
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions base/org.codehaus.groovy25/VERSION
View file
Expand Up @@ -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
26 changes: 13 additions & 13 deletions base/org.codehaus.groovy25/about.html
View file
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion base/org.codehaus.groovy25/build.antlr2x
View file
@@ -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.">
Expand Down
Binary file renamed ...lib/console/groovy-cli-picocli-2.5.11.jar → ...lib/console/groovy-cli-picocli-2.5.12.jar
View file
Binary file not shown.
Binary file renamed ...y25/lib/console/groovy-console-2.5.11.jar → ...y25/lib/console/groovy-console-2.5.12.jar
View file
Binary file not shown.
Binary file renamed ...ovy25/lib/console/groovy-swing-2.5.11.jar → ...ovy25/lib/console/groovy-swing-2.5.12.jar
View file
Binary file not shown.
Binary file renamed ...5/lib/console/groovy-templates-2.5.11.jar → ...5/lib/console/groovy-templates-2.5.12.jar
View file
Binary file not shown.
Binary file renamed ...roovy25/lib/console/groovy-xml-2.5.11.jar → ...roovy25/lib/console/groovy-xml-2.5.12.jar
View file
Binary file not shown.
Binary file removed base/org.codehaus.groovy25/lib/console/picocli-4.0.1.jar
View file
Binary file not shown.
Binary file added base/org.codehaus.groovy25/lib/console/picocli-4.3.2.jar
View file
Binary file not shown.
Binary file renamed ...ehaus.groovy25/lib/groovy-2.5.11-indy.jar → ...ehaus.groovy25/lib/groovy-2.5.12-indy.jar
View file
Binary file not shown.
Binary file renamed ...us.groovy25/lib/groovy-2.5.11-javadoc.jar → ...us.groovy25/lib/groovy-2.5.12-javadoc.jar
View file
Binary file not shown.
Binary file renamed ...us.groovy25/lib/groovy-2.5.11-sources.jar → ...us.groovy25/lib/groovy-2.5.12-sources.jar
View file
Binary file not shown.
Binary file renamed ....groovy25/lib/groovy-test-2.5.11-indy.jar → ....groovy25/lib/groovy-test-2.5.12-indy.jar
View file
Binary file not shown.
Binary file renamed ...oovy25/lib/groovy-test-2.5.11-javadoc.jar → ...oovy25/lib/groovy-test-2.5.12-javadoc.jar
View file
Binary file not shown.
Binary file renamed ...oovy25/lib/groovy-test-2.5.11-sources.jar → ...oovy25/lib/groovy-test-2.5.12-sources.jar
View file
Binary file not shown.
Binary file renamed ...5/lib/shell/groovy-cli-picocli-2.5.11.jar → ...5/lib/shell/groovy-cli-picocli-2.5.12.jar
View file
Binary file not shown.
Binary file renamed ...vy25/lib/shell/groovy-groovysh-2.5.11.jar → ...vy25/lib/shell/groovy-groovysh-2.5.12.jar
View file
Binary file not shown.
Binary file removed base/org.codehaus.groovy25/lib/shell/picocli-4.0.1.jar
View file
Binary file not shown.
Binary file added base/org.codehaus.groovy25/lib/shell/picocli-4.3.2.jar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion base/org.codehaus.groovy25/pom.xml
View file
Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions base/org.codehaus.groovy25/src/org/codehaus/groovy/classgen/AsmClassGenerator.java
View file
Expand Up @@ -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),
Expand Down

0 comments on commit bc4fca7

Please sign in to comment.