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 2025/07/20 06:58:42 UTC
(groovy) branch master updated (1444fe1ae6 -> 6e3737dd24)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
from 1444fe1ae6 Bump dependency metadata
new 884f75201b bump dependency metadata
new 67beba4708 bump dependency metadata
new 6e3737dd24 revert GROOVY-11715 and try a different approach
The 3 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 | 42 ++++++-------
.../groovy/classgen/AsmClassGenerator.java | 70 ++++++++++------------
.../groovy/classgen/asm/TypeAnnotationsTest.groovy | 2 +-
3 files changed, 52 insertions(+), 62 deletions(-)
(groovy) 01/03: bump 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 master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 884f75201bffe31b33e475c4d64a89b56d2f0aea
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sun Jul 20 16:38:28 2025 +1000
bump dependency metadata
---
gradle/verification-metadata.xml | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 9db15555ed..c1e2d95f56 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -298,9 +298,9 @@
<sha512 value="006d3a054b22daa7f378b005cc29b3544dc7f3b509176e0eac946e0a3bafa73b824bae61b5183b61938b19044d2142a285da2fce2ffdaef5bfe91b2d8dcb6804" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
</artifact>
</component>
- <component group="com.fasterxml.jackson.core" name="jackson-annotations" version="2.19.1">
- <artifact name="jackson-annotations-2.19.1.jar">
- <sha512 value="f37dd10819684d185bbcbcc82fe511bb8fee6e732ef15613f8614885bc267f207323d30b75f3cd4a5b5ac3ac6a679d2231ba6f64acd23353128094e78818a58c" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+ <component group="com.fasterxml.jackson.core" name="jackson-annotations" version="2.19.2">
+ <artifact name="jackson-annotations-2.19.2.jar">
+ <sha512 value="809d23970fe4af6157cfdfd7a3f9b9ca3f80e790faadb3313db06155ca4fb61e34763a96194ce90d5aa25264dda1126428ac07837c99575eedf4273c27e449f3" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.core" name="jackson-core" version="2.17.2">
@@ -308,9 +308,9 @@
<sha512 value="694ae3bf756421d925f833f59a6309c7748ac3a68b28ed4de8ce0d6f93347dfc19991d1106db911c7da78e20734e6f44a02caef751150378a6ffa638c80fc75b" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
</artifact>
</component>
- <component group="com.fasterxml.jackson.core" name="jackson-core" version="2.19.1">
- <artifact name="jackson-core-2.19.1.jar">
- <sha512 value="7f924882f803bd34f5d2cbd98ccee3a48f9a279e35840b7c7f0ce47dd5f56ab5c096ac1422f440919de5f36576a3eeb1f8270194815b18fe5d3b217f914625f5" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+ <component group="com.fasterxml.jackson.core" name="jackson-core" version="2.19.2">
+ <artifact name="jackson-core-2.19.2.jar">
+ <sha512 value="d6d64ec09819bb901d59f34bf9c422e632fc8d094ff97fc53d695acbb0b81768f13e444061176e9e79ac1934e443ce9d1d5dce5104a662b64effa95ae5743032" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.17.2">
@@ -318,14 +318,14 @@
<sha512 value="ec62267bf58aea531ec7f253e67974fac89e8aa61e7b54a7fb00edf3132ecb969b510630fd353adbbd2ab7d845a25702f168c296c57983a00bd6abc9ce3630f9" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
</artifact>
</component>
- <component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.19.1">
- <artifact name="jackson-databind-2.19.1.jar">
- <sha512 value="cc80d6288764f2f0a41b2a8c132acb80e0e57ba72564ad473b27e9f5c3d64ce989ade878c5348cac78110b19155172e94eeaed916262f9114f4f83b357295c83" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+ <component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.19.2">
+ <artifact name="jackson-databind-2.19.2.jar">
+ <sha512 value="0533fea9a35a2e7b9267a62a39252d3ac5cf8ab0ff30057242831a1e17c23225b935f7c2ed64de7585ea83e56c32e26bb6078d9834654e047f1ca7b0ee00dd72" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
</artifact>
</component>
- <component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-toml" version="2.19.1">
- <artifact name="jackson-dataformat-toml-2.19.1.jar">
- <sha512 value="64b1e56fe0c55dbba56e71d1f5abbe7efc88e76b0f210299239a966f3a7f9b25c36184dc2c1f816890e830e179e1077f25c663b16cb1b04c9f79fd8221c9baf4" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+ <component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-toml" version="2.19.2">
+ <artifact name="jackson-dataformat-toml-2.19.2.jar">
+ <sha512 value="72d6282fc2e55c889c5c80e26d8f2d5f9a68b49a44757545c3a8704b6b53999fb2d5166f0bda1c7bbf74202094d2cef464cd52c3b6e3be8ea706c2c828a1094f" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-xml" version="2.17.2">
@@ -338,9 +338,9 @@
<sha512 value="c3f75fbddb17f968ba6fcf6c32db63e5e1520b123880b3a37b1933a777b84794faa09e1e71e80de49ed504068483e49d98eac26a276fff68c0ae51f7fc7dd7db" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
</artifact>
</component>
- <component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-yaml" version="2.19.1">
- <artifact name="jackson-dataformat-yaml-2.19.1.jar">
- <sha512 value="87d038e1b069cc27c1a82ea366a03f0fc79b4430c4ddfb6b705d44dfbd0f1425efda5182c5f8334a24acb3ccda8c4a07083b587450ddca193ec2cb94aa68aaf5" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+ <component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-yaml" version="2.19.2">
+ <artifact name="jackson-dataformat-yaml-2.19.2.jar">
+ <sha512 value="1197233ed512631f43d78f2514216f57013a3648c37d0a69e92b7ffa6cf59f2a1010eac21ab59409ff2e9f50906976fb7152dfecd00b2097c511fe364288e1fe" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
</artifact>
</component>
<component group="com.fasterxml.woodstox" name="woodstox-core" version="6.7.0">
(groovy) 03/03: revert GROOVY-11715 and try a different approach
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 6e3737dd24e04eb007f87d765e9507ef42dd6c5d
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sun Jul 20 16:58:32 2025 +1000
revert GROOVY-11715 and try a different approach
---
.../groovy/classgen/AsmClassGenerator.java | 70 ++++++++++------------
.../groovy/classgen/asm/TypeAnnotationsTest.groovy | 2 +-
2 files changed, 31 insertions(+), 41 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java b/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java
index a84538d496..c453f4dda7 100644
--- a/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java
+++ b/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java
@@ -2222,63 +2222,53 @@ public class AsmClassGenerator extends ClassGenerator {
* @param av the visitor to use
*/
public void visitAnnotationAttributes(final AnnotationNode an, final AnnotationVisitor av) {
- // GROOVY-11715 TODO If we can determine what was causing the issues mentioned on that ticket, we should change these back to LinkedHashMap
- Map<String, Object> constantAttrs = new TreeMap<>();
- Map<String, PropertyExpression> enumAttrs = new TreeMap<>();
- Map<String, Object> atAttrs = new TreeMap<>();
- Map<String, ListExpression> arrayAttrs = new TreeMap<>();
-
for (Map.Entry<String, Expression> member : an.getMembers().entrySet()) {
String name = member.getKey();
Expression expr = member.getValue();
if (expr instanceof AnnotationConstantExpression) {
- atAttrs.put(name, ((AnnotationConstantExpression) expr).getValue());
+ AnnotationNode atNode = (AnnotationNode) ((AnnotationConstantExpression) expr).getValue();
+ visitAnnotationConstAttr(av, name, atNode);
} else if (expr instanceof ConstantExpression) {
- constantAttrs.put(name, ((ConstantExpression) expr).getValue());
+ visitConstantAttr(av, name, ((ConstantExpression) expr).getValue());
} else if (expr instanceof ClassExpression) {
- constantAttrs.put(name, Type.getType(BytecodeHelper.getTypeDescription((expr.getType()))));
+ visitConstantAttr(av, name, Type.getType(BytecodeHelper.getTypeDescription((expr.getType()))));
} else if (expr instanceof PropertyExpression) {
- enumAttrs.put(name, (PropertyExpression) expr);
+ visitEnumAttr(av, name, (PropertyExpression) expr);
} else if (expr instanceof ListExpression) {
- arrayAttrs.put(name, (ListExpression) expr);
+ visitArrayAttr(av, name, (ListExpression) expr);
} else if (expr instanceof ClosureExpression) {
ClassNode closureClass = controller.getClosureWriter().getOrAddClosureClass((ClosureExpression) expr, ACC_PUBLIC);
- constantAttrs.put(name, Type.getType(BytecodeHelper.getTypeDescription(closureClass)));
+ visitConstantAttr(av, name, Type.getType(BytecodeHelper.getTypeDescription(closureClass)));
}
}
+ }
- for (Map.Entry<String, Object> entry : constantAttrs.entrySet()) {
- av.visit(entry.getKey(), entry.getValue());
- }
- for (Map.Entry<String, PropertyExpression> entry : enumAttrs.entrySet()) {
- PropertyExpression propExp = entry.getValue();
- av.visitEnum(entry.getKey(),
- BytecodeHelper.getTypeDescription(propExp.getObjectExpression().getType()),
- String.valueOf(((ConstantExpression) propExp.getProperty()).getValue()));
- }
- for (Map.Entry<String, Object> entry : atAttrs.entrySet()) {
- AnnotationNode atNode = (AnnotationNode) entry.getValue();
- AnnotationVisitor av2 = av.visitAnnotation(entry.getKey(),
- BytecodeHelper.getTypeDescription(atNode.getClassNode()));
- visitAnnotationAttributes(atNode, av2);
- av2.visitEnd();
- }
- visitArrayAttributes(an, arrayAttrs, av);
+ private void visitAnnotationConstAttr(AnnotationVisitor av, String key, AnnotationNode atNode) {
+ AnnotationVisitor av2 = av.visitAnnotation(key, BytecodeHelper.getTypeDescription(atNode.getClassNode()));
+ visitAnnotationAttributes(atNode, av2);
+ av2.visitEnd();
}
- private void visitArrayAttributes(final AnnotationNode an, final Map<String, ListExpression> arrayAttr, final AnnotationVisitor av) {
- if (arrayAttr.isEmpty()) return;
- for (Map.Entry<String, ListExpression> entry : arrayAttr.entrySet()) {
- AnnotationVisitor av2 = av.visitArray(entry.getKey());
- List<Expression> values = entry.getValue().getExpressions();
- if (!values.isEmpty()) {
- int arrayElementType = determineCommonArrayType(values);
- for (Expression exprChild : values) {
- visitAnnotationArrayElement(exprChild, arrayElementType, av2);
- }
+ private static void visitEnumAttr(AnnotationVisitor av, String key, PropertyExpression propExp) {
+ av.visitEnum(key,
+ BytecodeHelper.getTypeDescription(propExp.getObjectExpression().getType()),
+ String.valueOf(((ConstantExpression) propExp.getProperty()).getValue()));
+ }
+
+ private static void visitConstantAttr(AnnotationVisitor av, String key, Object value) {
+ av.visit(key, value);
+ }
+
+ private void visitArrayAttr(AnnotationVisitor av, String key, ListExpression value) {
+ AnnotationVisitor av2 = av.visitArray(key);
+ List<Expression> values = value.getExpressions();
+ if (!values.isEmpty()) {
+ int arrayElementType = determineCommonArrayType(values);
+ for (Expression exprChild : values) {
+ visitAnnotationArrayElement(exprChild, arrayElementType, av2);
}
- av2.visitEnd();
}
+ av2.visitEnd();
}
private void visitAnnotationArrayElement(final Expression expr, final int arrayElementType, final AnnotationVisitor av) {
diff --git a/src/test/groovy/org/codehaus/groovy/classgen/asm/TypeAnnotationsTest.groovy b/src/test/groovy/org/codehaus/groovy/classgen/asm/TypeAnnotationsTest.groovy
index 07f259bdec..03b5570c2c 100644
--- a/src/test/groovy/org/codehaus/groovy/classgen/asm/TypeAnnotationsTest.groovy
+++ b/src/test/groovy/org/codehaus/groovy/classgen/asm/TypeAnnotationsTest.groovy
@@ -226,7 +226,7 @@ final class TypeAnnotationsTest extends AbstractBytecodeTestCase {
assert bytecode.hasSequence([
'public sizeZeroOrPositive(Ljava/util/List;)Z',
'@Lnet/jqwik/api/Property;()',
- '@Lnet/jqwik/api/constraints/IntRange;(max=10, min=0) : METHOD_FORMAL_PARAMETER 0, 0;',
+ '@Lnet/jqwik/api/constraints/IntRange;(min=0, max=10) : METHOD_FORMAL_PARAMETER 0, 0;',
'// annotable parameter count: 1 (visible)',
'@Lnet/jqwik/api/ForAll;() // parameter 0'
])
(groovy) 02/03: bump 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 master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 67beba4708eb06a527cdb7a773ff06fde51a1306
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sun Jul 20 16:47:26 2025 +1000
bump dependency metadata
---
gradle/verification-metadata.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index c1e2d95f56..c22bd9e1d6 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -791,14 +791,14 @@
<sha512 value="cb312b3f571d91ef183c119d878f50464ffd97f853b7311cba386463f295e8b7b3a5a89ed4269a045cacd5aa7cb4c803d4882854a0fddefa9bbc28c72aa6c786" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
- <component group="net.jqwik" name="jqwik-api" version="1.9.2">
- <artifact name="jqwik-api-1.9.2.jar">
- <sha512 value="bd59628c94202cd3ec38237f004d863a3d7cf2a2c1c818ba088f1f5fa947a4ad251eecfb01f3ab01bbc2c68fba4911a3ffa62085cd9cfb2a885dddc7ded0d812" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+ <component group="net.jqwik" name="jqwik-api" version="1.9.3">
+ <artifact name="jqwik-api-1.9.3.jar">
+ <sha512 value="6e414bf27136823c52b0cc24c319449918c830a19d3e76fd29fcf2d36aa102ee8335311be3f382685ceada3b9592ff053974eed2b47a21624ef95c3f7aa03b3d" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
</artifact>
</component>
- <component group="net.jqwik" name="jqwik-engine" version="1.9.2">
- <artifact name="jqwik-engine-1.9.2.jar">
- <sha512 value="a306213e3092356aa09bad00e6c0106c2734524631e4caa0922ada15a5a9519116df7890677460e438258980ae92b009d072a973c7b7b63303d05f4b36faca4e" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+ <component group="net.jqwik" name="jqwik-engine" version="1.9.3">
+ <artifact name="jqwik-engine-1.9.3.jar">
+ <sha512 value="9dcd4b781fc6c89e3fcee36231fb68f17b66ce55f15231e03f6b628242edb7b71b411671fe8596a0cb2c27ce9a991fd4370d6031612b311d1030256a6bdae34d" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
</artifact>
</component>
<component group="net.sf.jopt-simple" name="jopt-simple" version="5.0.4">