[groovy] branch master updated: GROOVY-10521: add test case
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new 750172d GROOVY-10521: add test case
750172d is described below
commit 750172d5728b313affebc3858a41618623b8168f
Author: Eric Milles
AuthorDate: Sat Mar 5 13:22:03 2022 -0600
GROOVY-10521: add test case
---
.../traitx/TraitASTTransformationTest.groovy | 50 +-
1 file changed, 39 insertions(+), 11 deletions(-)
diff --git
a/src/test/org/codehaus/groovy/transform/traitx/TraitASTTransformationTest.groovy
b/src/test/org/codehaus/groovy/transform/traitx/TraitASTTransformationTest.groovy
index b49bb91..ca9289e 100644
---
a/src/test/org/codehaus/groovy/transform/traitx/TraitASTTransformationTest.groovy
+++
b/src/test/org/codehaus/groovy/transform/traitx/TraitASTTransformationTest.groovy
@@ -2954,6 +2954,33 @@ final class TraitASTTransformationTest {
}
}
+trait T10521 {
+def m(Class clazz, Object... array) {
+clazz.name + array
+}
+}
+
+@Test // GROOVY-10521
+void testVariadicMethodOfPrecompiledTrait() {
+
System.setProperty('spock.iKnowWhatImDoing.disableGroovyVersionCheck','true')
+assertScript """
+@Grab('org.spockframework:spock-core:2.2-M1-groovy-4.0')
+@GrabExclude('org.apache.groovy:*')
+import spock.lang.Specification
+
+class C extends Specification implements ${T10521.name} {
+void test() {
+ when:
+String result = m(Object,'x')
+ then:
+result == 'java.lang.Object[x]'
+}
+}
+
+org.junit.runner.JUnitCore.runClasses(C)
+"""
+}
+
@Test // GROOVY-7287
void testTraitWithMethodLevelGenericsShadowing1() {
assertScript '''
@@ -3018,21 +3045,22 @@ final class TraitASTTransformationTest {
'''
}
+trait T7297 {
+String title
+def List m(U data) {
+[data]
+}
+}
+
@Test // GROOVY-7297
-void testMethodlevelGenericsFromPrecompiledClass() {
-// TODO: T needs to be outside the script
-assertScript '''
-trait T {
-String title
-public List m(U data) {
-}
-}
-class C implements T {
+void testMethodLevelGenericsFromPrecompiledClass() {
+assertScript """
+class C implements ${T7297.name} {
}
def c = new C(title: 'some title')
assert c.title == 'some title'
-// TODO: assert c.m(...) == ?
-'''
+assert c.m('x') == ['x']
+"""
}
@Test // GROOVY-9763
[groovy] branch GROOVY_3_0_X updated: GROOVY-10519: v9 ClassFinder closes existing FileSystems that it doesn't own
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY_3_0_X by this push:
new dcc329f GROOVY-10519: v9 ClassFinder closes existing FileSystems that
it doesn't own
dcc329f is described below
commit dcc329fc09e86178ebe39cd07063cc720aa41d0a
Author: Paul King
AuthorDate: Fri Mar 4 11:26:10 2022 +1000
GROOVY-10519: v9 ClassFinder closes existing FileSystems that it doesn't own
---
.../codehaus/groovy/vmplugin/v9/ClassFinder.java | 26 +-
1 file changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/vmplugin/v9/ClassFinder.java
b/src/main/java/org/codehaus/groovy/vmplugin/v9/ClassFinder.java
index f952598..9c4befe 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/v9/ClassFinder.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/v9/ClassFinder.java
@@ -18,6 +18,8 @@
*/
package org.codehaus.groovy.vmplugin.v9;
+import groovy.lang.Tuple2;
+
import java.io.File;
import java.io.IOException;
import java.net.URI;
@@ -115,8 +117,10 @@ public class ClassFinder {
final int prefixElemCnt = prefix.trim().isEmpty() ? 0 :
prefix.split(sepPatten).length;
Map> result = new LinkedHashMap<>();
-try (FileSystem fs = newFileSystem(uri)) {
-Files.walkFileTree(fs.getPath(prefix + "/" + packageName), new
SimpleFileVisitor() {
+Tuple2 fsMaybeNew = null;
+try {
+fsMaybeNew = maybeNewFileSystem(uri);
+Files.walkFileTree(fsMaybeNew.getV1().getPath(prefix + "/" +
packageName), new SimpleFileVisitor() {
@Override
public FileVisitResult preVisitDirectory(Path path,
BasicFileAttributes attrs) {
return FileVisitResult.CONTINUE;
@@ -151,16 +155,28 @@ public class ClassFinder {
String.format("Failed to find classes via uri: %s, prefix:
%s, packageName: %s, recursive: %s",
uri, prefix, packageName, recursive
), e);
+} finally {
+// we only close file systems we opened
+if (fsMaybeNew != null && fsMaybeNew.getV2()) {
+closeQuietly(fsMaybeNew.getV1());
+}
}
return result;
}
-private static FileSystem newFileSystem(URI uri) throws IOException {
+private static void closeQuietly(FileSystem fs) {
+try {
+fs.close();
+} catch (IOException ignore) {
+}
+}
+
+private static Tuple2 maybeNewFileSystem(URI uri)
throws IOException {
try {
-return FileSystems.newFileSystem(uri, Collections.emptyMap());
+return new Tuple2(FileSystems.newFileSystem(uri,
Collections.emptyMap()), true);
} catch (FileSystemAlreadyExistsException e) {
-return FileSystems.getFileSystem(uri);
+return new Tuple2(FileSystems.getFileSystem(uri), false);
}
}
[groovy-dev-site] branch asf-site updated: 2022/03/05 12:01:00: Generated dev website from groovy-website@7b8a00f
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/groovy-dev-site.git The following commit(s) were added to refs/heads/asf-site by this push: new 63e43bc 2022/03/05 12:01:00: Generated dev website from groovy-website@7b8a00f 63e43bc is described below commit 63e43bc3c4cd591df24e1c43a8b323446dc0c49c Author: jenkins AuthorDate: Sat Mar 5 12:01:00 2022 + 2022/03/05 12:01:00: Generated dev website from groovy-website@7b8a00f --- download.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/download.html b/download.html index 0965892..68e4ae0 100644 --- a/download.html +++ b/download.html @@ -60,7 +60,7 @@ Improve this doc Download Download 4.0.0Ways to get Apache Groovy:Download a source or binary distribution.Use a package manager or bundle for your operating system.Refer to the appropriate Apache Groovy jars from your Download 4.0.0Ways to get Apache Groovy:Download a source or binary distribution.Use a package manager or bundle for your operating system.Refer to the appropriate Apache Groovy jars from your
[groovy-website] branch asf-site updated: Release 2.5.16: update sitemap
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/groovy-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 7b8a00f Release 2.5.16: update sitemap
7b8a00f is described below
commit 7b8a00ff23b534103df3fd900d7bccb341944a8c
Author: Paul King
AuthorDate: Sat Mar 5 21:49:19 2022 +1000
Release 2.5.16: update sitemap
---
site/src/site/sitemap-dev.groovy | 4
site/src/site/sitemap-user.groovy | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/site/src/site/sitemap-dev.groovy b/site/src/site/sitemap-dev.groovy
index 02742b1..9d13b98 100644
--- a/site/src/site/sitemap-dev.groovy
+++ b/site/src/site/sitemap-dev.groovy
@@ -114,6 +114,10 @@ downloads {
a(href: 'versioning.html', 'version')
yield ' of Groovy still in widespread use.'
}
+version('2.5.16') {
+stable true
+//windowsInstaller
'https://groovy.jfrog.io/artifactory/dist-release-local/groovy-windows-installer/groovy-2.5.16/'
+}
version('2.5.15') {
stable true
windowsInstaller
'https://groovy.jfrog.io/artifactory/dist-release-local/groovy-windows-installer/groovy-2.5.15/'
diff --git a/site/src/site/sitemap-user.groovy
b/site/src/site/sitemap-user.groovy
index 851d437..e1992bb 100644
--- a/site/src/site/sitemap-user.groovy
+++ b/site/src/site/sitemap-user.groovy
@@ -87,7 +87,7 @@ documentation {
'2.2.0', '2.2.1', '2.2.2',
'2.3.0', '2.3.1', '2.3.2', '2.3.3', '2.3.4', '2.3.5', '2.3.6',
'2.3.7', '2.3.8', '2.3.9', '2.3.10', '2.3.11',
'2.4.0', '2.4.1', '2.4.2', '2.4.3', '2.4.4', '2.4.5', '2.4.6',
'2.4.7', '2.4.8', '2.4.9', '2.4.10', '2.4.11', '2.4.12', '2.4.13', '2.4.14',
'2.4.15', '2.4.16', '2.4.17', '2.4.18', '2.4.19', '2.4.20', '2.4.21',
-'2.5.0-rc-1', '2.5.0-rc-2', '2.5.0-rc-3', '2.5.0', '2.5.1',
'2.5.2', '2.5.3', '2.5.4', '2.5.5', '2.5.6', '2.5.7', '2.5.8', '2.5.9',
'2.5.10', '2.5.11', '2.5.12', '2.5.13', '2.5.14', '2.5.15',
+'2.5.0-rc-1', '2.5.0-rc-2', '2.5.0-rc-3', '2.5.0', '2.5.1',
'2.5.2', '2.5.3', '2.5.4', '2.5.5', '2.5.6', '2.5.7', '2.5.8', '2.5.9',
'2.5.10', '2.5.11', '2.5.12', '2.5.13', '2.5.14', '2.5.15', '2.5.16',
'2.6.0-alpha-1', '2.6.0-alpha-2', '2.6.0-alpha-3', '2.6.0-alpha-4',
'3.0.0-alpha-1', '3.0.0-alpha-2', '3.0.0-alpha-3',
'3.0.0-alpha-4', '3.0.0-beta-1', '3.0.0-beta-2', '3.0.0-beta-3', '3.0.0-rc-1',
'3.0.0-rc-2', '3.0.0-rc-3', '3.0.0', '3.0.1', '3.0.2', '3.0.3', '3.0.4',
'3.0.5', '3.0.6', '3.0.7', '3.0.8', '3.0.9',
'4.0.0-alpha-1', '4.0.0-alpha-2', '4.0.0-alpha-3', '4.0.0-beta-1',
'4.0.0-beta-2', '4.0.0-rc-1', '4.0.0-rc-2', '4.0.0'
svn commit: r52879 - /dev/groovy/2.5.16/
Author: paulk Date: Sat Mar 5 11:49:18 2022 New Revision: 52879 Log: Deleting version 2.5.16 from the DEV staging area Removed: dev/groovy/2.5.16/
svn commit: r52878 - in /release/groovy/2.5.16: ./ distribution/ sources/
Author: paulk Date: Sat Mar 5 11:49:12 2022 New Revision: 52878 Log: Releasing version 2.5.16 Added: release/groovy/2.5.16/ release/groovy/2.5.16/distribution/ release/groovy/2.5.16/distribution/apache-groovy-binary-2.5.16.zip (with props) release/groovy/2.5.16/distribution/apache-groovy-binary-2.5.16.zip.asc release/groovy/2.5.16/distribution/apache-groovy-binary-2.5.16.zip.sha256 release/groovy/2.5.16/distribution/apache-groovy-docs-2.5.16.zip (with props) release/groovy/2.5.16/distribution/apache-groovy-docs-2.5.16.zip.asc release/groovy/2.5.16/distribution/apache-groovy-docs-2.5.16.zip.sha256 release/groovy/2.5.16/distribution/apache-groovy-sdk-2.5.16.zip (with props) release/groovy/2.5.16/distribution/apache-groovy-sdk-2.5.16.zip.asc release/groovy/2.5.16/distribution/apache-groovy-sdk-2.5.16.zip.sha256 release/groovy/2.5.16/sources/ release/groovy/2.5.16/sources/apache-groovy-src-2.5.16.zip (with props) release/groovy/2.5.16/sources/apache-groovy-src-2.5.16.zip.asc release/groovy/2.5.16/sources/apache-groovy-src-2.5.16.zip.sha256 Added: release/groovy/2.5.16/distribution/apache-groovy-binary-2.5.16.zip == Binary file - no diff available. Propchange: release/groovy/2.5.16/distribution/apache-groovy-binary-2.5.16.zip -- svn:mime-type = application/octet-stream Added: release/groovy/2.5.16/distribution/apache-groovy-binary-2.5.16.zip.asc == --- release/groovy/2.5.16/distribution/apache-groovy-binary-2.5.16.zip.asc (added) +++ release/groovy/2.5.16/distribution/apache-groovy-binary-2.5.16.zip.asc Sat Mar 5 11:49:12 2022 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: BCPG v1.58 + +iQIcBAABAgAGBQJiHvNbAAoJEGplF2oPsc0LSNQP/j3AoSWHh4sGMHLH+v7U5Rx8 +YMNHSVedJH3wKBj4ZQWFEldRlz+CFNxkI/yE9RtYdxgYMSws+oJpgAJ6bakNljdC +ulQYhxwbTKLElq/hlYYLfb90/7H8nw84BDqdw85XhbqEZJYSX3LuEV7s2vjWOfUr +WwkH+0S/RAv52AS/Ktd3mNbg8Y5WAtYFxKlWxC9NLTkvGp7dtaSNPuQ9GZOXHURs +PBLqwjodjmpbWg9UO3gC2If7BBK6RhGStegVL8RR0v7IFNJtc3VdI2dJ0EoLtjM/ +ADDCTFp6AWwa/STdXAk6VA3/HBf3TztYLW7g3q8FGoF2MYu3vApDKE8+I5tfsyOk +c8aqz9oR3GKTeeZirz5uLKcu5k03m9dDJxwX/RZtWJ2f4BacAptIcS81wYS0huOu +3IAf0rW1Yhms3EKlpKkCdXW7n3wi5u3xD/efVW+DjABrgkQ0AGK6aZKvmt6tkwVO +140LmKssK5whaU7ae4z1ylt6URa/1k6IyYoQShuN0IboO6L4IVNiNABMkZsZSd1e +yfA4e7HitshA9RLx29wqtAJS6CA7cMwVMdmuZ17VG8hthnVtZpu9LsOQFZafs4+x +aE90ABREduwnQlX73wBssGD8Io/I1vqIcsf0vIHDjerrnT9t4iROOHbd0g0sa7LP +30kVnpTR+grPX39mu5el +=orHV +-END PGP SIGNATURE- Added: release/groovy/2.5.16/distribution/apache-groovy-binary-2.5.16.zip.sha256 == --- release/groovy/2.5.16/distribution/apache-groovy-binary-2.5.16.zip.sha256 (added) +++ release/groovy/2.5.16/distribution/apache-groovy-binary-2.5.16.zip.sha256 Sat Mar 5 11:49:12 2022 @@ -0,0 +1 @@ +709a82e92d3b5a87bbf3684350083d71279c5e8d1f760b768fb64727be4bfec9 Added: release/groovy/2.5.16/distribution/apache-groovy-docs-2.5.16.zip == Binary file - no diff available. Propchange: release/groovy/2.5.16/distribution/apache-groovy-docs-2.5.16.zip -- svn:mime-type = application/octet-stream Added: release/groovy/2.5.16/distribution/apache-groovy-docs-2.5.16.zip.asc == --- release/groovy/2.5.16/distribution/apache-groovy-docs-2.5.16.zip.asc (added) +++ release/groovy/2.5.16/distribution/apache-groovy-docs-2.5.16.zip.asc Sat Mar 5 11:49:12 2022 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: BCPG v1.58 + +iQIcBAABAgAGBQJiHvNbAAoJEGplF2oPsc0LYVIQAI2sxMMWU+jwj6iDbETsw+0I +ElbE/Zl9+3/P+l6diecnzi4i4eVBgVyGs5M/PENKDr3YC/CO/3WMhwLicgpbAMnG +eqExhlfaRt2oNU9XMxjGhI/q593MvUWPmqtBbUFdxLhf7kST6y2H8xli3Li6RMZL +dgIBahhLRgckruiUpQ+tfmv8e36pLKAZlcUwBOJu0HkWW6uI4NGqUMcKzriPvffT +2Vot+eD445g9g7Vp95LCaMVKwU1jXTTzwiOvaKMFbUzJNqiEJNpPLCP9OdqYKa29 +L/RvNnTzcHBmc5c5Gig27cYrkIqOqOwjfIum8N8EGRil2vnIs1b4gSRy8+lvw2oI +StUdtBN9Qtwe3SyAuH1ye3Gypk+O1NRtTle5BNoB6QM6tFQpTK0bdGsczuMXBfIE +fnPw8WuXpTgY9D4oqTdaS4XTi0Wxt3CiJZlUMpE8K/QXRxZpZ6ygnT31NUgqL9Kq +ndABFCF7HZ28C2u3brcGm9HvPs40yDJRlf4L+cSgNA9d7X3i8I63VuwYHZr0N+n2 +iz8bAskrPIYG6LAeg7xyYKyQtVQ8Dn8yAbyzfRuKUaXHj2aVgi3+GVJXfL8UXTws +X7fZhFNa2Me1QGAfyYHXLw6k81Kbt1TthIkCNmBDh5zHn2rYoSYhSPgvjyRg1P8r +XHnyXjMpBJo44ILX1k8V +=GcJ6 +-END PGP SIGNATURE- Added: release/groovy/2.5.16/distribution/apache-groovy-docs-2.5.16.zip.sha256 == --- release/groovy/2.5.16/distribution/apache-groovy-docs-2.5.16.zip.sha256 (added) +++ release/groovy/2.5.16/dist
[groovy] branch GROOVY_2_5_X updated: Bump version on GROOVY_2_5_X branch
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY_2_5_X by this push:
new 99ecd0b Bump version on GROOVY_2_5_X branch
99ecd0b is described below
commit 99ecd0b4503ee052466c0c73d9a6ec8b3bab6d22
Author: Paul King
AuthorDate: Sat Mar 5 21:45:32 2022 +1000
Bump version on GROOVY_2_5_X branch
---
gradle.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index 49f68af..3794853 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,9 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-groovyVersion = 2.5.16-SNAPSHOT
+groovyVersion = 2.5.17-SNAPSHOT
# bundle version format: major('.'minor('.'micro('.'qualifier)?)?)? (first 3
only digits)
-groovyBundleVersion = 2.5.16.SNAPSHOT
+groovyBundleVersion = 2.5.17.SNAPSHOT
# latest version which runs jdk 7
# we build under 8+ but test against 7
[groovy] 01/01: Release 4.0.1: update versions
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to annotated tag GROOVY_4_0_1
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 40530f2812e37af8dc13d8d3fbc8ccef7497378f
Author: Paul King
AuthorDate: Sat Mar 5 20:45:47 2022 +1000
Release 4.0.1: update versions
---
gradle.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index fcea8d3..f307bf6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,9 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-groovyVersion=4.0.1-SNAPSHOT
+groovyVersion=4.0.1
# bundle version format: major('.'minor('.'micro('.'qualifier)?)?)? (first 3
only digits)
-groovyBundleVersion=4.0.1.SNAPSHOT
+groovyBundleVersion=4.0.1
groovyTargetBytecodeVersion=1.8
targetJavaVersion=8
[groovy] annotated tag GROOVY_4_0_1 created (now 1379dae)
This is an automated email from the ASF dual-hosted git repository. paulk pushed a change to annotated tag GROOVY_4_0_1 in repository https://gitbox.apache.org/repos/asf/groovy.git. at 1379dae (tag) tagging 40530f2812e37af8dc13d8d3fbc8ccef7497378f (commit) by paulk on Sat Mar 5 21:25:50 2022 +1000 - Log - Release Groovy 4.0.1 --- This annotated tag includes the following new commits: new 40530f2 Release 4.0.1: update versions The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
svn commit: r52876 - in /dev/groovy/4.0.1: ./ distribution/ sources/
Author: paulk Date: Sat Mar 5 11:25:48 2022 New Revision: 52876 Log: New version GROOVY_4_0_X 4.0.1 added to staging area Added: dev/groovy/4.0.1/ dev/groovy/4.0.1/distribution/ dev/groovy/4.0.1/distribution/apache-groovy-binary-4.0.1.zip (with props) dev/groovy/4.0.1/distribution/apache-groovy-binary-4.0.1.zip.asc dev/groovy/4.0.1/distribution/apache-groovy-binary-4.0.1.zip.sha256 dev/groovy/4.0.1/distribution/apache-groovy-docs-4.0.1.zip (with props) dev/groovy/4.0.1/distribution/apache-groovy-docs-4.0.1.zip.asc dev/groovy/4.0.1/distribution/apache-groovy-docs-4.0.1.zip.sha256 dev/groovy/4.0.1/distribution/apache-groovy-sdk-4.0.1.zip (with props) dev/groovy/4.0.1/distribution/apache-groovy-sdk-4.0.1.zip.asc dev/groovy/4.0.1/distribution/apache-groovy-sdk-4.0.1.zip.sha256 dev/groovy/4.0.1/sources/ dev/groovy/4.0.1/sources/apache-groovy-src-4.0.1.zip (with props) dev/groovy/4.0.1/sources/apache-groovy-src-4.0.1.zip.asc dev/groovy/4.0.1/sources/apache-groovy-src-4.0.1.zip.sha256 Added: dev/groovy/4.0.1/distribution/apache-groovy-binary-4.0.1.zip == Binary file - no diff available. Propchange: dev/groovy/4.0.1/distribution/apache-groovy-binary-4.0.1.zip -- svn:mime-type = application/octet-stream Added: dev/groovy/4.0.1/distribution/apache-groovy-binary-4.0.1.zip.asc == --- dev/groovy/4.0.1/distribution/apache-groovy-binary-4.0.1.zip.asc (added) +++ dev/groovy/4.0.1/distribution/apache-groovy-binary-4.0.1.zip.asc Sat Mar 5 11:25:48 2022 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: BCPG v1.68 + +iQIcBAABCgAGBQJiI0Q4AAoJEGplF2oPsc0LmJYP/1p0dduUVq9ikRRLpfarcqnP +2FQx4KwZ3bXRfdcDhBRVE66Eye/seoFwKTuckOy0RVrGdoh9GVfkeuCLvD8/+kIs +Uqa7TiVuZvZrZVQLj33Z9ihQXIoBKpdKnw5EdMb2qTwYf6s1R2uPJn/yqHtEuE4s +tKxkMDWjZULforXZV9JqK1OAJ9+Zg69cf1lQR2B3IB4cSPnlbY1vN8Cmzk4K30FK +rmPE2/JVb8DfQEb2a+GyjuPTQeagsv4VTJ3fwkzjdGMkVzpZwOciH032E/zbf/IZ +7RJM+kOFPBSCAW3gDnLQlJd2Gx9stQa5etCl8YRLuefW3vLXFcaxlRUXLyt7JnxD +V7ZAu4nTGd4P1ag73b1wy2VwzUh9FqNh5SFQzvKMWkzY30w+ou6cz7/51CMH5+Ki +I7AhSaOR1lMR1MU9Eu49MZxGWVfi5u03GJfuQ7mYlR4tBIBC4rsDmhNh0YYYfY9o +mH0l2C5XNcsbV7To+vMiQXQzaudF6obPVW6LVxw3suKbSSoB3dLC4/pA0dd46WG+ +vSYy6geIxxuj2DvV9jrr2fCdVJaDE5kVyD2XL44+tTRJLDH6Axen5QqOviTZVRf7 +UpszR05lQQk09aEsR2529+JDGGk458rSUxH4L2dsl2gFoqDF1pHPCbiJVJfvZQNP +n58JyAw+8gQapEdfDIUD +=BxoU +-END PGP SIGNATURE- Added: dev/groovy/4.0.1/distribution/apache-groovy-binary-4.0.1.zip.sha256 == --- dev/groovy/4.0.1/distribution/apache-groovy-binary-4.0.1.zip.sha256 (added) +++ dev/groovy/4.0.1/distribution/apache-groovy-binary-4.0.1.zip.sha256 Sat Mar 5 11:25:48 2022 @@ -0,0 +1 @@ +8ac4a0ccbdc69db3ff17cf20a43dafacc6396f031666f13ff2e7bc6e376e4497 Added: dev/groovy/4.0.1/distribution/apache-groovy-docs-4.0.1.zip == Binary file - no diff available. Propchange: dev/groovy/4.0.1/distribution/apache-groovy-docs-4.0.1.zip -- svn:mime-type = application/octet-stream Added: dev/groovy/4.0.1/distribution/apache-groovy-docs-4.0.1.zip.asc == --- dev/groovy/4.0.1/distribution/apache-groovy-docs-4.0.1.zip.asc (added) +++ dev/groovy/4.0.1/distribution/apache-groovy-docs-4.0.1.zip.asc Sat Mar 5 11:25:48 2022 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: BCPG v1.68 + +iQIcBAABCgAGBQJiI0D+AAoJEGplF2oPsc0LHFEP/i3qAUheIMB475KQcSBkbqJg +/EfOdMPBSWNmxqKyhbQwCeCs/i65mInan4aIbG7vWtBJmura8o1VnJygvher2xc2 +WkevBcSn9DJt86vvb3H9F7A6QhLfodtbyESOgvpNvFEOYA5axp+6zwj0tmnHrpcW +drox31hCYg91kEbJOPQWgYCpDYn0AJvCvBE5aQB7qWH00xOPDrXPb3elEREckd/E +S+hfgj0qktrpFMwb8Ik67stRhJ6t1XeBVoONnmw3V4y7AS6u3MhIusWFMxSV4Uli +VdDRdUPiLEBvkQ05cS1ocZRHnIPYaJv0fxju214Kf6VHd6upm2NipNgpvyDkwpJg +h7GTrxn0eZbWMm4xDkEnyVrSlEP3Zor6lhct4pOcqr548181cN7lDlCKyQv7a7/b +3jd/RJLzDJLgyQ4IeOm2+Ct5KMCCUAuUXrTaOZFQXayVCwfNM6a7r4qW+OxedHJB ++y2kZG9afk2sWRnvSQ14JWhcQx02GQiXZoX6igcfNGjHvhy2uK4EMXJVTsX82C9q +n6+frYNlKJOu3eMVvURGoktoFFWwsQD1l788XZeBKFI1y5fX4ICNWMdat2AUj1Gh +TW6jNEc1Bm/nK5X5x7vWZVSFfziytFQQxZ204+cFc336VyXdtDunwvdEk34alCmb +OsDYrTmzj4BIdbQ3Z5Xg +=qvRN +-END PGP SIGNATURE- Added: dev/groovy/4.0.1/distribution/apache-groovy-docs-4.0.1.zip.sha256 == --- dev/groovy/4.0.1/distribution/apache-groovy-docs-4.0.1.zip.sha256 (added) +++ dev/groovy/4.0.1/distribution/apache-groovy-docs-4.0.1.zip.sha256 Sat Mar 5 11:25:48 2022 @@ -0,0 +1 @@ +d9470a3eda7ebb743c8e62794abb86527ba534e0a5a54e029edffe176a11492f Added: d
svn commit: r52874 - /dev/groovy/4.0.1/
Author: paulk Date: Sat Mar 5 10:41:00 2022 New Revision: 52874 Log: Deleting version 4.0.1 from the DEV staging area Removed: dev/groovy/4.0.1/
[groovy] annotated tag GROOVY_4_0_1 deleted (was de81e56)
This is an automated email from the ASF dual-hosted git repository. paulk pushed a change to annotated tag GROOVY_4_0_1 in repository https://gitbox.apache.org/repos/asf/groovy.git. *** WARNING: tag GROOVY_4_0_1 was deleted! *** tag was de81e56 This change permanently discards the following revisions: discard 0e0ffcf Release 4.0.1: update versions
[groovy] 03/04: Revert "jarjar experiment"
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 596aa2eeb0f17a2bb6a815eb5248d144042b33de
Author: Paul King
AuthorDate: Sat Mar 5 20:14:43 2022 +1000
Revert "jarjar experiment"
This reverts commit 129b277bb89eb600744d89ae42ca8c117adbd246.
---
buildSrc/src/main/groovy/org.apache.groovy-common.gradle | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-common.gradle
b/buildSrc/src/main/groovy/org.apache.groovy-common.gradle
index 1863e2a..cb9ceeb 100644
--- a/buildSrc/src/main/groovy/org.apache.groovy-common.gradle
+++ b/buildSrc/src/main/groovy/org.apache.groovy-common.gradle
@@ -66,7 +66,6 @@ tasks.named('rat') {
'**/jquery-2.1.1.min.js', // MIT license as per NOTICE/LICENSE
files
'.classpath', '.project', '.settings/**', 'bin/**', // Eclipse
files
'bootstrap/settings.gradle', // empty file
-'.jqwik-database',
-'**/org.codehaus.groovy.transform.ASTTransformation'
+'.jqwik-database'
]
}
[groovy] branch GROOVY_4_0_X updated (94d18b0 -> 72fa01e)
This is an automated email from the ASF dual-hosted git repository. paulk pushed a change to branch GROOVY_4_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git. from 94d18b0 GROOVY-10519: v9 ClassFinder closes existing FileSystems that it doesn't own new 0a7d878 Revert "jarjar experiment" new c098011 Revert "jarjar experiment" new 596aa2e Revert "jarjar experiment" new 72fa01e rollback to 1.8.0 of jarjar The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: buildSrc/src/main/groovy/org.apache.groovy-common.gradle | 3 +-- gradle/verification-metadata.xml | 6 +- .../org.codehaus.groovy.transform.ASTTransformation | 16 .../org.codehaus.groovy.transform.ASTTransformation | 16 .../org.codehaus.groovy.transform.ASTTransformation | 16 .../org.codehaus.groovy.transform.ASTTransformation | 16 versions.properties | 2 +- 7 files changed, 71 insertions(+), 4 deletions(-)
[groovy] 04/04: rollback to 1.8.0 of jarjar
This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch GROOVY_4_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git commit 72fa01eb5644affd1d53ba9138dedcc215a63b85 Author: Paul King AuthorDate: Sat Mar 5 20:15:34 2022 +1000 rollback to 1.8.0 of jarjar --- gradle/verification-metadata.xml | 6 +- versions.properties | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 701c476..ca30e5e 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -148,7 +148,6 @@ - @@ -293,6 +292,11 @@ + + + + + diff --git a/versions.properties b/versions.properties index 70ce3b5..94610db 100644 --- a/versions.properties +++ b/versions.properties @@ -29,7 +29,7 @@ gpars=1.2.1 ivy=2.5.0 jansi=2.4.0 jackson=2.13.1 -jarjar=1.8.1 +jarjar=1.8.0 javaParser=3.24.0 jline=2.14.6 jmh=1.27
[groovy] 02/04: Revert "jarjar experiment"
This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch GROOVY_4_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git commit c09801176fa53c628a8ffacb5b06fafc5bfed438 Author: Paul King AuthorDate: Sat Mar 5 20:14:18 2022 +1000 Revert "jarjar experiment" This reverts commit bfdbb94bce37839fecc108d47d0c5f22504825c5. --- .../org.codehaus.groovy.transform.ASTTransformation | 16 .../org.codehaus.groovy.transform.ASTTransformation | 16 .../org.codehaus.groovy.transform.ASTTransformation | 16 3 files changed, 48 insertions(+) diff --git a/subprojects/groovy-astbuilder/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation b/subprojects/groovy-astbuilder/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation index a7f532f..94f88b4 100644 --- a/subprojects/groovy-astbuilder/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation +++ b/subprojects/groovy-astbuilder/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation @@ -1 +1,17 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#global transformation for AST Builder org.apache.groovy.ast.builder.AstBuilderTransformation diff --git a/subprojects/groovy-contracts/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation b/subprojects/groovy-contracts/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation index d9a4cec..a5c12e0 100644 --- a/subprojects/groovy-contracts/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation +++ b/subprojects/groovy-contracts/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation @@ -1,2 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# global xforms for groovy-contracts org.apache.groovy.contracts.ast.GContractsASTTransformation org.apache.groovy.contracts.ast.ClosureExpressionEvaluationASTTransformation \ No newline at end of file diff --git a/subprojects/groovy-macro/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation b/subprojects/groovy-macro/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation index faa45b3..e080e18 100644 --- a/subprojects/groovy-macro/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation +++ b/subprojects/groovy-macro/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation @@ -1,2 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#global transformation for macro support org.c
[groovy] 01/04: Revert "jarjar experiment"
This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch GROOVY_4_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git commit 0a7d878dd18f01c93de2bd0ee92486ac6065f502 Author: Paul King AuthorDate: Sat Mar 5 20:13:44 2022 +1000 Revert "jarjar experiment" This reverts commit bbd7554d4672caffeab8fda9e3bc709e6a062054. --- .../org.codehaus.groovy.transform.ASTTransformation | 16 1 file changed, 16 insertions(+) diff --git a/src/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation b/src/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation index 447988f..3836360 100644 --- a/src/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation +++ b/src/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation @@ -1 +1,17 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# global transformation to handle @Grab annotation groovy.grape.GrabAnnotationTransformation
