This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch release200 in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 91f9ed846ac143b52d50b5ea323a42c2f7e78392 Merge: cbc39f85a1 ff571908ab Author: Neil C Smith <neilcsm...@apache.org> AuthorDate: Tue Nov 14 11:53:02 2023 +0000 Merge pull request #6685 from apache/delivery Sync delivery to release200 for 20-rc4 .github/workflows/main.yml | 4 +- .../data/gradle/artifacts/multi/app/build.gradle | 1 - .../data/gradle/artifacts/multi/gradle.properties | 2 +- .../data/gradle/artifacts/multi/oci/build.gradle | 1 - .../gradle/MicronautGradleArtifactsImplTest.java | 47 +++++++- .../gradle/spi/newproject/TemplateOperation.java | 4 +- .../modules/git/ui/branch/CreateBranchAction.java | 10 ++ .../git/ui/checkout/SwitchBranchAction.java | 11 ++ .../testrunner/ui/api/TestMethodController.java | 6 +- .../gsf/testrunner/ui/api/TestsuiteNode.java | 42 ++----- .../libs/git/jgit/commands/CherryPickCommand.java | 17 ++- .../netbeans/libs/git/jgit/commands/AddTest.java | 5 +- .../libs/git/jgit/commands/CheckoutTest.java | 3 +- .../netbeans/libs/git/jgit/commands/MergeTest.java | 3 +- .../netbeans/libs/git/jgit/commands/PushTest.java | 8 +- .../libs/git/jgit/commands/RevertTest.java | 3 +- .../java/lsp/server/explorer/ProjectViewTest.java | 11 +- .../modules/java/source/save/Reformatter.java | 6 +- .../modules/java/source/save/FormatingTest.java | 127 +++++++++++++++++++++ .../java/testrunner/ui/ComputeTestMethodsImpl.java | 3 +- .../maven/options/MavenVersionSettings.java | 9 +- .../src/org/netbeans/core/output2/OutputPane.java | 9 ++ .../src/org/netbeans/core/output2/OutputTab.java | 42 +++---- .../core/output2/ui/AbstractOutputPane.java | 50 ++++---- 24 files changed, 317 insertions(+), 107 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