Merge pull request #8710 from apache/delivery

Sync delivery to release270 for 27-rc3

Author: ebarboni

.github/workflows/main.yml

@@ -520,7 +520,7 @@ jobs:
         if: ${{ (matrix.config == 'release') && success() }}
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20.18.1
 
       - name: Build NBVSCodeExt from ${{ matrix.config }}-src zip
         if: ${{ (matrix.config == 'release') && success() }}
@@ -2627,7 +2627,7 @@ jobs:
       - name: Set up node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20.18.1
 
       - name: Setup Xvfb
         run: |

extide/gradle/apichanges.xml

@@ -85,14 +85,16 @@ is the proper place.
     <changes>
         <change id="current-gradle-version-discovery">
             <api name="general"/>
-            <summary>GradleDistributionManager can query latest available version and use in init</summary>
+            <summary>GradleDistributionManager can query latest available and latest supported versions and use in init</summary>
             <version major="2" minor="47"/>
             <date day="20" month="6" year="2025"/>
             <author login="neilcsmith"/>
             <compatibility semantic="compatible" addition="yes"/>
             <description>
                 Added <code><a href="@TOP@/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.html#currentDistribution()">GradleDistributionManager.currentDistribution()</a></code> 
                 method to query the current (latest) release available from the Gradle web service.
+                Added <code><a href="@TOP@/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.html#latestSupportedDistribution()">GradleDistributionManager.latestSupportedDistribution()</a></code>
+                method to query the latest supported release from the Gradle web service.
                 Added <code>gradleVersion(String version)</code> to
                 <a href="@TOP@/org/netbeans/modules/gradle/spi/newproject/TemplateOperation.InitOperation.html">TemplateOperation.InitOperation</a>.
             </description>

extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/GradleInternalAdapter.java

@@ -37,7 +37,7 @@
 import org.gradle.api.logging.Logging;
 import org.gradle.api.reflect.HasPublicType;
 import org.gradle.plugin.use.PluginId;
-import org.gradle.util.VersionNumber;
+import org.gradle.util.GradleVersion;
 import org.netbeans.modules.gradle.tooling.NbProjectInfoBuilder.ExceptionCallable;
 import org.netbeans.modules.gradle.tooling.NbProjectInfoBuilder.ValueAndType;
 
