This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch release210
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 115308a5e12df3924736ffb7d7cccf649b2bc690
Merge: 61d71a2ede 8a08acc74a
Author: Neil C Smith <neilcsm...@apache.org>
AuthorDate: Wed Feb 7 09:53:55 2024 +0000
Merge pull request #7015 from apache/delivery
Sync delivery to release210 for 21-rc3
.github/workflows/main.yml | 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/manifest.mf | 2 +-
extide/libs.gradle/nbproject/project.properties | 2 +-
extide/libs.gradle/nbproject/project.xml | 2 +-
.../visualizer/editable/DiffContentPanel.java | 18 ++++++++--
.../newproject/SimpleApplicationProjectWizard.java | 6 ++--
.../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 ++
16 files changed, 76 insertions(+), 46 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
