This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch vsnetbeans_1703
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 2b4ad96536328d46429660daed0c5317091e01f2
Author: Svata Dedic <svatopluk.de...@oracle.com>
AuthorDate: Tue Apr 4 16:52:46 2023 +0200
Try to match versionless direct children to resolved dependencies.
---
.../modules/gradle/api/GradleBaseProjectBuilder.java | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProjectBuilder.java
b/extide/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProjectBuilder.java
index 03c3a98aec..44e5ae86fa 100644
---
a/extide/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProjectBuilder.java
+++
b/extide/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProjectBuilder.java
@@ -322,11 +322,14 @@ class GradleBaseProjectBuilder implements
ProjectInfoExtractor.Result {
String parentId = it.getKey();
GradleDependency parentD;
+ boolean special = false;
if (parentId.equals("")) {
parentD = GradleConfiguration.SELF_DEPENDENCY;
+ special = true;
} else if (parentId.startsWith(DEPENDENCY_PROJECT_PREFIX))
{
int sep1 = parentId.indexOf(':',
DEPENDENCY_PROJECT_PREFIX.length());
parentD =
projects.get(parentId.substring(DEPENDENCY_PROJECT_PREFIX.length(), sep1));
+ special = true;
} else {
parentD = components.get(parentId);
if (parentD == null) {
@@ -339,7 +342,17 @@ class GradleBaseProjectBuilder implements
ProjectInfoExtractor.Result {
if (childSpecs.remove(parentId)) {
children.add(parentD);
-
+ } else if (!special) {
+ // special case - version may not be specified, but is
implied somehow.
+ try {
+ String[] gav =
GradleModuleFileCache21.gavSplit(parentId);
+ String versionLess = gav[0] + ':' + gav[1] + ':';
+ if (childSpecs.remove(versionLess)) {
+ children.add(parentD);
+ }
+ } catch (IllegalArgumentException ex) {
+ LOG.log(Level.FINE, "Unknown dependency GAV:
parentId");
+ }
}
for (String cid : it.getValue()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
