From 066488d89501b52903f809ea1a04cf6ad6015b3b Mon Sep 17 00:00:00 2001 From: Eric Milles Date: Tue, 14 Jan 2020 12:34:48 -0600 Subject: [PATCH] Update the Groovy plug-in to 2.5.9 #1009 --- .../tests/basic/GroovyCompilerTestSuite.java | 2 +- .../codehaus/groovy/vmplugin/v5/Java5.java | 5 +- base/org.codehaus.groovy25/.checkstyle | 1 - base/org.codehaus.groovy25/.classpath | 8 +- .../META-INF/MANIFEST.MF | 170 ++--- base/org.codehaus.groovy25/VERSION | 1 + base/org.codehaus.groovy25/about.html | 8 +- base/org.codehaus.groovy25/build.antlr2x | 2 +- .../lib/groovy-2.5.8-javadoc.jar | Bin 6288662 -> 0 bytes ...y-2.5.8-indy.jar => groovy-2.5.9-indy.jar} | Bin 5548389 -> 5561993 bytes .../lib/groovy-2.5.9-javadoc.jar | Bin 0 -> 6319110 bytes ...8-sources.jar => groovy-2.5.9-sources.jar} | Bin 2440902 -> 2450511 bytes .../lib/groovy-test-2.5.8-indy.jar | Bin 80626 -> 0 bytes .../lib/groovy-test-2.5.9-indy.jar | Bin 0 -> 80381 bytes ...adoc.jar => groovy-test-2.5.9-javadoc.jar} | Bin 459166 -> 460602 bytes ...rces.jar => groovy-test-2.5.9-sources.jar} | Bin 40311 -> 40312 bytes base/org.codehaus.groovy25/pom.xml | 2 +- .../src/groovy/grape/GrapeIvy.groovy | 120 ++-- .../groovy/antlr/AntlrParserPlugin.java | 500 +++++--------- .../groovy/ast/ClassCodeVisitorSupport.java | 1 - .../org/codehaus/groovy/ast/GenericsType.java | 2 +- .../org/codehaus/groovy/ast/MethodNode.java | 17 +- .../org/codehaus/groovy/ast/ModuleNode.java | 28 +- .../groovy/classgen/VariableScopeVisitor.java | 627 ------------------ .../groovy/classgen/asm/StatementWriter.java | 18 +- .../asm/sc/StaticInvocationWriter.java | 10 +- .../asm/sc/StaticPropertyAccessHelper.java | 69 +- .../groovy/control/CompilationUnit.java | 41 +- .../groovy/control/ResolveVisitor.java | 5 +- .../codehaus/groovy/control/SourceUnit.java | 3 +- .../groovy/control/StaticImportVisitor.java | 2 +- .../transform/ASTTransformationVisitor.java | 43 +- .../transform/FieldASTTransformation.java | 4 +- .../transform/LazyASTTransformation.java | 3 +- .../sc/StaticCompilationVisitor.java | 3 - .../stc/StaticTypeCheckingVisitor.java | 34 +- .../codehaus/groovy/vmplugin/v5/Java5.java | 9 +- .../build.properties | 2 +- extras/groovy-eclipse-compiler-tests/pom.xml | 4 +- extras/groovy-eclipse-maven-tests/pom.xml | 4 +- .../resources/archetype-resources/pom.xml | 6 +- .../feature.xml | 2 +- 42 files changed, 494 insertions(+), 1262 deletions(-) delete mode 100644 base/org.codehaus.groovy25/lib/groovy-2.5.8-javadoc.jar rename base/org.codehaus.groovy25/lib/{groovy-2.5.8-indy.jar => groovy-2.5.9-indy.jar} (77%) create mode 100644 base/org.codehaus.groovy25/lib/groovy-2.5.9-javadoc.jar rename base/org.codehaus.groovy25/lib/{groovy-2.5.8-sources.jar => groovy-2.5.9-sources.jar} (76%) delete mode 100644 base/org.codehaus.groovy25/lib/groovy-test-2.5.8-indy.jar create mode 100644 base/org.codehaus.groovy25/lib/groovy-test-2.5.9-indy.jar rename base/org.codehaus.groovy25/lib/{groovy-test-2.5.8-javadoc.jar => groovy-test-2.5.9-javadoc.jar} (65%) rename base/org.codehaus.groovy25/lib/{groovy-test-2.5.8-sources.jar => groovy-test-2.5.9-sources.jar} (85%) delete mode 100644 base/org.codehaus.groovy25/src/org/codehaus/groovy/classgen/VariableScopeVisitor.java 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 64371b8280..a4a4683c04 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 @@ -127,7 +127,7 @@ protected String[] getDefaultClassPaths() { System.arraycopy(cps, 0, newcps, 0, cps.length); String[] ivyVersions = {"2.5.0", "2.4.0"}; - String[] groovyVersions = {"3.0.0-indy", "2.5.8-indy", "2.4.18"}; + String[] groovyVersions = {"3.0.0-indy", "2.5.9-indy", "2.4.18"}; try { URL groovyJar = null; for (String groovyVer : groovyVersions) { diff --git a/base/org.codehaus.groovy24/src/org/codehaus/groovy/vmplugin/v5/Java5.java b/base/org.codehaus.groovy24/src/org/codehaus/groovy/vmplugin/v5/Java5.java index b7b1e5c5fa..f8ab1f5469 100644 --- a/base/org.codehaus.groovy24/src/org/codehaus/groovy/vmplugin/v5/Java5.java +++ b/base/org.codehaus.groovy24/src/org/codehaus/groovy/vmplugin/v5/Java5.java @@ -419,7 +419,10 @@ public void configureClassNode(CompileUnit compileUnit, ClassNode classNode) { for (Constructor ctor : constructors) { Parameter[] params = makeParameters(compileUnit, ctor.getGenericParameterTypes(), ctor.getParameterTypes(), getConstructorParameterAnnotations(ctor), ctor); ClassNode[] exceptions = makeClassNodes(compileUnit, ctor.getGenericExceptionTypes(), ctor.getExceptionTypes()); - classNode.addConstructor(ctor.getModifiers(), params, exceptions, null); + // GRECLIPSE add + setAnnotationMetaData(ctor.getAnnotations(), + // GRECLIPSE end + classNode.addConstructor(ctor.getModifiers(), params, exceptions, null)); } Class sc = clazz.getSuperclass(); diff --git a/base/org.codehaus.groovy25/.checkstyle b/base/org.codehaus.groovy25/.checkstyle index 226e7b4fb7..534bb72542 100644 --- a/base/org.codehaus.groovy25/.checkstyle +++ b/base/org.codehaus.groovy25/.checkstyle @@ -43,7 +43,6 @@ - diff --git a/base/org.codehaus.groovy25/.classpath b/base/org.codehaus.groovy25/.classpath index 0ef0283ea3..791d690de1 100644 --- a/base/org.codehaus.groovy25/.classpath +++ b/base/org.codehaus.groovy25/.classpath @@ -9,14 +9,14 @@ - + - + - + - + diff --git a/base/org.codehaus.groovy25/META-INF/MANIFEST.MF b/base/org.codehaus.groovy25/META-INF/MANIFEST.MF index 455429c72e..d99b2de688 100644 --- a/base/org.codehaus.groovy25/META-INF/MANIFEST.MF +++ b/base/org.codehaus.groovy25/META-INF/MANIFEST.MF @@ -4,98 +4,98 @@ Bundle-SymbolicName: org.codehaus.groovy Automatic-Module-Name: org.codehaus.groovy Bundle-Name: Apache Groovy Bundle-Vendor: Pivotal Software, Inc. -Bundle-Version: 2.5.8.qualifier +Bundle-Version: 2.5.9.qualifier Bundle-ClassPath: eclipse-trace.jar, groovy-eclipse.jar, lib/ivy-2.4.0.jar, - lib/groovy-2.5.8-indy.jar, - lib/groovy-test-2.5.8-indy.jar -Export-Package: groovy.beans;version="2.5.8", - groovy.cli;version="2.5.8", - groovy.grape;version="2.5.8", - groovy.inspect;version="2.5.8", - groovy.io;version="2.5.8", - groovy.lang;version="2.5.8", - groovy.mock.interceptor;version="2.5.8", - groovy.security;version="2.5.8", - groovy.test;version="2.5.8", - groovy.time;version="2.5.8", - groovy.transform;version="2.5.8", - groovy.transform.builder;version="2.5.8", - groovy.transform.options;version="2.5.8", - groovy.transform.stc;version="2.5.8", - groovy.ui;version="2.5.8", - groovy.util;version="2.5.8", - groovy.util.logging;version="2.5.8", - groovy.xml;version="2.5.8", + lib/groovy-2.5.9-indy.jar, + lib/groovy-test-2.5.9-indy.jar +Export-Package: groovy.beans;version="2.5.9", + groovy.cli;version="2.5.9", + groovy.grape;version="2.5.9", + groovy.inspect;version="2.5.9", + groovy.io;version="2.5.9", + groovy.lang;version="2.5.9", + groovy.mock.interceptor;version="2.5.9", + groovy.security;version="2.5.9", + groovy.test;version="2.5.9", + groovy.time;version="2.5.9", + groovy.transform;version="2.5.9", + groovy.transform.builder;version="2.5.9", + groovy.transform.options;version="2.5.9", + groovy.transform.stc;version="2.5.9", + groovy.ui;version="2.5.9", + groovy.util;version="2.5.9", + groovy.util.logging;version="2.5.9", + groovy.xml;version="2.5.9", groovyjarjarantlr;x-friends:="org.codehaus.groovy.eclipse.refactoring", - org.apache.groovy.ast.tools;version="2.5.8", + org.apache.groovy.ast.tools;version="2.5.9", org.apache.groovy.internal.metaclass;x-internal:=true, org.apache.groovy.internal.util;x-internal:=true, - org.apache.groovy.io;version="2.5.8", - org.apache.groovy.lang.annotation;version="2.5.8", - org.apache.groovy.metaclass;version="2.5.8", - org.apache.groovy.plugin;version="2.5.8", - org.apache.groovy.util;version="2.5.8", - org.apache.groovy.util.concurrentlinkedhashmap;version="2.5.8", - org.codehaus.groovy;version="2.5.8", - org.codehaus.groovy.antlr;version="2.5.8", - org.codehaus.groovy.antlr.java;version="2.5.8", - org.codehaus.groovy.antlr.parser;version="2.5.8", - org.codehaus.groovy.antlr.treewalker;version="2.5.8", - org.codehaus.groovy.ast;version="2.5.8", - org.codehaus.groovy.ast.builder;version="2.5.8", - org.codehaus.groovy.ast.decompiled;version="2.5.8", - org.codehaus.groovy.ast.expr;version="2.5.8", - org.codehaus.groovy.ast.stmt;version="2.5.8", - org.codehaus.groovy.ast.tools;version="2.5.8", - org.codehaus.groovy.classgen;version="2.5.8", - org.codehaus.groovy.classgen.asm;version="2.5.8", - org.codehaus.groovy.classgen.asm.indy;version="2.5.8", - org.codehaus.groovy.classgen.asm.indy.sc;version="2.5.8", - org.codehaus.groovy.classgen.asm.sc;version="2.5.8", - org.codehaus.groovy.classgen.asm.util;version="2.5.8", - org.codehaus.groovy.control;version="2.5.8", - org.codehaus.groovy.control.customizers;version="2.5.8", - org.codehaus.groovy.control.customizers.builder;version="2.5.8", - org.codehaus.groovy.control.io;version="2.5.8", - org.codehaus.groovy.control.messages;version="2.5.8", + org.apache.groovy.io;version="2.5.9", + org.apache.groovy.lang.annotation;version="2.5.9", + org.apache.groovy.metaclass;version="2.5.9", + org.apache.groovy.plugin;version="2.5.9", + org.apache.groovy.util;version="2.5.9", + org.apache.groovy.util.concurrentlinkedhashmap;version="2.5.9", + org.codehaus.groovy;version="2.5.9", + org.codehaus.groovy.antlr;version="2.5.9", + org.codehaus.groovy.antlr.java;version="2.5.9", + org.codehaus.groovy.antlr.parser;version="2.5.9", + org.codehaus.groovy.antlr.treewalker;version="2.5.9", + org.codehaus.groovy.ast;version="2.5.9", + org.codehaus.groovy.ast.builder;version="2.5.9", + org.codehaus.groovy.ast.decompiled;version="2.5.9", + org.codehaus.groovy.ast.expr;version="2.5.9", + org.codehaus.groovy.ast.stmt;version="2.5.9", + org.codehaus.groovy.ast.tools;version="2.5.9", + org.codehaus.groovy.classgen;version="2.5.9", + org.codehaus.groovy.classgen.asm;version="2.5.9", + org.codehaus.groovy.classgen.asm.indy;version="2.5.9", + org.codehaus.groovy.classgen.asm.indy.sc;version="2.5.9", + org.codehaus.groovy.classgen.asm.sc;version="2.5.9", + org.codehaus.groovy.classgen.asm.util;version="2.5.9", + org.codehaus.groovy.control;version="2.5.9", + org.codehaus.groovy.control.customizers;version="2.5.9", + org.codehaus.groovy.control.customizers.builder;version="2.5.9", + org.codehaus.groovy.control.io;version="2.5.9", + org.codehaus.groovy.control.messages;version="2.5.9", org.codehaus.groovy.eclipse, - org.codehaus.groovy.plugin;version="2.5.8", - org.codehaus.groovy.reflection;version="2.5.8", - org.codehaus.groovy.reflection.android;version="2.5.8", - org.codehaus.groovy.reflection.stdclasses;version="2.5.8", - org.codehaus.groovy.reflection.v7;version="2.5.8", - org.codehaus.groovy.runtime;version="2.5.8", - org.codehaus.groovy.runtime.callsite;version="2.5.8", - org.codehaus.groovy.runtime.dgmimpl;version="2.5.8", - org.codehaus.groovy.runtime.dgmimpl.arrays;version="2.5.8", - org.codehaus.groovy.runtime.m12n;version="2.5.8", - org.codehaus.groovy.runtime.memoize;version="2.5.8", - org.codehaus.groovy.runtime.metaclass;version="2.5.8", - org.codehaus.groovy.runtime.powerassert;version="2.5.8", - org.codehaus.groovy.runtime.typehandling;version="2.5.8", - org.codehaus.groovy.runtime.wrappers;version="2.5.8", - org.codehaus.groovy.syntax;version="2.5.8", - org.codehaus.groovy.tools;version="2.5.8", - org.codehaus.groovy.tools.ast;version="2.5.8", - org.codehaus.groovy.tools.gse;version="2.5.8", - org.codehaus.groovy.tools.javac;version="2.5.8", - org.codehaus.groovy.tools.shell;version="2.5.8", - org.codehaus.groovy.tools.shell.util;version="2.5.8", - org.codehaus.groovy.transform;version="2.5.8", - org.codehaus.groovy.transform.sc;version="2.5.8", - org.codehaus.groovy.transform.sc.transformers;version="2.5.8", - org.codehaus.groovy.transform.stc;version="2.5.8", - org.codehaus.groovy.transform.tailrec;version="2.5.8", - org.codehaus.groovy.transform.trait;version="2.5.8", - org.codehaus.groovy.util;version="2.5.8", - org.codehaus.groovy.vmplugin;version="2.5.8", - org.codehaus.groovy.vmplugin.v5;version="2.5.8", - org.codehaus.groovy.vmplugin.v6;version="2.5.8", - org.codehaus.groovy.vmplugin.v7;version="2.5.8", - org.codehaus.groovy.vmplugin.v8;version="2.5.8", - org.codehaus.groovy.vmplugin.v9;version="2.5.8" + org.codehaus.groovy.plugin;version="2.5.9", + org.codehaus.groovy.reflection;version="2.5.9", + org.codehaus.groovy.reflection.android;version="2.5.9", + org.codehaus.groovy.reflection.stdclasses;version="2.5.9", + org.codehaus.groovy.reflection.v7;version="2.5.9", + org.codehaus.groovy.runtime;version="2.5.9", + org.codehaus.groovy.runtime.callsite;version="2.5.9", + org.codehaus.groovy.runtime.dgmimpl;version="2.5.9", + org.codehaus.groovy.runtime.dgmimpl.arrays;version="2.5.9", + org.codehaus.groovy.runtime.m12n;version="2.5.9", + org.codehaus.groovy.runtime.memoize;version="2.5.9", + org.codehaus.groovy.runtime.metaclass;version="2.5.9", + org.codehaus.groovy.runtime.powerassert;version="2.5.9", + org.codehaus.groovy.runtime.typehandling;version="2.5.9", + org.codehaus.groovy.runtime.wrappers;version="2.5.9", + org.codehaus.groovy.syntax;version="2.5.9", + org.codehaus.groovy.tools;version="2.5.9", + org.codehaus.groovy.tools.ast;version="2.5.9", + org.codehaus.groovy.tools.gse;version="2.5.9", + org.codehaus.groovy.tools.javac;version="2.5.9", + org.codehaus.groovy.tools.shell;version="2.5.9", + org.codehaus.groovy.tools.shell.util;version="2.5.9", + org.codehaus.groovy.transform;version="2.5.9", + org.codehaus.groovy.transform.sc;version="2.5.9", + org.codehaus.groovy.transform.sc.transformers;version="2.5.9", + org.codehaus.groovy.transform.stc;version="2.5.9", + org.codehaus.groovy.transform.tailrec;version="2.5.9", + org.codehaus.groovy.transform.trait;version="2.5.9", + org.codehaus.groovy.util;version="2.5.9", + org.codehaus.groovy.vmplugin;version="2.5.9", + org.codehaus.groovy.vmplugin.v5;version="2.5.9", + org.codehaus.groovy.vmplugin.v6;version="2.5.9", + org.codehaus.groovy.vmplugin.v7;version="2.5.9", + org.codehaus.groovy.vmplugin.v8;version="2.5.9", + org.codehaus.groovy.vmplugin.v9;version="2.5.9" Require-Bundle: org.eclipse.core.runtime, org.apache.ant;resolution:=optional, org.junit;resolution:=optional diff --git a/base/org.codehaus.groovy25/VERSION b/base/org.codehaus.groovy25/VERSION index 473b405672..65b38935a5 100644 --- a/base/org.codehaus.groovy25/VERSION +++ b/base/org.codehaus.groovy25/VERSION @@ -14,3 +14,4 @@ 2019-02-04: GROOVY_2_5_6 2019-05-10: GROOVY_2_5_7 2019-08-07: GROOVY_2_5_8 +2020-01-14: GROOVY_2_5_9 diff --git a/base/org.codehaus.groovy25/about.html b/base/org.codehaus.groovy25/about.html index 8fdb9306df..b085e355b8 100644 --- a/base/org.codehaus.groovy25/about.html +++ b/base/org.codehaus.groovy25/about.html @@ -24,12 +24,12 @@

License

Third Party Content

-

groovy-2.5.8-indy.jar

-

groovy-test-2.5.8-indy.jar

+

groovy-2.5.9-indy.jar

+

groovy-test-2.5.9-indy.jar