[netbeans] branch master updated: Ignore dependencies for BOM-like projects. (#3668)

[sd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sdedic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git


The following commit(s) were added to refs/heads/master by this push:
     new 13dd3a4  Ignore dependencies for BOM-like projects. (#3668)
13dd3a4 is described below

commit 13dd3a47245007c5c081d57b7f9c386740566a07
Author: Svatopluk Dedic <sv...@oracle.com>
AuthorDate: Mon Feb 28 21:59:23 2022 +0100

    Ignore dependencies for BOM-like projects. (#3668)
    
    NETBEANS-5846: Ignore unresolved dependencies for BOMs.
---
 .../netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java | 11 ++++++++++-
 .../src/org/netbeans/modules/gradle/NbGradleProjectImpl.java  |  2 +-
 .../netbeans/modules/gradle/cache/ProjectInfoDiskCache.java   |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
index 73de19e..467f1c2 100644
--- a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
+++ b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
@@ -34,6 +34,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 import org.codehaus.groovy.runtime.InvokerHelper;
+import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.Task;
 import org.gradle.api.artifacts.Configuration;
@@ -53,6 +54,8 @@ import org.gradle.api.artifacts.result.UnresolvedDependencyResult;
 import org.gradle.api.distribution.DistributionContainer;
 import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.initialization.IncludedBuild;
+import org.gradle.api.plugins.JavaPlatformPlugin;
+import org.gradle.api.plugins.UnknownPluginException;
 import org.gradle.api.specs.Specs;
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.SourceSetContainer;
@@ -554,7 +557,13 @@ class NbProjectInfoBuilder {
         model.getExt().put("resolved_sources_artifacts", resolvedSourcesArtifacts);
         model.getExt().put("resolved_javadoc_artifacts", resolvedJavadocArtifacts);
         model.getInfo().put("project_dependencies", projects);
-        model.getInfo().put("unresolved_problems", unresolvedProblems);
+        // NETBEANS-5846: if this project uses javaPlatform plugin with dependencies enabled, 
+        // do not report unresolved problems
+        if (!(project.getPlugins().hasPlugin(JavaPlatformPlugin.class) && 
+            Boolean.TRUE.equals(getProperty(project, "javaPlatform", "allowDependencies")))) {
+            
+            model.getInfo().put("unresolved_problems", unresolvedProblems);
+        }
         model.registerPerf("dependencies", System.currentTimeMillis() - time);
     }
 
diff --git a/extide/gradle/src/org/netbeans/modules/gradle/NbGradleProjectImpl.java b/extide/gradle/src/org/netbeans/modules/gradle/NbGradleProjectImpl.java
index 4492de1..14c92c7 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/NbGradleProjectImpl.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/NbGradleProjectImpl.java
@@ -403,7 +403,7 @@ public final class NbGradleProjectImpl implements Project {
             loadedProjectSerial = s;
             this.attemptedQuality = aim;
             
-            boolean replace = project == null;
+            boolean replace = project == null || force;
             if (project != null) {
                 if (prj.getQuality().betterThan(project.getQuality())) {
                     replace = true;
diff --git a/extide/gradle/src/org/netbeans/modules/gradle/cache/ProjectInfoDiskCache.java b/extide/gradle/src/org/netbeans/modules/gradle/cache/ProjectInfoDiskCache.java
index 248d9c5..c512cb8 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/cache/ProjectInfoDiskCache.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/cache/ProjectInfoDiskCache.java
@@ -39,7 +39,7 @@ import org.netbeans.modules.gradle.spi.GradleFiles;
 public final class ProjectInfoDiskCache extends AbstractDiskCache<GradleFiles, QualifiedProjectInfo> {
 
     // Increase this number if new info is gathered from the projects.
-    private static final int COMPATIBLE_CACHE_VERSION = 19;
+    private static final int COMPATIBLE_CACHE_VERSION = 20;
     private static final String INFO_CACHE_FILE_NAME = "project-info.ser"; //NOI18N
     private static final Map<GradleFiles, ProjectInfoDiskCache> DISK_CACHES = Collections.synchronizedMap(new WeakHashMap<>());
 

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists