This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit f60ecd2c8690960bd55a93bb20d1a19c36884884
Merge: 681aa76567 63178442af
Author: Neil C Smith <neilcsm...@apache.org>
AuthorDate: Fri Feb 9 10:23:56 2024 +0000
Merge pull request #7016 from apache/delivery
Sync delivery to master after 21-rc3
.github/workflows/main.yml | 2 --
extide/gradle/netbeans-gradle-tooling/build.gradle | 1 +
extide/gradle/netbeans-gradle-tooling/build.xml | 2 +-
.../api/execute/GradleDistributionManager.java | 7 ++--
.../gradle/spi/newproject/TemplateOperation.java | 13 ++++++--
extide/libs.gradle/external/binaries-list | 2 +-
...ense.txt => gradle-tooling-api-8.6-license.txt} | 4 +--
...otice.txt => gradle-tooling-api-8.6-notice.txt} | 4 +--
extide/libs.gradle/nbproject/project.properties | 2 +-
extide/libs.gradle/nbproject/project.xml | 2 +-
.../visualizer/editable/DiffContentPanel.java | 18 ++++++++--
.../newproject/SimpleApplicationProjectWizard.java | 6 ++--
java/java.lsp.server/vscode/src/nbcode.ts | 4 +--
java/java.lsp.server/vscode/src/test/runTest.ts | 2 +-
.../modules/java/mx/project/suitepy/Parse.java | 9 ++---
.../modules/java/mx/project/CoreSuiteTest.java | 3 +-
.../modules/java/mx/project/SdkSuiteTest.java | 39 ++++++++++++----------
.../netbeans/modules/maven/NbMavenProjectImpl.java | 7 ++--
nbbuild/jms-config/desktop.flags | 2 ++
.../editor/completion/CompletionContextFinder.java | 3 +-
.../php/editor/completion/PHPCodeCompletion.java | 3 ++
.../testParseException/testParseException.php | 31 +++--------------
...arseException.php.testParseException.completion | 4 +++
.../editor/completion/PHP80CodeCompletionTest.java | 8 +++++
24 files changed, 102 insertions(+), 76 deletions(-)
---------------------------------------------------------------------
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
