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
The following commit(s) were added to refs/heads/master by this push:
new 9fa7e4f GROOVY-10298: Refine records to not use system properties
9fa7e4f is described below
commit 9fa7e4fcb767047d3a12d4279f2c6cd5d2dd5c68
Author: Paul King <[email protected]>
AuthorDate: Tue Oct 19 11:58:22 2021 +1000
GROOVY-10298: Refine records to not use system properties
---
src/main/java/groovy/grape/GrabAnnotationTransformation.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/groovy/grape/GrabAnnotationTransformation.java
b/src/main/java/groovy/grape/GrabAnnotationTransformation.java
index 677d3f3..3aefb07 100644
--- a/src/main/java/groovy/grape/GrabAnnotationTransformation.java
+++ b/src/main/java/groovy/grape/GrabAnnotationTransformation.java
@@ -548,7 +548,8 @@ public class GrabAnnotationTransformation extends
ClassCodeVisitorSupport implem
}
if (allstr.contains("#")) {
- // see:
http://ant.apache.org/ivy/history/latest-milestone/textual.html
+ // Support for Ivy syntax
+ // see:
https://ant.apache.org/ivy/history/latest-milestone/textual.html
Matcher m = IVY_PATTERN.matcher(allstr);
if (!m.find()) return;
if (m.group(1) == null || m.group(2) == null) return;
@@ -559,8 +560,9 @@ public class GrabAnnotationTransformation extends
ClassCodeVisitorSupport implem
else if (!exclude && node.getMember("version") == null)
node.addMember("version", constX("*"));
node.getMembers().remove("value");
} else if (allstr.contains(":")) {
- // assume gradle syntax
- // see:
http://www.gradle.org/latest/docs/userguide/dependency_management.html#sec:how_to_declare_your_dependencies
+ // Support for Gradle syntax (covers Gradle/Maven)
+ // see:
https://docs.gradle.org/3.5.1/userguide/dependency_management.html#sec:how_to_declare_your_dependencies
+ // see:
https://docs.gradle.org/7.2/userguide/declaring_dependencies.html
Map<String, Object> parts = GrapeUtil.getIvyParts(allstr);
for (Map.Entry<String, Object> entry : parts.entrySet()) {
String key = entry.getKey();