@@ -53,11 +53,11 @@ public class GradleInternalAdapter {
     private static final Logger LOG =  Logging.getLogger(NbProjectInfoBuilder.class);
 
     private final Project project;
-    private final VersionNumber gradleVersion;
+    private final GradleVersion gradleVersion;
     /**
-     * Accummulates error messages, so that just one problem is logger a given type of error.
+     * Accumulates error messages, so that just one problem is logger a given type of error.
      */
-    private Set<String> reportedIncompatibilities = new HashSet<>();
+    private final Set<String> reportedIncompatibilities = new HashSet<>();
 
     protected NbProjectInfoModel model;
 
@@ -70,7 +70,7 @@ public class GradleInternalAdapter {
 
     public GradleInternalAdapter(Project project) {
         this.project = project;
-        this.gradleVersion = VersionNumber.parse(project.getGradle().getGradleVersion());
+        this.gradleVersion = GradleVersion.version(project.getGradle().getGradleVersion());
     }
 
     boolean initPlugins() {
@@ -143,7 +143,7 @@ private static <T extends Throwable> void sneakyThrow(Throwable exception) throw
     }        
 
     private <T, E extends Throwable> T sinceGradleOrDefault(String version, NbProjectInfoBuilder.ExceptionCallable<T, E> c, Supplier<T> def) {
-        if (gradleVersion.compareTo(VersionNumber.parse(version)) >= 0) {
+        if (gradleVersion.compareTo(GradleVersion.version(version)) >= 0) {
             try {
                 return c.call();
             } catch (RuntimeException | Error e) {

extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java

@@ -97,7 +97,6 @@
 import org.gradle.api.provider.Provider;
 import org.gradle.api.reflect.HasPublicType;
 import org.gradle.api.reflect.TypeOf;
-import org.gradle.api.specs.Specs;
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.SourceSetContainer;
 import org.gradle.api.tasks.TaskDependency;
@@ -308,7 +307,8 @@ private String getTaskInheritance(Task t) {
         "shouldRunAfter",
         "enabled",
         "description",
-        "group"
+        "group",
+        "toolchainDownloadUrls" // UpdateDaemonJvm fron org.gradle.toolchains.foojay-resolver-convention accesses online sevice for URLs
     ));
 
     private void detectTaskProperties(NbProjectInfoModel model) {
@@ -587,7 +587,7 @@ private void inspectObjectAndValues(Class clazz, Object object, String prefix, M
         try {
             if (depth++ >= MAX_INTROSPECTION_DEPTH) {
                 if (!suppressDepthWarning) {
-                    LOG.warn("Too deep structure, truncating");
+                    LOG.warn("Too deep structure, truncating: " + String.format("path: %s, value: %s", prefix, object));
                     model.noteProblem(Report.Severity.WARNING, 
                             String.format("Object structure too deep encountered in class %s", clazz),
                             String.format("Object structure is too deep for the project model builder. This is unlikely to affect basic project operations. "
@@ -718,6 +718,11 @@ private void inspectObjectAndValues0(Class clazz, Object object, String prefix,
             if ((mp.getModifiers() & Modifier.PUBLIC) == 0) {
                 continue;
             }
+            // ignore static properties for now. If needed, they must be exported somehow per-class and protected
+            // against recursion.
+            if ((mp.getModifiers() & Modifier.STATIC) != 0) {
+                continue;
+            }
             if (object != null) {
                 // Provider must NOT be asked for a value, otherwise it might run a Task in order to compute
                 // the value.
@@ -1701,7 +1706,7 @@ private void detectDependencies(NbProjectInfoModel model) {
                     try {
                         it.getResolvedConfiguration()
                                 .getLenientConfiguration()
-                                .getFirstLevelModuleDependencies(Specs.SATISFIES_ALL)
+                                .getFirstLevelModuleDependencies()
                                 .forEach(rd -> collectArtifacts(rd, resolvedJvmArtifacts));
                     } catch (ArtifactResolveException ex) {
                         convertOfflineException(ex);

extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NetBeansRunSinglePlugin.java

@@ -20,6 +20,7 @@
 package org.netbeans.modules.gradle.tooling;
 
 import static java.util.Arrays.asList;
+import java.util.List;
 import java.util.Set;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.logging.Logger;
@@ -76,15 +77,8 @@ private void configureJavaExec(Project project, JavaExec je) {
             je.setArgs(asList(project.property(RUN_SINGLE_ARGS).toString().split(" ")));
         }
         if (project.hasProperty(RUN_SINGLE_JVM_ARGS)) {
-            // Property jvmArgumentProviders should not be implemented as a lambda to allow execution optimizations.
-            // See https://docs.gradle.org/current/userguide/validation_problems.html#implementation_unknown
-            je.getJvmArgumentProviders().add(new CommandLineArgumentProvider() {
-                // Do not convert to lambda.
-                @Override
-                public Iterable<String> asArguments() {
-                    return asList(project.property(RUN_SINGLE_JVM_ARGS).toString().split(" "));
-                }
-            });
+            // do not use plain setter, as other Plugins may provide their own JVM flags + providers.
+            je.getJvmArgumentProviders().add(new JvmArgumentsHolder(asList(project.property(RUN_SINGLE_JVM_ARGS).toString().split(" "))));
         }
         try {
             je.setStandardInput(System.in);
@@ -112,4 +106,22 @@ private void addTask(Project project, Task runTask) {
         runSingle.configure((task) -> task.doFirst((action) -> project.getLogger().warn(DEPRECATE_RUN_SINGLE)));
     }
 
+    /**
+     * A simple holder to add JVM arguments on top of other args provide by other plugins.
+     * DO NOT store Project or other resource-bound references here, keep static. It is attached to a task
+     * as a provider and serialized/cached. See Micronaut Configuration
+     * Cache requirements.
+     */
+    private static class JvmArgumentsHolder implements CommandLineArgumentProvider {
+        private final List<String> jvmArguments;
+
+        public JvmArgumentsHolder(List<String> jvmArguments) {
+            this.jvmArguments = jvmArguments;
+        }
+
+        @Override
+        public Iterable<String> asArguments() {
+            return jvmArguments;
+        }
+    }
 }

extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java

@@ -104,7 +104,9 @@ public final class GradleDistributionManager {
         GradleVersion.version("8.14"),// JDK-24
     };
 
-    private static final GradleVersion LAST_KNOWN_GRADLE = GradleVersion.version("8.14"); //NOI18N
+    private static final GradleVersion LAST_KNOWN_GRADLE = GradleVersion.version("9.0"); //NOI18N
+
+    private static final int LATEST_SUPPORTED_MAJOR = 9;
 
     final File gradleUserHome;
 
@@ -283,6 +285,41 @@ public GradleDistribution currentDistribution() throws IOException {
         }
     }
 
+    /**
+     * Returns the latest {@link GradleDistribution} which is supported by this
+     * {@link GradleDistributionManager}. This method uses the
+     * <a href="https://services.gradle.org/versions">https://services.gradle.org/versions</a>
+     * web service to query the version.
+     *
+     * @return the latest Gradle distribution which can still be supported
+     * @throws java.io.IOException if information on the current Gradle release
+     * cannot be accessed
+     */
+    public GradleDistribution latestSupportedDistribution() throws IOException {
+        JSONParser parser = new JSONParser();
+        URL versionsCurrent = URI.create("https://services.gradle.org/versions/" + LATEST_SUPPORTED_MAJOR).toURL(); //NOI18N
+        try (InputStreamReader is = new InputStreamReader(versionsCurrent.openStream(), StandardCharsets.UTF_8)) {
+            JSONArray releases = (JSONArray) parser.parse(is);
+            for (Object obj : releases) {
+                JSONObject release = (JSONObject) obj;
+                if (release.get("snapshot") instanceof Boolean snapshot && !snapshot //NOI18N
+                        && release.get("nightly") instanceof Boolean nightly && !nightly //NOI18N
+                        && release.get("releaseNightly") instanceof Boolean releaseNightly && !releaseNightly //NOI18N
+                        && release.get("activeRc") instanceof Boolean activeRc && !activeRc //NOI18N
+                        && release.get("broken") instanceof Boolean broken && !broken //NOI18N
+                        && release.get("rcFor") instanceof String rcFor && rcFor.isBlank() //NOI18N
+                        && release.get("milestoneFor") instanceof String milestoneFor && milestoneFor.isBlank()) { //NOI18N
+                    URI downloadURL = new URI((String) release.get("downloadUrl")); //NOI18N
+                    String version = (String) release.get("version"); //NOI18N
+                    return new GradleDistribution(distributionBaseDir(downloadURL, version), downloadURL, version);
+                }
+            }
+            throw new IOException("no release found with major version " + LATEST_SUPPORTED_MAJOR);
+        } catch (ParseException | URISyntaxException | ClassCastException ex) {
+            throw new IOException(ex);
+        }
+    }
+
     /**
      * Create a {@link GradleDistribution} from the Gradle version distributed
      * with the Gradle Tooling of the IDE. This should be the most IDE compatible

extide/gradle/src/org/netbeans/modules/gradle/spi/newproject/GradleInitWizard.java

@@ -212,7 +212,7 @@ protected void collectOperations(TemplateOperation ops, Map<String, Object> para
 
             if (!GradleSettings.getDefault().isOffline()) {
                 try {
-                    init.gradleVersion(GradleDistributionManager.get().currentDistribution().getVersion());
+                    init.gradleVersion(GradleDistributionManager.get().latestSupportedDistribution().getVersion());
                 } catch (IOException ex) {
                     Exceptions.printStackTrace(ex);
                 }

java/java.disco/external/binaries-list

@@ -15,5 +15,5 @@
 # specific language governing permissions and limitations
 # under the License.
 4FCCADF37F1C61A0895BAC3D42FE0C530438826C org.checkerframework:checker-qual:3.9.1
-CE10D968585304A7463430DD53254E6D6893DF16 io.foojay.api:discoclient:2.0.24
-F66F9FC72A84FCAB1579202728EE572BDBB46DD7 eu.hansolo:jdktools:11.0.11
+BB975ACE8403330DCC7ABF61A3142B0B59ADC755 io.foojay.api:discoclient:2.0.39
+AD117688D24FACCF74D3B76AFFFC2693C4F5D122 eu.hansolo:jdktools:11.0.19

java/java.disco/external/discoclient-2.0.24-license.txt renamed to java/java.disco/external/discoclient-2.0.39-license.txt

@@ -1,6 +1,6 @@
 Name: DiscoClient
 Origin: Gerrit Grunwald
-Version: 2.0.24
+Version: 2.0.39
 License: Apache-2.0
 Description: Library to access the Foojay.io Discovery API service.
 Origin: https://github.com/foojayio/discoclient

java/java.disco/external/jdktools-11.0.11-license.txt renamed to java/java.disco/external/jdktools-11.0.19-license.txt

@@ -1,6 +1,6 @@
 Name: JDKTools
 Origin: Gerrit Grunwald
-Version: 11.0.11
+Version: 11.0.19
 License: Apache-2.0
 Description: Collection of classes for working with OpenJDK related things.
 Origin: https://github.com/HanSolo/jdktools