Skip to content

Commit a37bcab

Browse files
eric-milleseric-milles
committed
Update the Groovy plugin to 5.0.5
for #1664
1 parent 69ff565 commit a37bcab

33 files changed

Lines changed: 281 additions & 210 deletions

‎base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovyCompilerTestSuite.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2025 the original author or authors.
2+
* Copyright 2009-2026 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -140,7 +140,7 @@ protected String[] getDefaultClassPaths() {
140140
String[] cps = super.getDefaultClassPaths();
141141
String[] newcps = Arrays.copyOf(cps, cps.length + 2);
142142

143-
String[] groovyVersions = {"5.0.4", "4.0.31", "3.0.25-indy"};
143+
String[] groovyVersions = {"5.0.5", "4.0.31", "3.0.25-indy"};
144144
String[] ivyVersions = {"2.5.3", "2.5.2", "2.5.1", "2.5.0"};
145145
try {
146146
URL groovyJar = null;

‎base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/InnerClassTests.java‎

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2024 the original author or authors.
2+
* Copyright 2009-2026 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -526,7 +526,7 @@ public void testAnonymousInnerClass2() {
526526
//@formatter:off
527527
String[] sources = {
528528
"A.groovy",
529-
"class A {" +
529+
"class A {\n" +
530530
" def foo = new Runnable() {\n" +
531531
" void run() {\n" +
532532
" println 'hi!'\n" +
@@ -562,7 +562,7 @@ public void testAnonymousInnerClass2a() {
562562
//@formatter:off
563563
String[] sources = {
564564
"A.groovy",
565-
"class A {" +
565+
"class A {\n" +
566566
" @Lazy def foo = new Runnable() {\n" +
567567
" void run() {\n" +
568568
" println 'hi!'\n" +
@@ -593,6 +593,38 @@ public void testAnonymousInnerClass2a() {
593593
"}");
594594
}
595595

596+
@Test
597+
public void testAnonymousInnerClass2b() {
598+
//@formatter:off
599+
String[] sources = {
600+
"Main.groovy",
601+
"A.foo.run()\n",
602+
603+
"A.groovy",
604+
"interface A {\n" +
605+
" def foo = new Runnable() {\n" +
606+
" void run() {\n" +
607+
" println 'hi!'\n" +
608+
" }\n" +
609+
" }\n" +
610+
"}\n",
611+
};
612+
//@formatter:on
613+
614+
runConformTest(sources, "hi!");
615+
616+
checkGCUDeclaration("A.groovy",
617+
"public interface A {\n" +
618+
" public static final java.lang.Object foo = new Runnable() {\n" +
619+
" x() {\n" +
620+
" super();\n" +
621+
" }\n" +
622+
" public void run() {\n" +
623+
" }\n" +
624+
" };\n" +
625+
"}");
626+
}
627+
596628
@Test
597629
public void testAnonymousInnerClass3() {
598630
//@formatter:off

‎base/org.codehaus.groovy50/.classpath‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
<attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy50/lib/ivy-2.5.3-javadoc.jar!/" />
1212
</attributes>
1313
</classpathentry>
14-
<classpathentry kind="lib" path="lib/groovy-5.0.4.jar" sourcepath="lib/groovy-5.0.4-sources.jar" exported="true">
14+
<classpathentry kind="lib" path="lib/groovy-5.0.5.jar" sourcepath="lib/groovy-5.0.5-sources.jar" exported="true">
1515
<attributes>
16-
<attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy50/lib/groovy-5.0.4-javadoc.jar!/" />
16+
<attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy50/lib/groovy-5.0.5-javadoc.jar!/" />
1717
</attributes>
1818
</classpathentry>
19-
<classpathentry kind="lib" path="lib/groovy-test-5.0.4.jar" sourcepath="lib/groovy-test-5.0.4-sources.jar" exported="true">
19+
<classpathentry kind="lib" path="lib/groovy-test-5.0.5.jar" sourcepath="lib/groovy-test-5.0.5-sources.jar" exported="true">
2020
<attributes>
21-
<attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy50/lib/groovy-test-5.0.4-javadoc.jar!/" />
21+
<attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy50/lib/groovy-test-5.0.5-javadoc.jar!/" />
2222
</attributes>
2323
</classpathentry>
2424

‎base/org.codehaus.groovy50/META-INF/MANIFEST.MF‎

Lines changed: 87 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -4,99 +4,99 @@ Bundle-SymbolicName: org.codehaus.groovy
44
Automatic-Module-Name: org.codehaus.groovy
55
Bundle-Name: Apache Groovy
66
Bundle-Vendor: Pivotal Software, Inc.
7-
Bundle-Version: 5.0.4.qualifier
7+
Bundle-Version: 5.0.5.qualifier
88
Bundle-ClassPath: eclipse-trace.jar,
99
groovy-eclipse.jar,
1010
groovy-parser2.jar,
1111
lib/ivy-2.5.3.jar,
12-
lib/groovy-5.0.4.jar,
13-
lib/groovy-test-5.0.4.jar
14-
Export-Package: groovy.beans;version="5.0.4",
15-
groovy.cli;version="5.0.4",
16-
groovy.grape;version="5.0.4",
17-
groovy.inspect;version="5.0.4",
18-
groovy.io;version="5.0.4",
19-
groovy.lang;version="5.0.4",
20-
groovy.lang.groovydoc;version="5.0.4",
21-
groovy.mock.interceptor;version="5.0.4",
22-
groovy.namespace;version="5.0.4",
23-
groovy.security;version="5.0.4",
24-
groovy.test;version="5.0.4",
25-
groovy.time;version="5.0.4",
26-
groovy.transform;version="5.0.4",
27-
groovy.transform.builder;version="5.0.4",
28-
groovy.transform.options;version="5.0.4",
29-
groovy.transform.stc;version="5.0.4",
30-
groovy.ui;version="5.0.4",
31-
groovy.util;version="5.0.4",
32-
groovy.util.function;version="5.0.4",
33-
groovy.util.logging;version="5.0.4",
12+
lib/groovy-5.0.5.jar,
13+
lib/groovy-test-5.0.5.jar
14+
Export-Package: groovy.beans;version="5.0.5",
15+
groovy.cli;version="5.0.5",
16+
groovy.grape;version="5.0.5",
17+
groovy.inspect;version="5.0.5",
18+
groovy.io;version="5.0.5",
19+
groovy.lang;version="5.0.5",
20+
groovy.lang.groovydoc;version="5.0.5",
21+
groovy.mock.interceptor;version="5.0.5",
22+
groovy.namespace;version="5.0.5",
23+
groovy.security;version="5.0.5",
24+
groovy.test;version="5.0.5",
25+
groovy.time;version="5.0.5",
26+
groovy.transform;version="5.0.5",
27+
groovy.transform.builder;version="5.0.5",
28+
groovy.transform.options;version="5.0.5",
29+
groovy.transform.stc;version="5.0.5",
30+
groovy.ui;version="5.0.5",
31+
groovy.util;version="5.0.5",
32+
groovy.util.function;version="5.0.5",
33+
groovy.util.logging;version="5.0.5",
3434
groovyjarjarantlr;x-friends:="org.codehaus.groovy.eclipse.refactoring",
35-
org.apache.groovy.antlr;version="5.0.4",
36-
org.apache.groovy.ast.tools;version="5.0.4",
37-
org.apache.groovy.io;version="5.0.4",
38-
org.apache.groovy.lang.annotation;version="5.0.4",
39-
org.apache.groovy.metaclass;version="5.0.4",
40-
org.apache.groovy.plugin;version="5.0.4",
41-
org.apache.groovy.test;version="5.0.4",
42-
org.apache.groovy.test.transform;version="5.0.4",
43-
org.apache.groovy.util;version="5.0.4",
44-
org.apache.groovy.util.concurrent;version="5.0.4",
45-
org.codehaus.groovy;version="5.0.4",
46-
org.codehaus.groovy.antlr;version="5.0.4",
47-
org.codehaus.groovy.antlr.parser;version="5.0.4",
48-
org.codehaus.groovy.ast;version="5.0.4",
49-
org.codehaus.groovy.ast.builder;version="5.0.4",
50-
org.codehaus.groovy.ast.decompiled;version="5.0.4",
51-
org.codehaus.groovy.ast.expr;version="5.0.4",
52-
org.codehaus.groovy.ast.stmt;version="5.0.4",
53-
org.codehaus.groovy.ast.tools;version="5.0.4",
54-
org.codehaus.groovy.classgen;version="5.0.4",
55-
org.codehaus.groovy.classgen.asm;version="5.0.4",
56-
org.codehaus.groovy.classgen.asm.indy;version="5.0.4",
57-
org.codehaus.groovy.classgen.asm.indy.sc;version="5.0.4",
58-
org.codehaus.groovy.classgen.asm.sc;version="5.0.4",
59-
org.codehaus.groovy.classgen.asm.util;version="5.0.4",
60-
org.codehaus.groovy.control;version="5.0.4",
61-
org.codehaus.groovy.control.customizers;version="5.0.4",
62-
org.codehaus.groovy.control.customizers.builder;version="5.0.4",
63-
org.codehaus.groovy.control.io;version="5.0.4",
64-
org.codehaus.groovy.control.messages;version="5.0.4",
35+
org.apache.groovy.antlr;version="5.0.5",
36+
org.apache.groovy.ast.tools;version="5.0.5",
37+
org.apache.groovy.io;version="5.0.5",
38+
org.apache.groovy.lang.annotation;version="5.0.5",
39+
org.apache.groovy.metaclass;version="5.0.5",
40+
org.apache.groovy.plugin;version="5.0.5",
41+
org.apache.groovy.test;version="5.0.5",
42+
org.apache.groovy.test.transform;version="5.0.5",
43+
org.apache.groovy.util;version="5.0.5",
44+
org.apache.groovy.util.concurrent;version="5.0.5",
45+
org.codehaus.groovy;version="5.0.5",
46+
org.codehaus.groovy.antlr;version="5.0.5",
47+
org.codehaus.groovy.antlr.parser;version="5.0.5",
48+
org.codehaus.groovy.ast;version="5.0.5",
49+
org.codehaus.groovy.ast.builder;version="5.0.5",
50+
org.codehaus.groovy.ast.decompiled;version="5.0.5",
51+
org.codehaus.groovy.ast.expr;version="5.0.5",
52+
org.codehaus.groovy.ast.stmt;version="5.0.5",
53+
org.codehaus.groovy.ast.tools;version="5.0.5",
54+
org.codehaus.groovy.classgen;version="5.0.5",
55+
org.codehaus.groovy.classgen.asm;version="5.0.5",
56+
org.codehaus.groovy.classgen.asm.indy;version="5.0.5",
57+
org.codehaus.groovy.classgen.asm.indy.sc;version="5.0.5",
58+
org.codehaus.groovy.classgen.asm.sc;version="5.0.5",
59+
org.codehaus.groovy.classgen.asm.util;version="5.0.5",
60+
org.codehaus.groovy.control;version="5.0.5",
61+
org.codehaus.groovy.control.customizers;version="5.0.5",
62+
org.codehaus.groovy.control.customizers.builder;version="5.0.5",
63+
org.codehaus.groovy.control.io;version="5.0.5",
64+
org.codehaus.groovy.control.messages;version="5.0.5",
6565
org.codehaus.groovy.eclipse,
66-
org.codehaus.groovy.reflection;version="5.0.4",
67-
org.codehaus.groovy.reflection.android;version="5.0.4",
68-
org.codehaus.groovy.reflection.stdclasses;version="5.0.4",
69-
org.codehaus.groovy.reflection.v7;version="5.0.4",
70-
org.codehaus.groovy.runtime;version="5.0.4",
71-
org.codehaus.groovy.runtime.callsite;version="5.0.4",
72-
org.codehaus.groovy.runtime.dgmimpl;version="5.0.4",
73-
org.codehaus.groovy.runtime.dgmimpl.arrays;version="5.0.4",
74-
org.codehaus.groovy.runtime.m12n;version="5.0.4",
75-
org.codehaus.groovy.runtime.memoize;version="5.0.4",
76-
org.codehaus.groovy.runtime.metaclass;version="5.0.4",
77-
org.codehaus.groovy.runtime.powerassert;version="5.0.4",
78-
org.codehaus.groovy.runtime.typehandling;version="5.0.4",
79-
org.codehaus.groovy.runtime.wrappers;version="5.0.4",
80-
org.codehaus.groovy.syntax;version="5.0.4",
81-
org.codehaus.groovy.tools;version="5.0.4",
82-
org.codehaus.groovy.tools.ast;version="5.0.4",
83-
org.codehaus.groovy.tools.gse;version="5.0.4",
84-
org.codehaus.groovy.tools.javac;version="5.0.4",
85-
org.codehaus.groovy.tools.shell;version="5.0.4",
86-
org.codehaus.groovy.tools.shell.util;version="5.0.4",
87-
org.codehaus.groovy.transform;version="5.0.4",
88-
org.codehaus.groovy.transform.sc;version="5.0.4",
89-
org.codehaus.groovy.transform.sc.transformers;version="5.0.4",
90-
org.codehaus.groovy.transform.stc;version="5.0.4",
91-
org.codehaus.groovy.transform.tailrec;version="5.0.4",
92-
org.codehaus.groovy.transform.trait;version="5.0.4",
93-
org.codehaus.groovy.util;version="5.0.4",
94-
org.codehaus.groovy.vmplugin;version="5.0.4",
95-
org.codehaus.groovy.vmplugin.v7;version="5.0.4",
96-
org.codehaus.groovy.vmplugin.v8;version="5.0.4",
97-
org.codehaus.groovy.vmplugin.v9;version="5.0.4",
98-
org.codehaus.groovy.vmplugin.v10;version="5.0.4",
99-
org.codehaus.groovy.vmplugin.v16;version="5.0.4"
66+
org.codehaus.groovy.reflection;version="5.0.5",
67+
org.codehaus.groovy.reflection.android;version="5.0.5",
68+
org.codehaus.groovy.reflection.stdclasses;version="5.0.5",
69+
org.codehaus.groovy.reflection.v7;version="5.0.5",
70+
org.codehaus.groovy.runtime;version="5.0.5",
71+
org.codehaus.groovy.runtime.callsite;version="5.0.5",
72+
org.codehaus.groovy.runtime.dgmimpl;version="5.0.5",
73+
org.codehaus.groovy.runtime.dgmimpl.arrays;version="5.0.5",
74+
org.codehaus.groovy.runtime.m12n;version="5.0.5",
75+
org.codehaus.groovy.runtime.memoize;version="5.0.5",
76+
org.codehaus.groovy.runtime.metaclass;version="5.0.5",
77+
org.codehaus.groovy.runtime.powerassert;version="5.0.5",
78+
org.codehaus.groovy.runtime.typehandling;version="5.0.5",
79+
org.codehaus.groovy.runtime.wrappers;version="5.0.5",
80+
org.codehaus.groovy.syntax;version="5.0.5",
81+
org.codehaus.groovy.tools;version="5.0.5",
82+
org.codehaus.groovy.tools.ast;version="5.0.5",
83+
org.codehaus.groovy.tools.gse;version="5.0.5",
84+
org.codehaus.groovy.tools.javac;version="5.0.5",
85+
org.codehaus.groovy.tools.shell;version="5.0.5",
86+
org.codehaus.groovy.tools.shell.util;version="5.0.5",
87+
org.codehaus.groovy.transform;version="5.0.5",
88+
org.codehaus.groovy.transform.sc;version="5.0.5",
89+
org.codehaus.groovy.transform.sc.transformers;version="5.0.5",
90+
org.codehaus.groovy.transform.stc;version="5.0.5",
91+
org.codehaus.groovy.transform.tailrec;version="5.0.5",
92+
org.codehaus.groovy.transform.trait;version="5.0.5",
93+
org.codehaus.groovy.util;version="5.0.5",
94+
org.codehaus.groovy.vmplugin;version="5.0.5",
95+
org.codehaus.groovy.vmplugin.v7;version="5.0.5",
96+
org.codehaus.groovy.vmplugin.v8;version="5.0.5",
97+
org.codehaus.groovy.vmplugin.v9;version="5.0.5",
98+
org.codehaus.groovy.vmplugin.v10;version="5.0.5",
99+
org.codehaus.groovy.vmplugin.v16;version="5.0.5"
100100
Require-Bundle: org.eclipse.core.runtime,
101101
org.junit;resolution:=optional
102102
Bundle-RequiredExecutionEnvironment: JavaSE-17

‎base/org.codehaus.groovy50/VERSION‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@
1919
2025-10-15: GROOVY_5_0_2
2020
2025-12-01: GROOVY_5_0_3
2121
2026-01-16: GROOVY_5_0_4
22+
2026-03-26: GROOVY_5_0_5

‎base/org.codehaus.groovy50/about.html‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ <h3>License</h3>
2424

2525
<h3>Third Party Content</h3>
2626

27-
<h4>groovy-5.0.4.jar</h4>
28-
<h4>groovy-test-5.0.4.jar</h4>
27+
<h4>groovy-5.0.5.jar</h4>
28+
<h4>groovy-test-5.0.5.jar</h4>
2929

3030
<ul>
31-
<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/5.0.4/distribution/apache-groovy-binary-5.0.4.zip">https://dist.apache.org/repos/dist/release/groovy/5.0.4/distribution/apache-groovy-binary-5.0.4.zip</a></li>
32-
<li>Sources available at: <a href="https://dist.apache.org/repos/dist/release/groovy/5.0.4/sources/apache-groovy-src-5.0.4.zip">https://dist.apache.org/repos/dist/release/groovy/5.0.4/sources/apache-groovy-src-5.0.4.zip</a></li>
31+
<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/5.0.5/distribution/apache-groovy-binary-5.0.5.zip">https://dist.apache.org/repos/dist/release/groovy/5.0.5/distribution/apache-groovy-binary-5.0.5.zip</a></li>
32+
<li>Sources available at: <a href="https://dist.apache.org/repos/dist/release/groovy/5.0.5/sources/apache-groovy-src-5.0.5.zip">https://dist.apache.org/repos/dist/release/groovy/5.0.5/sources/apache-groovy-src-5.0.5.zip</a></li>
3333
<li>License kind: ASL</li>
3434
<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>
3535
<li>License text: <a href="about_files/asl2-license.txt">asl2-license.txt</a></li>
@@ -45,25 +45,25 @@ <h4>ivy-2.5.3.jar</h4>
4545
<li>License text: <a href="about_files/asl2-license.txt">asl2-license.txt</a></li>
4646
</ul>
4747

48-
<h4>groovy-console-5.0.4.jar</h4>
49-
<h4>groovy-groovysh-5.0.4.jar</h4>
50-
<h4>groovy-json-5.0.4.jar</h4>
51-
<h4>groovy-swing-5.0.4.jar</h4>
52-
<h4>groovy-templates-5.0.4.jar</h4>
53-
<h4>groovy-xml-5.0.4.jar</h4>
48+
<h4>groovy-console-5.0.5.jar</h4>
49+
<h4>groovy-groovysh-5.0.5.jar</h4>
50+
<h4>groovy-json-5.0.5.jar</h4>
51+
<h4>groovy-swing-5.0.5.jar</h4>
52+
<h4>groovy-templates-5.0.5.jar</h4>
53+
<h4>groovy-xml-5.0.5.jar</h4>
5454
<h4>javaparser-core-3.28.0.jar</h4>
5555

5656
<ul>
57-
<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/5.0.4/distribution/apache-groovy-binary-5.0.4.zip">https://dist.apache.org/repos/dist/release/groovy/5.0.4/distribution/apache-groovy-binary-5.0.4.zip</a></li>
57+
<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/5.0.5/distribution/apache-groovy-binary-5.0.5.zip">https://dist.apache.org/repos/dist/release/groovy/5.0.5/distribution/apache-groovy-binary-5.0.5.zip</a></li>
5858
<li>License kind: ASL</li>
5959
<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>
6060
<li>License text: <a href="about_files/asl2-license.txt">asl2-license.txt</a></li>
6161
</ul>
6262

63-
<h4>jline-3.30.6.jar</h4>
63+
<h4>jline-3.30.9.jar</h4>
6464

6565
<ul>
66-
<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/5.0.4/distribution/apache-groovy-binary-5.0.4.zip">https://dist.apache.org/repos/dist/release/groovy/5.0.4/distribution/apache-groovy-binary-5.0.4.zip</a></li>
66+
<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/5.0.5/distribution/apache-groovy-binary-5.0.5.zip">https://dist.apache.org/repos/dist/release/groovy/5.0.5/distribution/apache-groovy-binary-5.0.5.zip</a></li>
6767
<li>License kind: BSD</li>
6868
<li>License URL: <a href="https://www.opensource.org/licenses/bsd-license.php">https://www.opensource.org/licenses/bsd-license.php</a></li>
6969
<li>License text: <a href="about_files/jline3-license.txt">jline3-license.txt</a></li>

base/org.codehaus.groovy50/lib/console/groovy-console-5.0.4.jar renamed to base/org.codehaus.groovy50/lib/console/groovy-console-5.0.5.jar

806 KB
Binary file not shown.

base/org.codehaus.groovy50/lib/console/groovy-swing-5.0.4.jar renamed to base/org.codehaus.groovy50/lib/console/groovy-swing-5.0.5.jar

325 KB
Binary file not shown.

base/org.codehaus.groovy50/lib/console/groovy-templates-5.0.4.jar renamed to base/org.codehaus.groovy50/lib/console/groovy-templates-5.0.5.jar

96.1 KB
Binary file not shown.

base/org.codehaus.groovy50/lib/console/groovy-xml-5.0.4.jar renamed to base/org.codehaus.groovy50/lib/console/groovy-xml-5.0.5.jar

219 KB
Binary file not shown.

0 commit comments

Comments
 (0)