Skip to content

Commit

Permalink
Update the Groovy plug-in to 2.4.15
Browse files Browse the repository at this point in the history
  • Loading branch information
@eric-milles
eric-milles committed Mar 27, 2018
1 parent 30409a9 commit 6620bc9
Show file tree
Hide file tree
Showing 19 changed files with 136 additions and 212 deletions.
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 @@ -124,7 +124,7 @@ protected String[] getDefaultClassPaths() {
System.arraycopy(cps, 0, newcps, 0, cps.length);

String[] ivyVersions = {"2.5.0", "2.4.0"};
String[] groovyVersions = {"2.6.0-indy", "2.5.0-indy", "2.4.14"};
String[] groovyVersions = {"2.6.0-indy", "2.5.0-indy", "2.4.15"};
try {
URL groovyJar = null;
for (String groovyVer : groovyVersions) {
Expand Down
4 changes: 2 additions & 2 deletions base/org.codehaus.groovy24/.classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy24/lib/ivy-2.4.0-javadoc.jar!/" />
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/groovy-all-2.4.14.jar" sourcepath="lib/groovy-all-2.4.14-sources.jar" exported="true">
<classpathentry kind="lib" path="lib/groovy-all-2.4.15.jar" sourcepath="lib/groovy-all-2.4.15-sources.jar" exported="true">
<attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy24/lib/groovy-all-2.4.14-javadoc.jar!/" />
<attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy24/lib/groovy-all-2.4.15-javadoc.jar!/" />
</attributes>
</classpathentry>

Expand Down
213 changes: 107 additions & 106 deletions base/org.codehaus.groovy24/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,120 +3,121 @@ Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.codehaus.groovy
Bundle-Name: Groovy
Bundle-Vendor: Codehaus.org
Bundle-Version: 2.4.14.qualifier
Bundle-Version: 2.4.15.qualifier
Bundle-ClassPath: eclipse-trace.jar,
groovy-eclipse.jar,
lib/ivy-2.4.0.jar,
lib/groovy-all-2.4.14.jar
Export-Package: groovy.beans;version="2.4.14",
groovy.grape;version="2.4.14",
groovy.inspect;version="2.4.14",
groovy.inspect.swingui;version="2.4.14",
groovy.io;version="2.4.14",
groovy.jmx.builder;version="2.4.14",
groovy.json;version="2.4.14",
groovy.json.internal;version="2.4.14",
groovy.lang;version="2.4.14",
groovy.mock.interceptor;version="2.4.14",
groovy.model;version="2.4.14",
groovy.security;version="2.4.14",
groovy.servlet;version="2.4.14",
groovy.sql;version="2.4.14",
groovy.swing;version="2.4.14",
groovy.swing.binding;version="2.4.14",
groovy.swing.factory;version="2.4.14",
groovy.swing.impl;version="2.4.14",
groovy.test;version="2.4.14",
groovy.text;version="2.4.14",
groovy.text.markup;version="2.4.14",
groovy.time;version="2.4.14",
groovy.transform;version="2.4.14",
groovy.transform.builder;version="2.4.14",
groovy.transform.stc;version="2.4.14",
groovy.ui;version="2.4.14",
groovy.ui.icons;version="2.4.14",
groovy.ui.text;version="2.4.14",
groovy.ui.view;version="2.4.14",
groovy.util;version="2.4.14",
groovy.util.logging;version="2.4.14",
groovy.util.slurpersupport;version="2.4.14",
groovy.xml;version="2.4.14",
groovy.xml.dom;version="2.4.14",
groovy.xml.streamingmarkupsupport;version="2.4.14",
lib/groovy-all-2.4.15.jar
Export-Package: groovy.beans;version="2.4.15",
groovy.grape;version="2.4.15",
groovy.inspect;version="2.4.15",
groovy.inspect.swingui;version="2.4.15",
groovy.io;version="2.4.15",
groovy.jmx.builder;version="2.4.15",
groovy.json;version="2.4.15",
groovy.json.internal;version="2.4.15",
groovy.lang;version="2.4.15",
groovy.mock.interceptor;version="2.4.15",
groovy.model;version="2.4.15",
groovy.security;version="2.4.15",
groovy.servlet;version="2.4.15",
groovy.sql;version="2.4.15",
groovy.swing;version="2.4.15",
groovy.swing.binding;version="2.4.15",
groovy.swing.factory;version="2.4.15",
groovy.swing.impl;version="2.4.15",
groovy.test;version="2.4.15",
groovy.text;version="2.4.15",
groovy.text.markup;version="2.4.15",
groovy.time;version="2.4.15",
groovy.transform;version="2.4.15",
groovy.transform.builder;version="2.4.15",
groovy.transform.stc;version="2.4.15",
groovy.ui;version="2.4.15",
groovy.ui.icons;version="2.4.15",
groovy.ui.text;version="2.4.15",
groovy.ui.view;version="2.4.15",
groovy.util;version="2.4.15",
groovy.util.logging;version="2.4.15",
groovy.util.slurpersupport;version="2.4.15",
groovy.xml;version="2.4.15",
groovy.xml.dom;version="2.4.15",
groovy.xml.streamingmarkupsupport;version="2.4.15",
groovyjarjarantlr;x-internal:=true,
groovyjarjarasm.asm;x-internal:=true,
org.apache.groovy.io;version="2.4.14",
org.apache.groovy.util;version="2.4.14",
org.apache.groovy.io;version="2.4.15",
org.apache.groovy.util;version="2.4.15",
org.codehaus.greclipse;x-internal:=true,
org.codehaus.groovy;version="2.4.14",
org.codehaus.groovy;version="2.4.15",
org.codehaus.groovy.activator,
org.codehaus.groovy.ant;version="2.4.14",
org.codehaus.groovy.antlr;version="2.4.14",
org.codehaus.groovy.antlr.java;version="2.4.14",
org.codehaus.groovy.antlr.parser;version="2.4.14",
org.codehaus.groovy.antlr.treewalker;version="2.4.14",
org.codehaus.groovy.ast;version="2.4.14",
org.codehaus.groovy.ast.builder;version="2.4.14",
org.codehaus.groovy.ast.expr;version="2.4.14",
org.codehaus.groovy.ast.stmt;version="2.4.14",
org.codehaus.groovy.ast.tools;version="2.4.14",
org.codehaus.groovy.binding;version="2.4.14",
org.codehaus.groovy.bsf;version="2.4.14",
org.codehaus.groovy.classgen;version="2.4.14",
org.codehaus.groovy.classgen.asm;version="2.4.14",
org.codehaus.groovy.classgen.asm.indy;version="2.4.14",
org.codehaus.groovy.classgen.asm.sc;version="2.4.14",
org.codehaus.groovy.cli;version="2.4.14",
org.codehaus.groovy.control;version="2.4.14",
org.codehaus.groovy.control.customizers;version="2.4.14",
org.codehaus.groovy.control.customizers.builder;version="2.4.14",
org.codehaus.groovy.control.io;version="2.4.14",
org.codehaus.groovy.control.messages;version="2.4.14",
org.codehaus.groovy.ant;version="2.4.15",
org.codehaus.groovy.antlr;version="2.4.15",
org.codehaus.groovy.antlr.java;version="2.4.15",
org.codehaus.groovy.antlr.parser;version="2.4.15",
org.codehaus.groovy.antlr.treewalker;version="2.4.15",
org.codehaus.groovy.ast;version="2.4.15",
org.codehaus.groovy.ast.builder;version="2.4.15",
org.codehaus.groovy.ast.expr;version="2.4.15",
org.codehaus.groovy.ast.stmt;version="2.4.15",
org.codehaus.groovy.ast.tools;version="2.4.15",
org.codehaus.groovy.binding;version="2.4.15",
org.codehaus.groovy.bsf;version="2.4.15",
org.codehaus.groovy.classgen;version="2.4.15",
org.codehaus.groovy.classgen.asm;version="2.4.15",
org.codehaus.groovy.classgen.asm.indy;version="2.4.15",
org.codehaus.groovy.classgen.asm.sc;version="2.4.15",
org.codehaus.groovy.cli;version="2.4.15",
org.codehaus.groovy.control;version="2.4.15",
org.codehaus.groovy.control.customizers;version="2.4.15",
org.codehaus.groovy.control.customizers.builder;version="2.4.15",
org.codehaus.groovy.control.io;version="2.4.15",
org.codehaus.groovy.control.messages;version="2.4.15",
org.codehaus.groovy.eclipse,
org.codehaus.groovy.groovydoc;version="2.4.14",
org.codehaus.groovy.jsr223;version="2.4.14",
org.codehaus.groovy.plugin;version="2.4.14",
org.codehaus.groovy.reflection;version="2.4.14",
org.codehaus.groovy.reflection.android;version="2.4.14",
org.codehaus.groovy.reflection.stdclasses;version="2.4.14",
org.codehaus.groovy.reflection.v7;version="2.4.14",
org.codehaus.groovy.runtime;version="2.4.14",
org.codehaus.groovy.runtime.callsite;version="2.4.14",
org.codehaus.groovy.runtime.dgmimpl;version="2.4.14",
org.codehaus.groovy.runtime.dgmimpl.arrays;version="2.4.14",
org.codehaus.groovy.runtime.m12n;version="2.4.14",
org.codehaus.groovy.runtime.memoize;version="2.4.14",
org.codehaus.groovy.runtime.metaclass;version="2.4.14",
org.codehaus.groovy.runtime.powerassert;version="2.4.14",
org.codehaus.groovy.runtime.typehandling;version="2.4.14",
org.codehaus.groovy.runtime.wrappers;version="2.4.14",
org.codehaus.groovy.syntax;version="2.4.14",
org.codehaus.groovy.testng;version="2.4.14",
org.codehaus.groovy.tools;version="2.4.14",
org.codehaus.groovy.tools.ast;version="2.4.14",
org.codehaus.groovy.tools.groovydoc;version="2.4.14",
org.codehaus.groovy.tools.groovydoc.gstringTemplates;version="2.4.14",
org.codehaus.groovy.tools.groovydoc.gstringTemplates.classLevel;version="2.4.14",
org.codehaus.groovy.tools.groovydoc.gstringTemplates.packageLevel;version="2.4.14",
org.codehaus.groovy.tools.groovydoc.gstringTemplates.topLevel;version="2.4.14",
org.codehaus.groovy.tools.gse;version="2.4.14",
org.codehaus.groovy.tools.javac;version="2.4.14",
org.codehaus.groovy.tools.shell;version="2.4.14",
org.codehaus.groovy.tools.shell.commands;version="2.4.14",
org.codehaus.groovy.tools.shell.completion;version="2.4.14",
org.codehaus.groovy.tools.shell.util;version="2.4.14",
org.codehaus.groovy.tools.xml;version="2.4.14",
org.codehaus.groovy.transform;version="2.4.14",
org.codehaus.groovy.transform.sc;version="2.4.14",
org.codehaus.groovy.transform.sc.transformers;version="2.4.14",
org.codehaus.groovy.transform.stc;version="2.4.14",
org.codehaus.groovy.transform.tailrec;version="2.4.14",
org.codehaus.groovy.transform.trait;version="2.4.14",
org.codehaus.groovy.util;version="2.4.14",
org.codehaus.groovy.vmplugin;version="2.4.14",
org.codehaus.groovy.vmplugin.v5;version="2.4.14",
org.codehaus.groovy.vmplugin.v6;version="2.4.14",
org.codehaus.groovy.vmplugin.v7;version="2.4.14"
org.codehaus.groovy.groovydoc;version="2.4.15",
org.codehaus.groovy.jsr223;version="2.4.15",
org.codehaus.groovy.plugin;version="2.4.15",
org.codehaus.groovy.reflection;version="2.4.15",
org.codehaus.groovy.reflection.android;version="2.4.15",
org.codehaus.groovy.reflection.stdclasses;version="2.4.15",
org.codehaus.groovy.reflection.v7;version="2.4.15",
org.codehaus.groovy.runtime;version="2.4.15",
org.codehaus.groovy.runtime.callsite;version="2.4.15",
org.codehaus.groovy.runtime.dgmimpl;version="2.4.15",
org.codehaus.groovy.runtime.dgmimpl.arrays;version="2.4.15",
org.codehaus.groovy.runtime.m12n;version="2.4.15",
org.codehaus.groovy.runtime.memoize;version="2.4.15",
org.codehaus.groovy.runtime.metaclass;version="2.4.15",
org.codehaus.groovy.runtime.powerassert;version="2.4.15",
org.codehaus.groovy.runtime.typehandling;version="2.4.15",
org.codehaus.groovy.runtime.wrappers;version="2.4.15",
org.codehaus.groovy.syntax;version="2.4.15",
org.codehaus.groovy.testng;version="2.4.15",
org.codehaus.groovy.tools;version="2.4.15",
org.codehaus.groovy.tools.ast;version="2.4.15",
org.codehaus.groovy.tools.groovydoc;version="2.4.15",
org.codehaus.groovy.tools.groovydoc.gstringTemplates;version="2.4.15",
org.codehaus.groovy.tools.groovydoc.gstringTemplates.classLevel;version="2.4.15",
org.codehaus.groovy.tools.groovydoc.gstringTemplates.packageLevel;version="2.4.15",
org.codehaus.groovy.tools.groovydoc.gstringTemplates.topLevel;version="2.4.15",
org.codehaus.groovy.tools.gse;version="2.4.15",
org.codehaus.groovy.tools.javac;version="2.4.15",
org.codehaus.groovy.tools.shell;version="2.4.15",
org.codehaus.groovy.tools.shell.commands;version="2.4.15",
org.codehaus.groovy.tools.shell.completion;version="2.4.15",
org.codehaus.groovy.tools.shell.util;version="2.4.15",
org.codehaus.groovy.tools.xml;version="2.4.15",
org.codehaus.groovy.transform;version="2.4.15",
org.codehaus.groovy.transform.sc;version="2.4.15",
org.codehaus.groovy.transform.sc.transformers;version="2.4.15",
org.codehaus.groovy.transform.stc;version="2.4.15",
org.codehaus.groovy.transform.tailrec;version="2.4.15",
org.codehaus.groovy.transform.trait;version="2.4.15",
org.codehaus.groovy.util;version="2.4.15",
org.codehaus.groovy.vmplugin;version="2.4.15",
org.codehaus.groovy.vmplugin.v5;version="2.4.15",
org.codehaus.groovy.vmplugin.v6;version="2.4.15",
org.codehaus.groovy.vmplugin.v7;version="2.4.15",
org.codehaus.groovy.vmplugin.v8;version="2.4.15"
Require-Bundle: org.eclipse.core.runtime,
org.apache.ant;resolution:=optional,
org.junit;resolution:=optional
Expand Down
1 change: 1 addition & 0 deletions base/org.codehaus.groovy24/VERSION
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@
2017-06-24: GROOVY_2_4_12
2017-11-23: GROOVY_2_4_13
2018-03-01: GROOVY_2_4_14
2018-03-27: GROOVY_2_4_15
6 changes: 3 additions & 3 deletions base/org.codehaus.groovy24/about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ <h3>License</h3>

<h3>Third Party Content</h3>

<h4>groovy-all-2.4.14.jar</h4>
<h4>groovy-all-2.4.15.jar</h4>

<ul>
<li>Obtained from: <a href="https://dist.apache.org/repos/dist/dev/groovy/2.4.14/distribution/apache-groovy-binary-2.4.14.zip">https://dist.apache.org/repos/dist/dev/groovy/2.4.14/distribution/apache-groovy-binary-2.4.14.zip</a></li>
<li>Sources available at: <a href="https://dist.apache.org/repos/dist/dev/groovy/2.4.14/sources/apache-groovy-src-2.4.14.zip">https://dist.apache.org/repos/dist/dev/groovy/2.4.14/sources/apache-groovy-src-2.4.14.zip</a></li>
<li>Obtained from: <a href="https://dist.apache.org/repos/dist/dev/groovy/2.4.15/distribution/apache-groovy-binary-2.4.15.zip">https://dist.apache.org/repos/dist/dev/groovy/2.4.15/distribution/apache-groovy-binary-2.4.15.zip</a></li>
<li>Sources available at: <a href="https://dist.apache.org/repos/dist/dev/groovy/2.4.15/sources/apache-groovy-src-2.4.15.zip">https://dist.apache.org/repos/dist/dev/groovy/2.4.15/sources/apache-groovy-src-2.4.15.zip</a></li>
<li>License kind: ASL</li>
<li>License URL: <a href="http://www.apache.org/licenses/LICENSE-2.0.html">http://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.groovy24/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-all-2.4.14.jar" dir="${basedir}" fork="true">
<java classname="groovyjarjarantlr.Tool" classpath="../../../../../lib/groovy-all-2.4.15.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.groovy24/lib/groovy-all-2.4.14-javadoc.jar
View file
Binary file not shown.
Binary file added base/org.codehaus.groovy24/lib/groovy-all-2.4.15-javadoc.jar
View file
Binary file not shown.
Binary file renamed ...roovy24/lib/groovy-all-2.4.14-sources.jar → ...roovy24/lib/groovy-all-2.4.15-sources.jar
View file
Binary file not shown.
Binary file renamed ...dehaus.groovy24/lib/groovy-all-2.4.14.jar → ...dehaus.groovy24/lib/groovy-all-2.4.15.jar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion base/org.codehaus.groovy24/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.4.14-SNAPSHOT</version>
<version>2.4.15-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

<build>
Expand Down
4 changes: 1 addition & 3 deletions base/org.codehaus.groovy24/src/groovy/grape/GrapeIvy.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,7 @@ import java.util.zip.ZipException
import java.util.zip.ZipFile

/**
* @author Danno Ferrin
* @author Paul King
* @author Roshan Dawrani (roshandawrani)
* Implementation supporting {@code @Grape} and {@code @Grab} annotations based on Ivy.
*/
class GrapeIvy implements GrapeEngine {

Expand Down
2 changes: 1 addition & 1 deletion base/org.codehaus.groovy24/src/org/codehaus/groovy/activator/GroovyActivator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class GroovyActivator extends Plugin {

public static final String PLUGIN_ID = "org.codehaus.groovy";

public static final String GROOVY_ALL_JAR = "lib/groovy-all-2.4.14.jar";
public static final String GROOVY_ALL_JAR = "lib/groovy-all-2.4.15.jar";

public static URL GROOVY_ALL_JAR_URL, GROOVY_JAR_URL;

Expand Down
12 changes: 5 additions & 7 deletions base/org.codehaus.groovy24/src/org/codehaus/groovy/antlr/AntlrParserPlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1018,16 +1018,14 @@ protected void enumConstantDef(AST node) {
}
}
}
// GRECLIPSE edit
//FieldNode enumField = EnumHelper.addEnumConstant(classNode, identifier, init);
ClassNode nonDeclaredTypeOfEnumValue =
ClassHelper.make(classNode.getName());
nonDeclaredTypeOfEnumValue.setRedirect(classNode);
FieldNode enumField = EnumHelper.addEnumConstant(nonDeclaredTypeOfEnumValue, classNode, identifier, init, savedLine, savedColumn);
FieldNode enumField = EnumHelper.addEnumConstant(classNode, identifier, init);
enumField.addAnnotations(annotations);
// GRECLIPSE add
enumField.setLineNumber(savedLine);
enumField.setColumnNumber(savedColumn);
enumField.setNameStart(locations.findOffset(savedLine, savedColumn));
enumField.setNameEnd(enumField.getNameStart() + identifier.length() - 1);
// GRECLIPSE end
enumField.addAnnotations(annotations);
configureAST(enumField, node);
enumConstantBeingDef = false;
}
Expand Down
Loading

0 comments on commit 6620bc9

Please sign in to comment.