You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2022/08/26 06:27:46 UTC
[groovy] branch GROOVY_4_0_X updated (da2d59021a -> 68bbbeff6a)
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 da2d59021a GROOVY-8074: SC: property syntax for groovy object that implements `Map`
new c0d38bec72 GROOVY-10728: Enhance groovy-dateutil extensions to support collections of indices when accessing Calendar/Date
new 231d71624c update dependency metadata
new f3f0a127ad GROOVY-10729: Bump JUnit Jupiter/JUnit Platform to 5.9.0/1.9.0
new 94f18d87f0 typo
new 9922519447 minor test refactor
new 68bbbeff6a minor test refactor - fix test name
The 6 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:
gradle/verification-metadata.xml | 233 +++++++++++++++++++++
src/test/groovy/bugs/Groovy8026Bug.groovy | 2 +-
src/test/groovy/inspect/InspectorTest.java | 2 +-
.../groovy/transform/ImmutableTransformTest.groovy | 7 +-
.../dateutil/extensions/DateUtilExtensions.java | 44 +++-
.../extensions/DateUtilExtensionsTest.java | 12 ++
versions.properties | 4 +-
7 files changed, 296 insertions(+), 8 deletions(-)
[groovy] 01/06: GROOVY-10728: Enhance groovy-dateutil extensions to support collections of indices when accessing Calendar/Date
Posted by pa...@apache.org.
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 c0d38bec72717b1cbd963e12ad0accd392c77f36
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed Aug 24 19:20:46 2022 +1000
GROOVY-10728: Enhance groovy-dateutil extensions to support collections of indices when accessing Calendar/Date
---
.../dateutil/extensions/DateUtilExtensions.java | 44 +++++++++++++++++++++-
.../extensions/DateUtilExtensionsTest.java | 12 ++++++
2 files changed, 55 insertions(+), 1 deletion(-)
diff --git a/subprojects/groovy-dateutil/src/main/java/org/apache/groovy/dateutil/extensions/DateUtilExtensions.java b/subprojects/groovy-dateutil/src/main/java/org/apache/groovy/dateutil/extensions/DateUtilExtensions.java
index b2fb898906..a0c57bdeab 100644
--- a/subprojects/groovy-dateutil/src/main/java/org/apache/groovy/dateutil/extensions/DateUtilExtensions.java
+++ b/subprojects/groovy-dateutil/src/main/java/org/apache/groovy/dateutil/extensions/DateUtilExtensions.java
@@ -20,13 +20,17 @@ package org.apache.groovy.dateutil.extensions;
import groovy.lang.Closure;
import groovy.lang.GroovyRuntimeException;
+import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
import java.sql.Timestamp;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Calendar;
+import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.TimeZone;
@@ -35,6 +39,7 @@ import java.util.TimeZone;
* Date and Calendar classes inside the Groovy environment.
*/
public class DateUtilExtensions {
+ private DateUtilExtensions() {}
/**
* Support the subscript operator for a Date.
@@ -48,7 +53,22 @@ public class DateUtilExtensions {
public static int getAt(Date self, int field) {
Calendar cal = Calendar.getInstance();
cal.setTime(self);
- return cal.get(field);
+ return getAt(cal, field);
+ }
+
+ /**
+ * Support the subscript operator for a Date with a collection of indices.
+ *
+ * @param self a Date
+ * @param fields a collection of Calendar fields, e.g. [YEAR, MONTH]
+ * @return the value for the given field, e.g. [2022, FEBRUARY]
+ * @see java.util.Calendar
+ * @since 4.0.5
+ */
+ public static List<Integer> getAt(Date self, Collection fields) {
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(self);
+ return getAt(cal, fields);
}
/**
@@ -77,6 +97,28 @@ public class DateUtilExtensions {
return self.get(field);
}
+ /**
+ * Support the subscript operator for a Calendar with a collection of indices.
+ *
+ * @param self a Calendar
+ * @param fields a collection of Calendar fields, e.g. [YEAR, MONTH]
+ * @return the value for the given field, e.g. [2022, FEBRUARY]
+ * @see java.util.Calendar
+ * @since 4.0.5
+ */
+ public static List<Integer> getAt(Calendar self, Collection fields) {
+ List<Integer> answer = new ArrayList<>(fields.size());
+ for (Object field : fields) {
+ if (field instanceof Collection) {
+ answer.addAll(getAt(self, (Collection) field));
+ } else {
+ int idx = DefaultTypeTransformation.intUnbox(field);
+ answer.add(getAt(self, idx));
+ }
+ }
+ return answer;
+ }
+
/**
* Support the subscript operator for mutating a Calendar.
* Example usage:
diff --git a/subprojects/groovy-dateutil/src/test/java/org/apache/groovy/dateutil/extensions/DateUtilExtensionsTest.java b/subprojects/groovy-dateutil/src/test/java/org/apache/groovy/dateutil/extensions/DateUtilExtensionsTest.java
index 8cecc5b106..e2f21cea7f 100644
--- a/subprojects/groovy-dateutil/src/test/java/org/apache/groovy/dateutil/extensions/DateUtilExtensionsTest.java
+++ b/subprojects/groovy-dateutil/src/test/java/org/apache/groovy/dateutil/extensions/DateUtilExtensionsTest.java
@@ -24,10 +24,13 @@ import org.junit.Test;
import java.sql.Timestamp;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
+import java.util.List;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
public class DateUtilExtensionsTest {
@Test
@@ -61,4 +64,13 @@ public class DateUtilExtensionsTest {
calendar.setTime(sdf.parse("20180101"));
assertEquals("20171231", sdf.format(DateUtilExtensions.previous(calendar).getTime()));
}
+
+ @Test
+ public void calendarCollectGetAt() {
+ Calendar calendar = Calendar.getInstance();
+ List<Integer> result = DateUtilExtensions.getAt(calendar, Arrays.asList(Calendar.YEAR, Calendar.MONTH, Calendar.DAY_OF_MONTH));
+ assertTrue("Year", result.get(0) >= 2022);
+ assertTrue("Month", result.get(1) <= 11);
+ assertTrue("Day", result.get(2) <= 31);
+ }
}
[groovy] 04/06: typo
Posted by pa...@apache.org.
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 94f18d87f08fbdf8f9d54fa73e64b1f353dfeae8
Author: Paul King <pa...@asert.com.au>
AuthorDate: Thu Aug 25 23:32:50 2022 +1000
typo
---
src/test/groovy/inspect/InspectorTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/groovy/inspect/InspectorTest.java b/src/test/groovy/inspect/InspectorTest.java
index 6284da9831..c656f69713 100644
--- a/src/test/groovy/inspect/InspectorTest.java
+++ b/src/test/groovy/inspect/InspectorTest.java
@@ -51,7 +51,7 @@ public class InspectorTest extends MockObjectTestCase implements Serializable {
assertEquals(object, inspector.getObject());
try {
new Inspector(null);
- fail("should have thown IllegalArgumentException");
+ fail("should have thrown IllegalArgumentException");
} catch (Exception expected) {
}
}
[groovy] 03/06: GROOVY-10729: Bump JUnit Jupiter/JUnit Platform to 5.9.0/1.9.0
Posted by pa...@apache.org.
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 f3f0a127ad9b1a02820c90b32964b67e83091047
Author: Paul King <pa...@asert.com.au>
AuthorDate: Thu Aug 25 21:38:17 2022 +1000
GROOVY-10729: Bump JUnit Jupiter/JUnit Platform to 5.9.0/1.9.0
---
gradle/verification-metadata.xml | 1 +
versions.properties | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index ac7ab7cace..bb6868db54 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -178,6 +178,7 @@
<trusted-key id="b94797af54ae59b1e3c154da8e1ad594207b7fb2" group="org.reflections" name="reflections" version="0.9.12"/>
<trusted-key id="ba926f64ca647b6d853a38672e2010f8a7ff4a41" group="org.codehaus.plexus"/>
<trusted-key id="bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae" group="com.google.guava"/>
+ <trusted-key id="be685132afd2740d9095f9040cc0b712fee75827" group="org.assertj" name="assertj-core"/>
<trusted-key id="c5c776287800887af679da34d03081ee195be743" group="net.javacrumbs.json-unit"/>
<trusted-key id="c739ce4075d9f0f0ded13a7d39be51a1084c9113" group="org.apache.maven.doxia"/>
<trusted-key id="c7be5bcc9fec15518cfda882b0f3710fa64900e7" group="com.google.code.gson" name="gson"/>
diff --git a/versions.properties b/versions.properties
index 64f2b63a69..35a62531b4 100644
--- a/versions.properties
+++ b/versions.properties
@@ -51,8 +51,8 @@ spock=2.1-groovy-3.0
spotbugs=4.7.1
spotbugsAnnotations=4.7.1
checkstyle=9.3
-junit5=5.8.2
-junit5Platform=1.8.2
+junit5=5.9.0
+junit5Platform=1.9.0
jcipAnnotations=1.0
treelayout=1.0.3
javaxServletApi=4.0.1
[groovy] 06/06: minor test refactor - fix test name
Posted by pa...@apache.org.
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 68bbbeff6aacb51a6571d2ca829940efcbce32f2
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri Aug 26 00:32:10 2022 +1000
minor test refactor - fix test name
---
src/test/groovy/bugs/Groovy8026Bug.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/groovy/bugs/Groovy8026Bug.groovy b/src/test/groovy/bugs/Groovy8026Bug.groovy
index ef0ec4ca87..99a55b9394 100644
--- a/src/test/groovy/bugs/Groovy8026Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8026Bug.groovy
@@ -21,7 +21,7 @@ package groovy.bugs
import groovy.test.GroovyTestCase
class Groovy8026Bug extends GroovyTestCase {
- void testJavaBeanPropertiesAvailableInInnerClasses() {
+ void testMatcherGetAtCases() {
assertScript '''
def mm = '1 2 3 4 5 6 7 8 9' =~ /\\d/
assert mm.collect { it }.toString() == '[1, 2, 3, 4, 5, 6, 7, 8, 9]'
[groovy] 02/06: update dependency metadata
Posted by pa...@apache.org.
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 231d71624c0d0e1b9373d41d482b1d180ca3bf7a
Author: Paul King <pa...@asert.com.au>
AuthorDate: Thu Aug 25 21:08:15 2022 +1000
update dependency metadata
---
gradle/verification-metadata.xml | 232 +++++++++++++++++++++++++++++++++++++++
1 file changed, 232 insertions(+)
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 37dc564ca7..ac7ab7cace 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -57,6 +57,9 @@
<ignored-key id="6a65176a0fb1cd0b" reason="Key couldn't be downloaded from any key server"/>
<ignored-key id="7ecbd740ff06aeb5" reason="Key couldn't be downloaded from any key server"/>
<ignored-key id="d908a43fb7ec07ac" reason="Key couldn't be downloaded from any key server"/>
+ <ignored-key id="9ff25980f5ba7e4f" reason="Key couldn't be downloaded from any key server"/>
+ <ignored-key id="25a73bfc746e1035" reason="Key couldn't be downloaded from any key server"/>
+ <ignored-key id="7d713008cc07e9ad" reason="Key couldn't be downloaded from any key server"/>
</ignored-keys>
<trusted-keys>
<trusted-key id="019082bc00e0324e2aef4cf00d3b328562a119a7" group="org.openjdk.jmh"/>
@@ -169,6 +172,7 @@
<trusting group="org.jboss.weld"/>
</trusted-key>
<trusted-key id="b38e195d438d44a1a8d2d2203575e1c767076ca8" group="javax.xml.bind"/>
+ <trusted-key id="b59b67fd7904984367f931800818d9d68fb67bac" group="^org[.]eclipse[.]jetty($|([.].*))" regex="true"/>
<trusted-key id="b6e73d84ea4fcc47166087253faad2cd5ecbb314" group="commons-beanutils"/>
<trusted-key id="b801e2f8ef035068ec1139cc29579f18fa8fd93b" group="com.google.j2objc" name="j2objc-annotations"/>
<trusted-key id="b94797af54ae59b1e3c154da8e1ad594207b7fb2" group="org.reflections" name="reflections" version="0.9.12"/>
@@ -270,6 +274,11 @@
<sha512 value="5f881cb5fc18df80f574ab3af261ef4a45a628794b40c3ffd896af98b9fbbf06ad65ac41e0688fefc9769901bc84a0eff866c77bf07af467a26c811003845f62" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
+ <component group="berkeleydb" name="je" version="3.2.76">
+ <artifact name="je-3.2.76.jar">
+ <sha512 value="3109d8c7eacfacc7f9801f8f00910f1910eac1f59ff2a701187259fb283779414af3ca333377a14ec2c3e28e7c47768a74a37a20c4087aa4111fa374a7f45ab0" origin="Generated by Gradle because artifact wasn't signed"/>
+ </artifact>
+ </component>
<component group="biz.aQute.bnd" name="biz.aQute.bndlib" version="5.2.0">
<artifact name="biz.aQute.bndlib-5.2.0.jar">
<pgp value="32d98ffd50617f6ed7e6abd236feecf06c2da10b"/>
@@ -290,6 +299,11 @@
<sha512 value="5d1c94fa87cfcd116539b49828656d5ba43c4eb342ccaab149cf891c95bc598b427d7210a43f3f0e9c788cd2b1f281b94b9c159d7c6a239d56c7df82f06ca459" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
+ <component group="com.baulsupp.kolja" name="jcurses" version="0.9.5.3">
+ <artifact name="jcurses-0.9.5.3.jar">
+ <sha512 value="a017dd85aea145343c5a955cc8ba60e47d1f9f6b6e3680e813a51f668db90bb0e34a7282e1467ff992311165fed5d70adaa83222eb862caea7c0c96a6ddd895b" origin="Generated by Gradle because artifact wasn't signed"/>
+ </artifact>
+ </component>
<component group="com.beust" name="jcommander" version="1.78">
<artifact name="jcommander-1.78.jar">
<pgp value="dcba03381ef6c89096acd985ac5ec74981f9cda6"/>
@@ -398,11 +412,21 @@
<sha512 value="3f205ad4e7b8dd11c48d3c9203128e37e432b92b90e6052545d34ce6b602374d81840b64e3cca41fe3bcb5c7ab1053e587b1b940d11d486f5aa72380ebf7d6e5" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
+ <component group="com.jcraft" name="jsch" version="0.1.42">
+ <artifact name="jsch-0.1.42.jar">
+ <sha512 value="900f9f14bbad4c4140dace31527134f831cf73c0315445dad20a5c3e49f23910a2871dc39a58a315cf5a4581a19333bdb19d97da7902861672315270425a00bd" origin="Generated by Gradle because artifact wasn't signed"/>
+ </artifact>
+ </component>
<component group="com.puppycrawl.tools" name="checkstyle" version="9.3">
<artifact name="checkstyle-9.3.jar">
<pgp value="06d34ed6ff73de368a772a781063fe98bcecb758"/>
</artifact>
</component>
+ <component group="com.shapesecurity" name="salvation2" version="3.0.0">
+ <artifact name="salvation2-3.0.0.jar">
+ <pgp value="8eae59eb400e1f6a94945ccd3c1381c7d09af9e1"/>
+ </artifact>
+ </component>
<component group="com.sun.istack" name="istack-commons-runtime" version="3.0.8">
<artifact name="istack-commons-runtime-3.0.8.jar">
<sha512 value="e712166f961cca819a61bd6efc93b93759788d283af73dcc6ed09c0f9c045d7dc2f7fabc0e236b2996fcdebe26e1b2ec5ea45eb4353943dad82ecfef0488305e" origin="Generated by Gradle because a key couldn't be downloaded"/>
@@ -443,11 +467,21 @@
<pgp value="2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb"/>
</artifact>
</component>
+ <component group="commons-codec" name="commons-codec" version="1.15">
+ <artifact name="commons-codec-1.15.jar">
+ <pgp value="bc87a3fd0a54480f0badbebd21939ff0ca2a6567"/>
+ </artifact>
+ </component>
<component group="commons-collections" name="commons-collections" version="3.2.2">
<artifact name="commons-collections-3.2.2.jar">
<pgp value="0cc641c3a62453ab390066c4a41f13c999945293"/>
</artifact>
</component>
+ <component group="commons-httpclient" name="commons-httpclient" version="3.1">
+ <artifact name="commons-httpclient-3.1.jar">
+ <pgp value="0785b3eff60b1b1bea94e0bb7c25280eae63ebe5"/>
+ </artifact>
+ </component>
<component group="commons-io" name="commons-io" version="2.7">
<artifact name="commons-io-2.7.jar">
<pgp value="2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb"/>
@@ -463,6 +497,16 @@
<pgp value="0cc641c3a62453ab390066c4a41f13c999945293"/>
</artifact>
</component>
+ <component group="commons-net" name="commons-net" version="3.8.0">
+ <artifact name="commons-net-3.8.0.jar">
+ <pgp value="2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb"/>
+ </artifact>
+ </component>
+ <component group="dnsjava" name="dnsjava" version="2.1.9">
+ <artifact name="dnsjava-2.1.9.jar">
+ <pgp value="3e1ac64f4e34e290503c90323449ec3ac2efe8aa"/>
+ </artifact>
+ </component>
<component group="gradle.plugin.com.github.blindpirate" name="gradle-legacy-osgi-plugin" version="0.0.6">
<artifact name="gradle-legacy-osgi-plugin-0.0.6.jar">
<sha512 value="e300046e594f28b3611eeeb34c5ae50f7926fe71761ae203d9af18469a90386cc724a67e9123034fe192220a90f18ea63806ef27a432adecc369351a069b3a76" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -530,6 +574,11 @@
<sha512 value="cad582fc12d0741e9e6fd7e0cf80a50feb04f5ef42043df96f8a5b78476c77695d8b43836d2241f76b35676ea759921edd25eaeb2c04ec916eb138aa2901ce5f" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
+ <component group="jdom" name="jdom" version="1.0">
+ <artifact name="jdom-1.0.jar">
+ <sha512 value="267bcff47fd428447eeb2a4b08886133b41d00d1bbdaad928234e88917499f7d06a8d7783702efa67149d12577d7b59265c1ff42dcc2cf75ba71ff9026e0e2ac" origin="Generated by Gradle because artifact wasn't signed"/>
+ </artifact>
+ </component>
<component group="jline" name="jline" version="2.14.6">
<artifact name="jline-2.14.6.jar">
<pgp value="ea23db1360d9029481e7f2efecdfea3cb4493b94"/>
@@ -590,6 +639,11 @@
<pgp value="0191e61acbbe76323ac15c83b5ad94bdd6bdb924"/>
</artifact>
</component>
+ <component group="mstor" name="mstor" version="0.9.9">
+ <artifact name="mstor-0.9.9.jar">
+ <sha512 value="b9faa4b5f3735a8e060aa29e0b3575906f7c3d16f3c5d023e230c954124a5dd13e5f7c72afa6590ca2507ec93bdd50fa4123b9c0ff788685896e45c0bb16528b" origin="Generated by Gradle because artifact wasn't signed"/>
+ </artifact>
+ </component>
<component group="net.bytebuddy" name="byte-buddy" version="1.11.0">
<artifact name="byte-buddy-1.11.0.jar">
<pgp value="a7892505cf1a58076453e52d7999befba1039e8b"/>
@@ -633,6 +687,31 @@
<sha512 value="827e21e51ceec0ddf37814ee40c7ac0521652262e5b87ae6e7e0f054b041491fb6d97fcd14bf89286c9ae16f590d73b0afdae4fc5b4f4231ccc44a340948882b" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
+ <component group="net.sourceforge.expectj" name="expectj" version="2.0.7">
+ <artifact name="expectj-2.0.7.jar">
+ <pgp value="b59102ff59b40a5528adeadb99ca0918c37e2ae4"/>
+ </artifact>
+ </component>
+ <component group="net.sourceforge.htmlunit" name="htmlunit" version="2.63.0">
+ <artifact name="htmlunit-2.63.0.jar">
+ <sha512 value="2cb220edd535a29c6b8374432d884e548a21e563fb2f8ec99c3acd901e7153185c295495637565bfb3e1bfe8beba551d4cb0c5077e6a225af9731bcc2c401c27" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
+ <component group="net.sourceforge.htmlunit" name="htmlunit-core-js" version="2.63.0">
+ <artifact name="htmlunit-core-js-2.63.0.jar">
+ <sha512 value="740b0f017b6ea0b2f4087b21da3befdafd8494bd6606adeebb97a179114982957b40644ad52bfbff17f55120e8be17ba5a989a9d4124f8b8ef7104fe59eb587a" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
+ <component group="net.sourceforge.htmlunit" name="htmlunit-cssparser" version="1.12.0">
+ <artifact name="htmlunit-cssparser-1.12.0.jar">
+ <sha512 value="1f062ea1c2b14dd69b6d113a445de8083f8937ab7e469df9efd1f974cbd7d29a1825f32ee11046bdd26867504f01e7a29b8b6ce82bd076e1206662f4b69f45fd" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
+ <component group="net.sourceforge.htmlunit" name="neko-htmlunit" version="2.63.0">
+ <artifact name="neko-htmlunit-2.63.0.jar">
+ <sha512 value="26018fdab00656d65ebb59e39c0c95b0454a3d0a57649ab79e1e696ab8d73c5a890056a54c8048c31bb0c0314d8c7505713a89530343eae993f742938b1c1df7" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
<component group="org.abego.treelayout" name="org.abego.treelayout.core" version="1.0.1">
<artifact name="org.abego.treelayout.core-1.0.1.jar">
<pgp value="d790f72ea8fd39551012b62dcf9f3090ce4cb752"/>
@@ -680,6 +759,11 @@
<sha512 value="1c6f49d7d18debccb7840c99fe44b6d3624b830c2772f1c43f1374c5a53af2f65c2c6eabefe9283fe3a0592231f14be3025dbca7bb9d3e00ddfcfae9d79e0043" origin="Generated by Gradle because a key couldn't be downloaded"/>
</artifact>
</component>
+ <component group="org.apache.groovy" name="groovy" version="4.0.4">
+ <artifact name="groovy-4.0.4.jar">
+ <sha512 value="6c187c1e4a70856d934ec8774b89d4e6124c97045a131b114efc5d843d02f55b8ea4f125ec527f96b48b4620a609317e8ae456e91762f5e5b89f730daa673e1c" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
<component group="org.apache.groovy" name="groovy-ant" version="4.0.0">
<artifact name="groovy-ant-4.0.0.jar">
<sha512 value="82d889574cb3087aee703d3b46c6b9c24685ce47697e667f3c6d391b7d45dbf79981f445b84ce0837c7ed3e06adf8462ee47170385ba1b4e98ddebb1cf9f4e7c" origin="Generated by Gradle because a key couldn't be downloaded"/>
@@ -710,11 +794,21 @@
<sha512 value="9df4ad2704a44e84b32c9c3e8ad3dc05c2fca0b82fe5e639435150f7cf96a7bafc52679579bf38ff61179d34a706b67d986311df2c0dda41a9939a56e24c39af" origin="Generated by Gradle because a key couldn't be downloaded"/>
</artifact>
</component>
+ <component group="org.apache.groovy" name="groovy-datetime" version="4.0.4">
+ <artifact name="groovy-datetime-4.0.4.jar">
+ <sha512 value="cc9259231d1ce8dc534a2ecf49bfc743cd826116b1b7943c7aba683624caea09240d0ca7a7aa3d9c89f381fc7fba1191797d25741d4ace97ff9ab18a0df6e862" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
<component group="org.apache.groovy" name="groovy-dateutil" version="4.0.0">
<artifact name="groovy-dateutil-4.0.0.jar">
<sha512 value="073eb60f389a8709a74e068cc5d626c597cb3943bf10a4cb2d3917bf9f8d9e5845dd6d5d12c43e9646444d833c45eabb6111b1a4c031a970df60b5d8c34cf641" origin="Generated by Gradle because a key couldn't be downloaded"/>
</artifact>
</component>
+ <component group="org.apache.groovy" name="groovy-dateutil" version="4.0.4">
+ <artifact name="groovy-dateutil-4.0.4.jar">
+ <sha512 value="c9d346520653e6962afa2600554b98b4ead10b35f711e9dc3142f9c53921ed416beb5fe2755f61a889908482e12146b58236a8c2681048b8f9afb8b9d290fcad" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
<component group="org.apache.groovy" name="groovy-docgenerator" version="4.0.0">
<artifact name="groovy-docgenerator-4.0.0.jar">
<sha512 value="19c364988455b41a9207a3784a5d69487ef2e68687d96494a4fbbdddc07f5de0f496c61c502f81af88e45c42c3f971549f7df6d06d7fa0c0ed877d362f6f5bbe" origin="Generated by Gradle because a key couldn't be downloaded"/>
@@ -765,16 +859,31 @@
<sha512 value="d0d7a76a61ea87eaafaa9fbb0c8219339b5176969bebe3d838ab362a70ce298abb5945a273a96cd78094522dc2eb1f018e6559a9905e6f7aab1c3d20d4177654" origin="Generated by Gradle because a key couldn't be downloaded"/>
</artifact>
</component>
+ <component group="org.apache.groovy" name="groovy-sql" version="4.0.4">
+ <artifact name="groovy-sql-4.0.4.jar">
+ <sha512 value="8d919674f31e69a94c6c3b1f79052e3693b01a228f6ebc1a2d5fabe0999ad9ec7db821b0370be1f42c3b887371f8bfe8a6197f15e0c505679786013e5af9a8c9" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
<component group="org.apache.groovy" name="groovy-swing" version="4.0.0">
<artifact name="groovy-swing-4.0.0.jar">
<sha512 value="3de74fe037c63c440ae5ee87f844c89a31b20c0a753a67b87791dfc58b70229b65869cd7fff4c8a478e0002416f7e1718c6e9cd71c7d9e51bf5b49a7a6721f3a" origin="Generated by Gradle because a key couldn't be downloaded"/>
</artifact>
</component>
+ <component group="org.apache.groovy" name="groovy-swing" version="4.0.4">
+ <artifact name="groovy-swing-4.0.4.jar">
+ <sha512 value="5ac121b1d3401c108a1b52d1557a59a13e60f158bf7f87fbc7eaa4e773e00627c74a2a325d95c1ff376ba8e8fc87f8da6f3ad82279db2e6348c4631c730b6285" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
<component group="org.apache.groovy" name="groovy-templates" version="4.0.0">
<artifact name="groovy-templates-4.0.0.jar">
<sha512 value="5b95db844aa39a17fdb7df757aecbcdc453d629a05a5f5cb2f62b8f54cbddf49609f5e4b0a06d28f7c09b7b71cb5d504a92156f6fe682dd2fdeaafe404d72b13" origin="Generated by Gradle because a key couldn't be downloaded"/>
</artifact>
</component>
+ <component group="org.apache.groovy" name="groovy-templates" version="4.0.4">
+ <artifact name="groovy-templates-4.0.4.jar">
+ <sha512 value="ca2ca041f70212a3e60aaee739844d203e027d5a977bf41aecea7507c4ee38df988e2a5db5c56ca5db9a46f9f678ee8fc948264385a4d87a08a7b26c8dae9280" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
<component group="org.apache.groovy" name="groovy-test" version="4.0.0">
<artifact name="groovy-test-4.0.0.jar">
<sha512 value="0e04017d3962aef3f3fded765d5f29edde4ca596b710fe3934da25a597e7ee714312ebbc3c9678ee8dccdf17ea6f11d14bc4f6cf1f6f894251460fc98e060291" origin="Generated by Gradle because a key couldn't be downloaded"/>
@@ -795,6 +904,11 @@
<sha512 value="bf9fe0064cf76a29520520d02600966704b9043ee30abfe7c00efb186445eff422a9dd9e1de10e848775d371bded783059ad7265356aaf1c0de751b17ee2e332" origin="Generated by Gradle because a key couldn't be downloaded"/>
</artifact>
</component>
+ <component group="org.apache.groovy" name="groovy-xml" version="4.0.4">
+ <artifact name="groovy-xml-4.0.4.jar">
+ <sha512 value="daa608243c99f40cc766ea479fe778611c3aa8ba6c18817ff6e3967afe59065edb71bb7bc63979f62e87ced1cacbc45515abcb028c6cd24a7264eff0fd59adc4" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
<component group="org.apache.groovy" name="groovy-yaml" version="4.0.0">
<artifact name="groovy-yaml-4.0.0.jar">
<sha512 value="13ce6687cce2773eaac66971d92af184448c83e5800996d6f7bd9fe5b47ccecc2105569672105d89f335812ac42c2ce28cbfcdafb1fbed3ad1eff24ce88cf956" origin="Generated by Gradle because a key couldn't be downloaded"/>
@@ -885,6 +999,11 @@
<pgp value="be685132afd2740d9095f9040cc0b712fee75827"/>
</artifact>
</component>
+ <component group="org.brotli" name="dec" version="0.1.2">
+ <artifact name="dec-0.1.2.jar">
+ <pgp value="3a4d86c56ca99373b6d8953dbe84d764623a3644"/>
+ </artifact>
+ </component>
<component group="org.checkerframework" name="checker-qual" version="3.8.0">
<artifact name="checker-qual-3.8.0.jar">
<pgp value="19beab2d799c020f17c69126b16698a4adf4d638"/>
@@ -910,6 +1029,76 @@
<sha512 value="b2965a449fb4d8c4936f5bb9907a8a0964726fbc839d756444dd18ab2cabf19a3d7c0db7db200dc388a12db187b732b9bae55c01f0e83ed36faf56db67b0a5f5" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
+ <component group="org.codehaus.groovy" name="groovy" version="2.5.18">
+ <artifact name="groovy-2.5.18.jar">
+ <sha512 value="11b9dec3a35b03422e6411214670e9d69ed6e224e527dc3240e0f76a564e7b9864f2b3df49113b7e2bd9d52ab885e553e206f7edf134743c1b91132854d7f838" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
+ <component group="org.codehaus.groovy" name="groovy" version="3.0.12">
+ <artifact name="groovy-3.0.12.jar">
+ <sha512 value="11c0c38af6263b99b44ee9215a5ffb576ebbbdfee992eb35a99f4022e522995c3878516021bd9564e4ee97d1842eb3d12e765a98b01741f47b0015aaef625dcd" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
+ <component group="org.codehaus.groovy" name="groovy-datetime" version="2.5.18">
+ <artifact name="groovy-datetime-2.5.18.jar">
+ <sha512 value="7a22a631083de43f77a685829c288fe7970d7ec44da9a5c75da74602591b243184d1a89ef53bdb90dbe6f43667fca32547b90b8b3ea0a50c1b8fcbe19d4c2778" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
+ <component group="org.codehaus.groovy" name="groovy-datetime" version="3.0.12">
+ <artifact name="groovy-datetime-3.0.12.jar">
+ <sha512 value="f4ec44ee227fc291ddee5af8b7365e6f15e59dc9c1480240c72ce96abe306302cc6453dceaa43b0d7353d9faa6fa39aa6601b4367ff6e10d74b6a5f4e15128a1" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
+ <component group="org.codehaus.groovy" name="groovy-dateutil" version="2.5.18">
+ <artifact name="groovy-dateutil-2.5.18.jar">
+ <sha512 value="8f48df6f838f761b53aa195fbbd44287b0695c3ccd3635c69c93577ce09b0a79d80980e834804d8570dcb1559a53b08a8f63f2df33f1f0d78c6d1d76d18e6ed8" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
+ <component group="org.codehaus.groovy" name="groovy-dateutil" version="3.0.12">
+ <artifact name="groovy-dateutil-3.0.12.jar">
+ <sha512 value="4c272f68c12a18ba3730444604878953812aab94406d85874cc0b80a5ceec1a52f3d1fcf308324b3304fed4aba97168f88711860bf9aee789457f38d7ebe05f4" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
+ <component group="org.codehaus.groovy" name="groovy-sql" version="2.5.18">
+ <artifact name="groovy-sql-2.5.18.jar">
+ <sha512 value="177a300589b7358ee8266f1e14eafd5af73998afe9d56861c90a9de949796bd0c3c407a6adb23f041d9fda05db1dd73898e76215952f2bdaae88f00e5b7838e2" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
+ <component group="org.codehaus.groovy" name="groovy-sql" version="3.0.12">
+ <artifact name="groovy-sql-3.0.12.jar">
+ <sha512 value="4004fd6cebb286c6e7ac70b4ce6cb3a4a4aeedb85be53d6018362ca29ac1ef7673eb4a607146775ef840f65e7923c00968955150f50db2c9a044d99b12d24fa6" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
+ <component group="org.codehaus.groovy" name="groovy-swing" version="2.5.18">
+ <artifact name="groovy-swing-2.5.18.jar">
+ <sha512 value="d41908d6d71cb3efb9fa4aa8f805b93e80b0d61e5ac38d31215094bfcfad52324aadca3627dda6eb996894a7299ef3c6c36318f916cf02f62ecfc639b322e658" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
+ <component group="org.codehaus.groovy" name="groovy-swing" version="3.0.12">
+ <artifact name="groovy-swing-3.0.12.jar">
+ <sha512 value="505189dad01f69c3b310e4df2fb1612cc0d6378b71dd959ec267b58839241661028a48fb0e35ef6950c814055761e330f7c7442817bff38b048dd8bb57b5cd2e" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
+ <component group="org.codehaus.groovy" name="groovy-templates" version="2.5.18">
+ <artifact name="groovy-templates-2.5.18.jar">
+ <sha512 value="a128e0590b9ffcbec9d8081155db545662bc8f3b0cb7717b7bb4f4c2e8fe9a59f8fd3d6091d07b886d0300667a46b3db3110aca68cff64c98d73835bf42b8922" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
+ <component group="org.codehaus.groovy" name="groovy-templates" version="3.0.12">
+ <artifact name="groovy-templates-3.0.12.jar">
+ <sha512 value="a227e7171ea76829ba4b5032722073c6d950209f882e8a6f8b1ad38dae0e5abd83fa00a387c6489836bdec7258b8ea03c6d045fd84607e22b25b2007aa578f9b" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
+ <component group="org.codehaus.groovy" name="groovy-xml" version="2.5.18">
+ <artifact name="groovy-xml-2.5.18.jar">
+ <sha512 value="6cac9f163d16e2603f8c55613680620f1d13f156eb4cf8b05f07255ef60e37f78c8f34a68b2352456eee8bc26afc182919658746d197e1ec82b4c922765aa568" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
+ <component group="org.codehaus.groovy" name="groovy-xml" version="3.0.12">
+ <artifact name="groovy-xml-3.0.12.jar">
+ <sha512 value="2ddb070999683158dd616e574688325cbe6a0229605d956bc84e9dee66d61ae87b2c5023921a28d9f76ce89f751df842983a5a8c6b1d771ea424991815b500a1" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
<component group="org.codehaus.jsr166-mirror" name="jsr166y" version="1.7.0">
<artifact name="jsr166y-1.7.0.jar">
<sha512 value="4565347bb6761162783e4729bc50a432e7ea461aab313f1b6bb898879a07bf449c058fdb28922803d69398e39827c117bb51e546944f1a3ac5c597af4abfa733" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -950,6 +1139,11 @@
<pgp value="47063e8ba7a6450e4a52e7ae466caed6e0747d50"/>
</artifact>
</component>
+ <component group="org.cyberneko" name="html" version="1.9.8">
+ <artifact name="html-1.9.8.jar">
+ <sha512 value="40ef78b2394c6495604bc0f7a82ba492a3f0cb26127d8c917da42066f57328587caba84b10679be9a06991af7aab454bb482cd92393ecd67f0d71779337670cd" origin="Generated by Gradle because artifact wasn't signed"/>
+ </artifact>
+ </component>
<component group="org.dom4j" name="dom4j" version="2.1.3">
<artifact name="dom4j-2.1.3.jar">
<pgp value="8f9a3c6d105b9f57844a721d79e193516be7998f"/>
@@ -1097,11 +1291,24 @@
<pgp value="3f2a008a91d11a7fac4a0786f13d3e721d56bd54"/>
</artifact>
</component>
+ <component group="org.slf4j" name="slf4j-api" version="1.4.3">
+ <artifact name="slf4j-api-1.4.3.jar">
+ <sha512 value="18dc41fadbb10e69a5b0ce3c5cf35e9c1cdfa1734936fd7cb2755aa707a8667e20adcaf22ba932f083925d5013ed3dea1d29888efa3031019986f23557cb207f" origin="Generated by Gradle because artifact wasn't signed"/>
+ </artifact>
+ </component>
<component group="org.slf4j" name="slf4j-api" version="1.7.25">
<artifact name="slf4j-api-1.7.25.jar">
<pgp value="475f3b8e59e6e63aa78067482c7b12f2a511e325"/>
</artifact>
</component>
+ <component group="org.sonarsource.scanner.gradle" name="sonarqube-gradle-plugin" version="3.0">
+ <artifact name="sonarqube-gradle-plugin-3.0.jar">
+ <ignored-keys>
+ <ignored-key id="f1182e81c792928921dbcab4cfca4a29d26468de" reason="PGP verification failed"/>
+ </ignored-keys>
+ <sha512 value="afc41afd611214c500caca4d826652e38d5ddd1bcf182d935affd2b5b8df26650dfeb76e4c06c2d46593e1fb86bb4d093438e8e862666e64ab32fb4b6efea30d" origin="Generated by Gradle because PGP signature verification failed!"/>
+ </artifact>
+ </component>
<component group="org.sonatype.plexus" name="plexus-build-api" version="0.0.4">
<artifact name="plexus-build-api-0.0.4.jar">
<sha512 value="62efa617e564958a2b427acc4fcd6b8ad407620857774827222840bbd0d349e96deceb20925a29cce3933306bdbed01abebf9b80f050d43830ce44cb86a40c23" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -1157,6 +1364,26 @@
<sha512 value="9c21b65160c29db76a737cd45f8843d24ad57d63f03e4c0e85c33e8f4daa610d97715739eb38d045df53da4568252be03a98984aba3d05dddd1ae1e592b4bdde" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
+ <component group="prevayler" name="prevayler" version="2.02.005">
+ <artifact name="prevayler-2.02.005.jar">
+ <sha512 value="d2c06132fbde811e59e58fe1c4a303e3ca6bf79ec845caf125b181d14f5123741f93b33f59daf0f1e3089949ffc4ca6432920ee43520281e835b36e43af23677" origin="Generated by Gradle because artifact wasn't signed"/>
+ </artifact>
+ </component>
+ <component group="xalan" name="serializer" version="2.7.2">
+ <artifact name="serializer-2.7.2.jar">
+ <sha512 value="884d865865858a46306a3680df69f3f0efa0df1313706b54e6900d36af21e17cb6828f5a6bac551c59f7f80bdd1cb64c3fdbde44e213519c4af87969e9e70774" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
+ <component group="xalan" name="xalan" version="2.7.2">
+ <artifact name="xalan-2.7.2.jar">
+ <sha512 value="00f859c5bd65f6dc91e396ce91fe2f6d30b2354d6b419cd9ea96984c5403e5cd1342bb9362b0ae1f2792612f0df731c4f7ac92f16a825bb7e22089c27a129c6c" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
+ <component group="xerces" name="xercesImpl" version="2.12.2">
+ <artifact name="xercesImpl-2.12.2.jar">
+ <sha512 value="bfd21f2350bf0bb546a68d3303f28c6a15cee1e630138c169344c3f65fe39a15e61c6ff4e5239f38f2f1f9e488eff4d5565a4a0774263064ab6a30aa9fcaaed3" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
<component group="xml-apis" name="xml-apis" version="1.0.b2">
<artifact name="xml-apis-1.0.b2.jar">
<sha512 value="daee51f0f564979c941b41e27a7129617ce9d791a4e1c4b618a29ae33ec9c78201ac516685cadfd073fda250d50eb2c0d651474103e7c4577e4bfa7d5f2052a1" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -1182,5 +1409,10 @@
<sha512 value="34989289ce8ed861499f31742ee1e7b9dc3c59973ce915a7b561d33d98968e77db5bb94c1692802ccdbd86d04caa7db67748efafb1402428b2d6ae3056497618" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
+ <component group="xstream" name="xstream" version="1.1.3">
+ <artifact name="xstream-1.1.3.jar">
+ <sha512 value="9d82bf4b30670f236ec623941f1e595bfc051ac2426bd168016feb6434f630c2bf7641b568a4083fe20156384f061c9375949a1893d9b9e1b86959f571dc137e" origin="Generated by Gradle because artifact wasn't signed"/>
+ </artifact>
+ </component>
</components>
</verification-metadata>
[groovy] 05/06: minor test refactor
Posted by pa...@apache.org.
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 9922519447d0f9194c2d9f2e86d43a63672668f3
Author: Paul King <pa...@asert.com.au>
AuthorDate: Thu Aug 25 23:33:23 2022 +1000
minor test refactor
---
.../org/codehaus/groovy/transform/ImmutableTransformTest.groovy | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/test/org/codehaus/groovy/transform/ImmutableTransformTest.groovy b/src/test/org/codehaus/groovy/transform/ImmutableTransformTest.groovy
index 85ad505dfc..f108715511 100644
--- a/src/test/org/codehaus/groovy/transform/ImmutableTransformTest.groovy
+++ b/src/test/org/codehaus/groovy/transform/ImmutableTransformTest.groovy
@@ -110,9 +110,10 @@ class ImmutableTransformTest extends GroovyShellTestCase {
@Test
void testCloneableField() {
- def (originalDolly, lab) = evaluate("""
- import groovy.transform.Immutable
+ def (originalDolly, lab) = evaluate('''
+ import groovy.transform.*
+ @AutoClone
class Dolly implements Cloneable {
String name
}
@@ -124,7 +125,7 @@ class ImmutableTransformTest extends GroovyShellTestCase {
def dolly = new Dolly(name: "The Sheep")
[dolly, new Lab(name: "Area 51", clone: dolly)]
- """)
+ ''')
def clonedDolly = lab.clone
def clonedDolly2 = lab.clone