Skip to content

Commit

Permalink
Update the Groovy plug-in to 2.5.7
Browse files Browse the repository at this point in the history 
#884
  • Loading branch information
@eric-milles
eric-milles committed May 10, 2019
1 parent 93792f4 commit ab09505
Show file tree
Hide file tree
Showing 57 changed files with 766 additions and 2,422 deletions.
5 changes: 3 additions & 2 deletions ...ovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/AnnotationsTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -749,8 +749,9 @@ public void testFieldLevelAnnotations_defaultRetention() {

runConformTest(sources, "success");

String expectedOutput =
"Ljava/lang/String;\n" +
String expectedOutput = isAtLeastJava(25)
? " @p.Anno\n"
: "Ljava/lang/String;\n" +
" private java.lang.String s;\n";
checkDisassemblyFor("p/X.class", expectedOutput);
}
Expand Down
2 changes: 1 addition & 1 deletion ...e.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovyCompilerTestSuite.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.6-indy", "2.4.17"};
String[] groovyVersions = {"3.0.0-indy", "2.5.7-indy", "2.4.17"};
try {
URL groovyJar = null;
for (String groovyVer : groovyVersions) {
Expand Down
1 change: 0 additions & 1 deletion base/org.codehaus.groovy24/src/org/codehaus/groovy/ast/Parameter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

import org.codehaus.groovy.ast.expr.Expression;


/**
* Represents a parameter on a constructor or method call. The type name is
* optional - it defaults to java.lang.Object if unknown.
Expand Down
5 changes: 0 additions & 5 deletions base/org.codehaus.groovy24/src/org/codehaus/groovy/classgen/ExtendedVerifier.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,13 @@
*/
package org.codehaus.groovy.classgen;

import org.codehaus.groovy.ast.ASTNode;
import org.codehaus.groovy.ast.AnnotatedNode;
import org.codehaus.groovy.ast.AnnotationNode;
import org.codehaus.groovy.ast.ClassCodeVisitorSupport;
import org.codehaus.groovy.ast.ClassHelper;
import org.codehaus.groovy.ast.ClassNode;
import org.codehaus.groovy.ast.ConstructorNode;
import org.codehaus.groovy.ast.FieldNode;
import org.codehaus.groovy.ast.GenericsType;
import org.codehaus.groovy.ast.MethodNode;
import org.codehaus.groovy.ast.PackageNode;
import org.codehaus.groovy.ast.Parameter;
Expand All @@ -41,9 +39,6 @@
import org.codehaus.groovy.control.CompilerConfiguration;
import org.codehaus.groovy.control.ErrorCollector;
import org.codehaus.groovy.control.SourceUnit;
import org.codehaus.groovy.control.messages.SyntaxErrorMessage;
import org.codehaus.groovy.syntax.PreciseSyntaxException;
import org.codehaus.groovy.syntax.SyntaxException;
import groovyjarjarasm.asm.Opcodes;

import java.util.ArrayList;
Expand Down
7 changes: 0 additions & 7 deletions base/org.codehaus.groovy25/.checkstyle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
<file-match-pattern match-pattern="groovy/ast/ClassNode.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/ast/CodeVisitorSupport.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/ast/CompileUnit.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/ast/ConstructorNode.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/ast/GenericsType.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/ast/GroovyCodeVisitor.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/ast/ImportNode.java" include-pattern="false" />
Expand All @@ -39,10 +38,8 @@
<file-match-pattern match-pattern="groovy/ast/tools/GenericsUtils.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/classgen/AnnotationVisitor.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/classgen/AsmClassGenerator.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/classgen/ClassCompletionVerifier.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/classgen/EnumVisitor.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/classgen/ExtendedVerifier.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/classgen/InnerClassVisitorHelper.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/classgen/VariableScopeVisitor.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/classgen/Verifier.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/classgen/asm/BytecodeHelper.java" include-pattern="false" />
Expand All @@ -54,15 +51,11 @@
<file-match-pattern match-pattern="groovy/control/CompilationUnit.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/control/CompilerConfiguration.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/control/ErrorCollector.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/control/GenericsVisitor.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/control/ParserPluginFactory.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/control/ProcessingUnit.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/control/ResolveVisitor.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/control/SourceUnit.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/control/StaticImportVisitor.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/control/StaticVerifier.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/control/customizers/DelegatingCustomizer.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/control/customizers/builder/SourceAwareCustomizerFactory.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/control/messages/LocatedMessage.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/tools/GroovyClass.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/AnnotationCollectorTransform.java" include-pattern="false" />
Expand Down
8 changes: 4 additions & 4 deletions base/org.codehaus.groovy25/.classpath
View file
Original file line number Diff line number Diff line change
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.6-indy.jar" sourcepath="lib/groovy-2.5.6-sources.jar" exported="true">
<classpathentry kind="lib" path="lib/groovy-2.5.7-indy.jar" sourcepath="lib/groovy-2.5.7-sources.jar" exported="true">
<attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy25/lib/groovy-2.5.6-javadoc.jar!/" />
<attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy25/lib/groovy-2.5.7-javadoc.jar!/" />
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/groovy-test-2.5.6-indy.jar" sourcepath="lib/groovy-test-2.5.6-sources.jar" exported="true">
<classpathentry kind="lib" path="lib/groovy-test-2.5.7-indy.jar" sourcepath="lib/groovy-test-2.5.7-sources.jar" exported="true">
<attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy25/lib/groovy-test-2.5.6-javadoc.jar!/" />
<attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy25/lib/groovy-test-2.5.7-javadoc.jar!/" />
</attributes>
</classpathentry>

Expand Down
170 changes: 85 additions & 85 deletions base/org.codehaus.groovy25/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.6.qualifier
Bundle-Version: 2.5.7.qualifier
Bundle-ClassPath: eclipse-trace.jar,
groovy-eclipse.jar,
lib/ivy-2.4.0.jar,
lib/groovy-2.5.6-indy.jar,
lib/groovy-test-2.5.6-indy.jar
Export-Package: groovy.beans;version="2.5.6",
groovy.cli;version="2.5.6",
groovy.grape;version="2.5.6",
groovy.inspect;version="2.5.6",
groovy.io;version="2.5.6",
groovy.lang;version="2.5.6",
groovy.mock.interceptor;version="2.5.6",
groovy.security;version="2.5.6",
groovy.test;version="2.5.6",
groovy.time;version="2.5.6",
groovy.transform;version="2.5.6",
groovy.transform.builder;version="2.5.6",
groovy.transform.options;version="2.5.6",
groovy.transform.stc;version="2.5.6",
groovy.ui;version="2.5.6",
groovy.util;version="2.5.6",
groovy.util.logging;version="2.5.6",
groovy.xml;version="2.5.6",
lib/groovy-2.5.7-indy.jar,
lib/groovy-test-2.5.7-indy.jar
Export-Package: groovy.beans;version="2.5.7",
groovy.cli;version="2.5.7",
groovy.grape;version="2.5.7",
groovy.inspect;version="2.5.7",
groovy.io;version="2.5.7",
groovy.lang;version="2.5.7",
groovy.mock.interceptor;version="2.5.7",
groovy.security;version="2.5.7",
groovy.test;version="2.5.7",
groovy.time;version="2.5.7",
groovy.transform;version="2.5.7",
groovy.transform.builder;version="2.5.7",
groovy.transform.options;version="2.5.7",
groovy.transform.stc;version="2.5.7",
groovy.ui;version="2.5.7",
groovy.util;version="2.5.7",
groovy.util.logging;version="2.5.7",
groovy.xml;version="2.5.7",
groovyjarjarantlr;x-friends:="org.codehaus.groovy.eclipse.refactoring",
org.apache.groovy.ast.tools;version="2.5.6",
org.apache.groovy.ast.tools;version="2.5.7",
org.apache.groovy.internal.metaclass;x-internal:=true,
org.apache.groovy.internal.util;x-internal:=true,
org.apache.groovy.io;version="2.5.6",
org.apache.groovy.lang.annotation;version="2.5.6",
org.apache.groovy.metaclass;version="2.5.6",
org.apache.groovy.plugin;version="2.5.6",
org.apache.groovy.util;version="2.5.6",
org.apache.groovy.util.concurrentlinkedhashmap;version="2.5.6",
org.codehaus.groovy;version="2.5.6",
org.codehaus.groovy.antlr;version="2.5.6",
org.codehaus.groovy.antlr.java;version="2.5.6",
org.codehaus.groovy.antlr.parser;version="2.5.6",
org.codehaus.groovy.antlr.treewalker;version="2.5.6",
org.codehaus.groovy.ast;version="2.5.6",
org.codehaus.groovy.ast.builder;version="2.5.6",
org.codehaus.groovy.ast.decompiled;version="2.5.6",
org.codehaus.groovy.ast.expr;version="2.5.6",
org.codehaus.groovy.ast.stmt;version="2.5.6",
org.codehaus.groovy.ast.tools;version="2.5.6",
org.codehaus.groovy.classgen;version="2.5.6",
org.codehaus.groovy.classgen.asm;version="2.5.6",
org.codehaus.groovy.classgen.asm.indy;version="2.5.6",
org.codehaus.groovy.classgen.asm.indy.sc;version="2.5.6",
org.codehaus.groovy.classgen.asm.sc;version="2.5.6",
org.codehaus.groovy.classgen.asm.util;version="2.5.6",
org.codehaus.groovy.control;version="2.5.6",
org.codehaus.groovy.control.customizers;version="2.5.6",
org.codehaus.groovy.control.customizers.builder;version="2.5.6",
org.codehaus.groovy.control.io;version="2.5.6",
org.codehaus.groovy.control.messages;version="2.5.6",
org.apache.groovy.io;version="2.5.7",
org.apache.groovy.lang.annotation;version="2.5.7",
org.apache.groovy.metaclass;version="2.5.7",
org.apache.groovy.plugin;version="2.5.7",
org.apache.groovy.util;version="2.5.7",
org.apache.groovy.util.concurrentlinkedhashmap;version="2.5.7",
org.codehaus.groovy;version="2.5.7",
org.codehaus.groovy.antlr;version="2.5.7",
org.codehaus.groovy.antlr.java;version="2.5.7",
org.codehaus.groovy.antlr.parser;version="2.5.7",
org.codehaus.groovy.antlr.treewalker;version="2.5.7",
org.codehaus.groovy.ast;version="2.5.7",
org.codehaus.groovy.ast.builder;version="2.5.7",
org.codehaus.groovy.ast.decompiled;version="2.5.7",
org.codehaus.groovy.ast.expr;version="2.5.7",
org.codehaus.groovy.ast.stmt;version="2.5.7",
org.codehaus.groovy.ast.tools;version="2.5.7",
org.codehaus.groovy.classgen;version="2.5.7",
org.codehaus.groovy.classgen.asm;version="2.5.7",
org.codehaus.groovy.classgen.asm.indy;version="2.5.7",
org.codehaus.groovy.classgen.asm.indy.sc;version="2.5.7",
org.codehaus.groovy.classgen.asm.sc;version="2.5.7",
org.codehaus.groovy.classgen.asm.util;version="2.5.7",
org.codehaus.groovy.control;version="2.5.7",
org.codehaus.groovy.control.customizers;version="2.5.7",
org.codehaus.groovy.control.customizers.builder;version="2.5.7",
org.codehaus.groovy.control.io;version="2.5.7",
org.codehaus.groovy.control.messages;version="2.5.7",
org.codehaus.groovy.eclipse,
org.codehaus.groovy.plugin;version="2.5.6",
org.codehaus.groovy.reflection;version="2.5.6",
org.codehaus.groovy.reflection.android;version="2.5.6",
org.codehaus.groovy.reflection.stdclasses;version="2.5.6",
org.codehaus.groovy.reflection.v7;version="2.5.6",
org.codehaus.groovy.runtime;version="2.5.6",
org.codehaus.groovy.runtime.callsite;version="2.5.6",
org.codehaus.groovy.runtime.dgmimpl;version="2.5.6",
org.codehaus.groovy.runtime.dgmimpl.arrays;version="2.5.6",
org.codehaus.groovy.runtime.m12n;version="2.5.6",
org.codehaus.groovy.runtime.memoize;version="2.5.6",
org.codehaus.groovy.runtime.metaclass;version="2.5.6",
org.codehaus.groovy.runtime.powerassert;version="2.5.6",
org.codehaus.groovy.runtime.typehandling;version="2.5.6",
org.codehaus.groovy.runtime.wrappers;version="2.5.6",
org.codehaus.groovy.syntax;version="2.5.6",
org.codehaus.groovy.tools;version="2.5.6",
org.codehaus.groovy.tools.ast;version="2.5.6",
org.codehaus.groovy.tools.gse;version="2.5.6",
org.codehaus.groovy.tools.javac;version="2.5.6",
org.codehaus.groovy.tools.shell;version="2.5.6",
org.codehaus.groovy.tools.shell.util;version="2.5.6",
org.codehaus.groovy.transform;version="2.5.6",
org.codehaus.groovy.transform.sc;version="2.5.6",
org.codehaus.groovy.transform.sc.transformers;version="2.5.6",
org.codehaus.groovy.transform.stc;version="2.5.6",
org.codehaus.groovy.transform.tailrec;version="2.5.6",
org.codehaus.groovy.transform.trait;version="2.5.6",
org.codehaus.groovy.util;version="2.5.6",
org.codehaus.groovy.vmplugin;version="2.5.6",
org.codehaus.groovy.vmplugin.v5;version="2.5.6",
org.codehaus.groovy.vmplugin.v6;version="2.5.6",
org.codehaus.groovy.vmplugin.v7;version="2.5.6",
org.codehaus.groovy.vmplugin.v8;version="2.5.6",
org.codehaus.groovy.vmplugin.v9;version="2.5.6"
org.codehaus.groovy.plugin;version="2.5.7",
org.codehaus.groovy.reflection;version="2.5.7",
org.codehaus.groovy.reflection.android;version="2.5.7",
org.codehaus.groovy.reflection.stdclasses;version="2.5.7",
org.codehaus.groovy.reflection.v7;version="2.5.7",
org.codehaus.groovy.runtime;version="2.5.7",
org.codehaus.groovy.runtime.callsite;version="2.5.7",
org.codehaus.groovy.runtime.dgmimpl;version="2.5.7",
org.codehaus.groovy.runtime.dgmimpl.arrays;version="2.5.7",
org.codehaus.groovy.runtime.m12n;version="2.5.7",
org.codehaus.groovy.runtime.memoize;version="2.5.7",
org.codehaus.groovy.runtime.metaclass;version="2.5.7",
org.codehaus.groovy.runtime.powerassert;version="2.5.7",
org.codehaus.groovy.runtime.typehandling;version="2.5.7",
org.codehaus.groovy.runtime.wrappers;version="2.5.7",
org.codehaus.groovy.syntax;version="2.5.7",
org.codehaus.groovy.tools;version="2.5.7",
org.codehaus.groovy.tools.ast;version="2.5.7",
org.codehaus.groovy.tools.gse;version="2.5.7",
org.codehaus.groovy.tools.javac;version="2.5.7",
org.codehaus.groovy.tools.shell;version="2.5.7",
org.codehaus.groovy.tools.shell.util;version="2.5.7",
org.codehaus.groovy.transform;version="2.5.7",
org.codehaus.groovy.transform.sc;version="2.5.7",
org.codehaus.groovy.transform.sc.transformers;version="2.5.7",
org.codehaus.groovy.transform.stc;version="2.5.7",
org.codehaus.groovy.transform.tailrec;version="2.5.7",
org.codehaus.groovy.transform.trait;version="2.5.7",
org.codehaus.groovy.util;version="2.5.7",
org.codehaus.groovy.vmplugin;version="2.5.7",
org.codehaus.groovy.vmplugin.v5;version="2.5.7",
org.codehaus.groovy.vmplugin.v6;version="2.5.7",
org.codehaus.groovy.vmplugin.v7;version="2.5.7",
org.codehaus.groovy.vmplugin.v8;version="2.5.7",
org.codehaus.groovy.vmplugin.v9;version="2.5.7"
Require-Bundle: org.eclipse.core.runtime,
org.apache.ant;resolution:=optional,
org.junit;resolution:=optional
Expand Down
2 changes: 2 additions & 0 deletions base/org.codehaus.groovy25/VERSION
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@
2018-10-14: GROOVY_2_5_3
2018-11-12: GROOVY_2_5_4
2018-12-23: GROOVY_2_5_5
2019-02-04: GROOVY_2_5_6
2019-05-10: GROOVY_2_5_7
8 changes: 4 additions & 4 deletions base/org.codehaus.groovy25/about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ <h3>License</h3>

<h3>Third Party Content</h3>

<h4>groovy-2.5.6-indy.jar</h4>
<h4>groovy-test-2.5.6-indy.jar</h4>
<h4>groovy-2.5.7-indy.jar</h4>
<h4>groovy-test-2.5.7-indy.jar</h4>

<ul>
<li>Obtained from: <a href="https://dist.apache.org/repos/dist/dev/groovy/2.5.6/distribution/apache-groovy-binary-2.5.6.zip">https://dist.apache.org/repos/dist/dev/groovy/2.5.6/distribution/apache-groovy-binary-2.5.6.zip</a></li>
<li>Sources available at: <a href="https://dist.apache.org/repos/dist/dev/groovy/2.5.6/sources/apache-groovy-src-2.5.6.zip">https://dist.apache.org/repos/dist/dev/groovy/2.5.6/sources/apache-groovy-src-2.5.6.zip</a></li>
<li>Obtained from: <a href="https://dist.apache.org/repos/dist/dev/groovy/2.5.7/distribution/apache-groovy-binary-2.5.7.zip">https://dist.apache.org/repos/dist/dev/groovy/2.5.7/distribution/apache-groovy-binary-2.5.7.zip</a></li>
<li>Sources available at: <a href="https://dist.apache.org/repos/dist/dev/groovy/2.5.7/sources/apache-groovy-src-2.5.7.zip">https://dist.apache.org/repos/dist/dev/groovy/2.5.7/sources/apache-groovy-src-2.5.7.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/asl-v20.txt">asl-v20.txt</a></li>
Expand Down
2 changes: 1 addition & 1 deletion base/org.codehaus.groovy25/build.antlr2x
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<project default="build">

<target name="build" depends="clean">
<java classname="groovyjarjarantlr.Tool" classpath="../../../../../lib/groovy-2.5.6-indy.jar" dir="${basedir}" fork="true">
<java classname="groovyjarjarantlr.Tool" classpath="../../../../../lib/groovy-2.5.7-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 removed base/org.codehaus.groovy25/lib/groovy-2.5.6-javadoc.jar
View file
Binary file not shown.
Binary file renamed ...dehaus.groovy25/lib/groovy-2.5.6-indy.jar → ...dehaus.groovy25/lib/groovy-2.5.7-indy.jar
View file
Binary file not shown.
Binary file added base/org.codehaus.groovy25/lib/groovy-2.5.7-javadoc.jar
View file
Binary file not shown.
Binary file renamed ...aus.groovy25/lib/groovy-2.5.6-sources.jar → ...aus.groovy25/lib/groovy-2.5.7-sources.jar
View file
Binary file not shown.
Binary file removed base/org.codehaus.groovy25/lib/groovy-test-2.5.6-indy.jar
View file
Binary file not shown.
Binary file added base/org.codehaus.groovy25/lib/groovy-test-2.5.7-indy.jar
View file
Binary file not shown.
Binary file renamed ...roovy25/lib/groovy-test-2.5.6-javadoc.jar → ...roovy25/lib/groovy-test-2.5.7-javadoc.jar
View file
Binary file not shown.
Binary file renamed ...roovy25/lib/groovy-test-2.5.6-sources.jar → ...roovy25/lib/groovy-test-2.5.7-sources.jar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion base/org.codehaus.groovy25/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</parent>
<groupId>org.codehaus.groovy.eclipse</groupId>
<artifactId>org.codehaus.groovy</artifactId>
<version>2.5.6-SNAPSHOT</version>
<version>2.5.7-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

<build>
Expand Down
Loading

0 comments on commit ab09505

Please sign in to comment.