From 56fb67495add8841939b1158d99578f2ec48b4aa Mon Sep 17 00:00:00 2001 From: Eric Milles Date: Fri, 6 Mar 2020 11:46:35 -0600 Subject: [PATCH] Update the Groovy plug-in to 2.5.10 #1055 --- .../tests/basic/GroovyCompilerTestSuite.java | 2 +- base/org.codehaus.groovy25/.classpath | 8 +- .../META-INF/MANIFEST.MF | 166 +++++++++--------- base/org.codehaus.groovy25/VERSION | 1 + base/org.codehaus.groovy25/about.html | 24 +-- base/org.codehaus.groovy25/build.antlr2x | 2 +- ....5.9.jar => groovy-cli-picocli-2.5.10.jar} | Bin 64076 -> 64410 bytes ...le-2.5.9.jar => groovy-console-2.5.10.jar} | Bin 750467 -> 751600 bytes ...wing-2.5.9.jar => groovy-swing-2.5.10.jar} | Bin 373527 -> 373866 bytes ...-2.5.9.jar => groovy-templates-2.5.10.jar} | Bin 101151 -> 101397 bytes ...vy-xml-2.5.9.jar => groovy-xml-2.5.10.jar} | Bin 221899 -> 222693 bytes ...-2.5.9-indy.jar => groovy-2.5.10-indy.jar} | Bin 5561993 -> 5589176 bytes .../lib/groovy-2.5.10-javadoc.jar | Bin 0 -> 5376354 bytes ...-sources.jar => groovy-2.5.10-sources.jar} | Bin 2450511 -> 2454247 bytes .../lib/groovy-2.5.9-javadoc.jar | Bin 6319110 -> 0 bytes ...9-indy.jar => groovy-test-2.5.10-indy.jar} | Bin 80381 -> 80648 bytes .../lib/groovy-test-2.5.10-javadoc.jar | Bin 0 -> 79000 bytes ...ces.jar => groovy-test-2.5.10-sources.jar} | Bin 40312 -> 40321 bytes .../lib/groovy-test-2.5.9-javadoc.jar | Bin 460602 -> 0 bytes ....5.9.jar => groovy-cli-picocli-2.5.10.jar} | Bin 64076 -> 64410 bytes ...h-2.5.9.jar => groovy-groovysh-2.5.10.jar} | Bin 453355 -> 453944 bytes base/org.codehaus.groovy25/pom.xml | 2 +- .../org/codehaus/groovy/ast/GenericsType.java | 2 +- .../groovy/ast/tools/GenericsUtils.java | 151 ++++++++++++++-- .../groovy/control/CompilationUnit.java | 13 +- .../groovy/control/CompilerConfiguration.java | 23 +-- .../stc/StaticTypeCheckingVisitor.java | 4 +- .../codehaus/groovy/vmplugin/v5/Java5.java | 4 +- .../codehaus/groovy/vmplugin/v8/Java8.java | 73 ++++++++ .../build.properties | 2 +- extras/groovy-eclipse-maven-tests/pom.xml | 4 +- .../resources/archetype-resources/pom.xml | 6 +- .../feature.xml | 2 +- 33 files changed, 352 insertions(+), 137 deletions(-) rename base/org.codehaus.groovy25/lib/console/{groovy-cli-picocli-2.5.9.jar => groovy-cli-picocli-2.5.10.jar} (57%) rename base/org.codehaus.groovy25/lib/console/{groovy-console-2.5.9.jar => groovy-console-2.5.10.jar} (65%) rename base/org.codehaus.groovy25/lib/console/{groovy-swing-2.5.9.jar => groovy-swing-2.5.10.jar} (77%) rename base/org.codehaus.groovy25/lib/console/{groovy-templates-2.5.9.jar => groovy-templates-2.5.10.jar} (61%) rename base/org.codehaus.groovy25/lib/console/{groovy-xml-2.5.9.jar => groovy-xml-2.5.10.jar} (65%) rename base/org.codehaus.groovy25/lib/{groovy-2.5.9-indy.jar => groovy-2.5.10-indy.jar} (71%) create mode 100644 base/org.codehaus.groovy25/lib/groovy-2.5.10-javadoc.jar rename base/org.codehaus.groovy25/lib/{groovy-2.5.9-sources.jar => groovy-2.5.10-sources.jar} (86%) delete mode 100644 base/org.codehaus.groovy25/lib/groovy-2.5.9-javadoc.jar rename base/org.codehaus.groovy25/lib/{groovy-test-2.5.9-indy.jar => groovy-test-2.5.10-indy.jar} (66%) create mode 100644 base/org.codehaus.groovy25/lib/groovy-test-2.5.10-javadoc.jar rename base/org.codehaus.groovy25/lib/{groovy-test-2.5.9-sources.jar => groovy-test-2.5.10-sources.jar} (80%) delete mode 100644 base/org.codehaus.groovy25/lib/groovy-test-2.5.9-javadoc.jar rename base/org.codehaus.groovy25/lib/shell/{groovy-cli-picocli-2.5.9.jar => groovy-cli-picocli-2.5.10.jar} (57%) rename base/org.codehaus.groovy25/lib/shell/{groovy-groovysh-2.5.9.jar => groovy-groovysh-2.5.10.jar} (79%) 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 a8b7e0acd7..e54f1252ab 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 @@ -128,7 +128,7 @@ protected String[] getDefaultClassPaths() { System.arraycopy(cps, 0, newcps, 0, cps.length); String[] ivyVersions = {"2.5.0", "2.4.0"}; - String[] groovyVersions = {"3.0.1-indy", "2.5.9-indy", "2.4.19"}; + String[] groovyVersions = {"3.0.1-indy", "2.5.10-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 791d690de1..e3949435d6 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 7d94437702..672bc27ab1 100644 --- a/base/org.codehaus.groovy25/META-INF/MANIFEST.MF +++ b/base/org.codehaus.groovy25/META-INF/MANIFEST.MF @@ -4,96 +4,96 @@ Bundle-SymbolicName: org.codehaus.groovy Automatic-Module-Name: org.codehaus.groovy Bundle-Name: Apache Groovy Bundle-Vendor: Pivotal Software, Inc. -Bundle-Version: 2.5.9.qualifier +Bundle-Version: 2.5.10.qualifier Bundle-ClassPath: eclipse-trace.jar, groovy-eclipse.jar, lib/ivy-2.4.0.jar, - 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", + lib/groovy-2.5.10-indy.jar, + lib/groovy-test-2.5.10-indy.jar +Export-Package: groovy.beans;version="2.5.10", + groovy.cli;version="2.5.10", + groovy.grape;version="2.5.10", + groovy.inspect;version="2.5.10", + groovy.io;version="2.5.10", + groovy.lang;version="2.5.10", + groovy.mock.interceptor;version="2.5.10", + groovy.security;version="2.5.10", + groovy.test;version="2.5.10", + groovy.time;version="2.5.10", + groovy.transform;version="2.5.10", + groovy.transform.builder;version="2.5.10", + groovy.transform.options;version="2.5.10", + groovy.transform.stc;version="2.5.10", + groovy.ui;version="2.5.10", + groovy.util;version="2.5.10", + groovy.util.logging;version="2.5.10", + groovy.xml;version="2.5.10", groovyjarjarantlr;x-friends:="org.codehaus.groovy.eclipse.refactoring", - org.apache.groovy.ast.tools;version="2.5.9", + org.apache.groovy.ast.tools;version="2.5.10", org.apache.groovy.internal.metaclass;x-internal:=true, org.apache.groovy.internal.util;x-internal:=true, - 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.parser;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.apache.groovy.io;version="2.5.10", + org.apache.groovy.lang.annotation;version="2.5.10", + org.apache.groovy.metaclass;version="2.5.10", + org.apache.groovy.plugin;version="2.5.10", + org.apache.groovy.util;version="2.5.10", + org.apache.groovy.util.concurrentlinkedhashmap;version="2.5.10", + org.codehaus.groovy;version="2.5.10", + org.codehaus.groovy.antlr;version="2.5.10", + org.codehaus.groovy.antlr.parser;version="2.5.10", + org.codehaus.groovy.ast;version="2.5.10", + org.codehaus.groovy.ast.builder;version="2.5.10", + org.codehaus.groovy.ast.decompiled;version="2.5.10", + org.codehaus.groovy.ast.expr;version="2.5.10", + org.codehaus.groovy.ast.stmt;version="2.5.10", + org.codehaus.groovy.ast.tools;version="2.5.10", + org.codehaus.groovy.classgen;version="2.5.10", + org.codehaus.groovy.classgen.asm;version="2.5.10", + org.codehaus.groovy.classgen.asm.indy;version="2.5.10", + org.codehaus.groovy.classgen.asm.indy.sc;version="2.5.10", + org.codehaus.groovy.classgen.asm.sc;version="2.5.10", + org.codehaus.groovy.classgen.asm.util;version="2.5.10", + org.codehaus.groovy.control;version="2.5.10", + org.codehaus.groovy.control.customizers;version="2.5.10", + org.codehaus.groovy.control.customizers.builder;version="2.5.10", + org.codehaus.groovy.control.io;version="2.5.10", + org.codehaus.groovy.control.messages;version="2.5.10", org.codehaus.groovy.eclipse, - 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" + org.codehaus.groovy.plugin;version="2.5.10", + org.codehaus.groovy.reflection;version="2.5.10", + org.codehaus.groovy.reflection.android;version="2.5.10", + org.codehaus.groovy.reflection.stdclasses;version="2.5.10", + org.codehaus.groovy.reflection.v7;version="2.5.10", + org.codehaus.groovy.runtime;version="2.5.10", + org.codehaus.groovy.runtime.callsite;version="2.5.10", + org.codehaus.groovy.runtime.dgmimpl;version="2.5.10", + org.codehaus.groovy.runtime.dgmimpl.arrays;version="2.5.10", + org.codehaus.groovy.runtime.m12n;version="2.5.10", + org.codehaus.groovy.runtime.memoize;version="2.5.10", + org.codehaus.groovy.runtime.metaclass;version="2.5.10", + org.codehaus.groovy.runtime.powerassert;version="2.5.10", + org.codehaus.groovy.runtime.typehandling;version="2.5.10", + org.codehaus.groovy.runtime.wrappers;version="2.5.10", + org.codehaus.groovy.syntax;version="2.5.10", + org.codehaus.groovy.tools;version="2.5.10", + org.codehaus.groovy.tools.ast;version="2.5.10", + org.codehaus.groovy.tools.gse;version="2.5.10", + org.codehaus.groovy.tools.javac;version="2.5.10", + org.codehaus.groovy.tools.shell;version="2.5.10", + org.codehaus.groovy.tools.shell.util;version="2.5.10", + org.codehaus.groovy.transform;version="2.5.10", + org.codehaus.groovy.transform.sc;version="2.5.10", + org.codehaus.groovy.transform.sc.transformers;version="2.5.10", + org.codehaus.groovy.transform.stc;version="2.5.10", + org.codehaus.groovy.transform.tailrec;version="2.5.10", + org.codehaus.groovy.transform.trait;version="2.5.10", + org.codehaus.groovy.util;version="2.5.10", + org.codehaus.groovy.vmplugin;version="2.5.10", + org.codehaus.groovy.vmplugin.v5;version="2.5.10", + org.codehaus.groovy.vmplugin.v6;version="2.5.10", + org.codehaus.groovy.vmplugin.v7;version="2.5.10", + org.codehaus.groovy.vmplugin.v8;version="2.5.10", + org.codehaus.groovy.vmplugin.v9;version="2.5.10" 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 65b38935a5..4bf4a307e9 100644 --- a/base/org.codehaus.groovy25/VERSION +++ b/base/org.codehaus.groovy25/VERSION @@ -15,3 +15,4 @@ 2019-05-10: GROOVY_2_5_7 2019-08-07: GROOVY_2_5_8 2020-01-14: GROOVY_2_5_9 +2020-03-06: GROOVY_2_5_10 diff --git a/base/org.codehaus.groovy25/about.html b/base/org.codehaus.groovy25/about.html index be77d38e25..35a7bb38b4 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.9-indy.jar

-

groovy-test-2.5.9-indy.jar

+

groovy-2.5.10-indy.jar

+

groovy-test-2.5.10-indy.jar

-

groovy-cli-picocli-2.5.9.jar

-

groovy-console-2.5.9.jar

-

groovy-groovysh-2.5.9.jar

-

groovy-swing-2.5.9.jar

-

groovy-templates-2.5.9.jar

-

groovy-xml-2.5.9.jar

+

groovy-cli-picocli-2.5.10.jar

+

groovy-console-2.5.10.jar

+

groovy-groovysh-2.5.10.jar

+

groovy-swing-2.5.10.jar

+

groovy-templates-2.5.10.jar

+

groovy-xml-2.5.10.jar

picocli-4.0.1.jar