Merge pull request #7673 from apache/delivery

Sync delivery to release230 for 23-rc3
apache · Sep 6, 2024 · 2985f1f · 2985f1f
2 parents cc863fd + adf4a0b
commit 2985f1f
Show file tree

Hide file tree

Showing 46 changed files with 533 additions and 984 deletions.
diff --git a/cpplite/cpplite.editor/src/org/netbeans/modules/cpplite/editor/file/CDataObject.java b/cpplite/cpplite.editor/src/org/netbeans/modules/cpplite/editor/file/CDataObject.java
@@ -103,12 +103,12 @@
             position = 1400
     ),
     @ActionReference(
-            path = "Editors/" + MIMETypes.CPP + "/Popup",
+            path = "Editors/" + MIMETypes.C + "/Popup",
             id = @ActionID(category = "Refactoring", id = "org.netbeans.modules.refactoring.api.ui.WhereUsedAction"),
             position = 1400
     ),
     @ActionReference(
-            path = "Editors/" + MIMETypes.CPP + "/Popup",
+            path = "Editors/" + MIMETypes.C + "/Popup",
             id = @ActionID(category = "Refactoring", id = "org.netbeans.modules.refactoring.api.ui.RenameAction"),
             position = 1500,
             separatorAfter = 1550

diff --git a/cpplite/cpplite.editor/src/org/netbeans/modules/cpplite/editor/file/HDataObject.java b/cpplite/cpplite.editor/src/org/netbeans/modules/cpplite/editor/file/HDataObject.java
@@ -103,12 +103,12 @@
             position = 1400
     ),
     @ActionReference(
-            path = "Editors/" + MIMETypes.CPP + "/Popup",
+            path = "Editors/" + MIMETypes.H + "/Popup",
             id = @ActionID(category = "Refactoring", id = "org.netbeans.modules.refactoring.api.ui.WhereUsedAction"),
             position = 1400
     ),
     @ActionReference(
-            path = "Editors/" + MIMETypes.CPP + "/Popup",
+            path = "Editors/" + MIMETypes.H + "/Popup",
             id = @ActionID(category = "Refactoring", id = "org.netbeans.modules.refactoring.api.ui.RenameAction"),
             position = 1500,
             separatorAfter = 1550

diff --git a/cpplite/cpplite.editor/src/org/netbeans/modules/cpplite/editor/file/HPPDataObject.java b/cpplite/cpplite.editor/src/org/netbeans/modules/cpplite/editor/file/HPPDataObject.java
@@ -103,12 +103,12 @@
             position = 1400
     ),
     @ActionReference(
-            path = "Editors/" + MIMETypes.CPP + "/Popup",
+            path = "Editors/" + MIMETypes.HPP + "/Popup",
             id = @ActionID(category = "Refactoring", id = "org.netbeans.modules.refactoring.api.ui.WhereUsedAction"),
             position = 1400
     ),
     @ActionReference(
-            path = "Editors/" + MIMETypes.CPP + "/Popup",
+            path = "Editors/" + MIMETypes.HPP + "/Popup",
             id = @ActionID(category = "Refactoring", id = "org.netbeans.modules.refactoring.api.ui.RenameAction"),
             position = 1500,
             separatorAfter = 1550

diff --git a/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java
@@ -100,9 +100,10 @@ public final class GradleDistributionManager {
         GradleVersion.version("8.3"), // JDK-20
         GradleVersion.version("8.5"), // JDK-21
         GradleVersion.version("8.8"), // JDK-22
+        GradleVersion.version("8.10"),// JDK-23
     };
 
-    private static final GradleVersion LAST_KNOWN_GRADLE = GradleVersion.version("8.9"); //NOI18N
+    private static final GradleVersion LAST_KNOWN_GRADLE = GradleVersion.version("8.10"); //NOI18N
 
     final File gradleUserHome;
 

diff --git a/extide/gradle/src/org/netbeans/modules/gradle/loaders/LegacyProjectLoader.java b/extide/gradle/src/org/netbeans/modules/gradle/loaders/LegacyProjectLoader.java
@@ -19,6 +19,7 @@
 package org.netbeans.modules.gradle.loaders;
 
 import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -625,21 +626,24 @@ public void run() {
 
         OutputStream logStream = null;
         try {
-            if (LOG.isLoggable(Level.FINER)) {
-                if (LOG.isLoggable(Level.FINEST)) {
-                    action.addArguments("--debug"); // NOI18N
-                }
-                PipedOutputStream pos = new ImmediatePipedOutputStream();
-                try {
-                    logStream = pos;
-                    DAEMON_LOG_RP.post(new LogDelegate(new PipedInputStream(pos)));
-                } catch (IOException ex) {
-                    throw new IllegalStateException(ex);
-                }
-                action.setStandardOutput(pos);
-                action.setStandardError(pos);
+            // no input will be ever given ...
+            InputStream emptyIs = new ByteArrayInputStream(new byte[0]);
+            // Github #7606: although the content of the OuptutStream will not be printed unless LOG is >= FINER,
+            // for some reason gradle daemon blocks on (empty) stdin if the output is not read+processed.
+            // So attaching the daemon + output stream handler unconditionally.
+            if (LOG.isLoggable(Level.FINEST)) {
+                action.addArguments("--debug"); // NOI18N
             }
-
+            PipedOutputStream pos = new ImmediatePipedOutputStream();
+            try {
+                logStream = pos;
+                DAEMON_LOG_RP.post(new LogDelegate(new PipedInputStream(pos)));
+            } catch (IOException ex) {
+                throw new IllegalStateException(ex);
+            }
+            action.setStandardOutput(pos);
+            action.setStandardError(pos);
+            action.setStandardInput(emptyIs);
             return action.run(); 
         } finally {
             if (logStream != null) {

diff --git a/extide/libs.gradle/external/binaries-list b/extide/libs.gradle/external/binaries-list
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-7BCC4423C529A42ECA9D0CE5B5275369EF4DF55A https://repo.gradle.org/artifactory/libs-releases/org/gradle/gradle-tooling-api/8.9/gradle-tooling-api-8.9.jar gradle-tooling-api-8.9.jar
+1FC754376876B11AE26D811F8812AA37773660DD https://repo.gradle.org/artifactory/libs-releases/org/gradle/gradle-tooling-api/8.10/gradle-tooling-api-8.10.jar gradle-tooling-api-8.10.jar
diff --git a/...ternal/gradle-tooling-api-8.9-license.txt → ...ernal/gradle-tooling-api-8.10-license.txt b/...ternal/gradle-tooling-api-8.9-license.txt → ...ernal/gradle-tooling-api-8.10-license.txt
@@ -1,7 +1,7 @@
 Name: Gradle Tooling API
 Description: Gradle Tooling API
-Version: 8.9
-Files: gradle-tooling-api-8.9.jar
+Version: 8.10
+Files: gradle-tooling-api-8.10.jar
 License: Apache-2.0
 Origin: Gradle Inc.
 URL: https://gradle.org/

diff --git a/...xternal/gradle-tooling-api-8.9-notice.txt → ...ternal/gradle-tooling-api-8.10-notice.txt b/...xternal/gradle-tooling-api-8.9-notice.txt → ...ternal/gradle-tooling-api-8.10-notice.txt
diff --git a/extide/libs.gradle/nbproject/project.properties b/extide/libs.gradle/nbproject/project.properties
@@ -22,4 +22,4 @@ javac.compilerargs=-Xlint -Xlint:-serial
 # Sigtest fails to read the classes in the gradle-tooling-api
 sigtest.skip.gen=true
 
-release.external/gradle-tooling-api-8.9.jar=modules/gradle/gradle-tooling-api.jar
+release.external/gradle-tooling-api-8.10.jar=modules/gradle/gradle-tooling-api.jar
diff --git a/extide/libs.gradle/nbproject/project.xml b/extide/libs.gradle/nbproject/project.xml
@@ -39,7 +39,7 @@
             </public-packages>
             <class-path-extension>
                 <runtime-relative-path>gradle/gradle-tooling-api.jar</runtime-relative-path>
-                <binary-origin>external/gradle-tooling-api-8.9.jar</binary-origin>
+                <binary-origin>external/gradle-tooling-api-8.10.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>

diff --git a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/AbstractCompletionItem.java b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/AbstractCompletionItem.java