This is an automated email from the ASF dual-hosted git repository.
skygo pushed a commit to branch release220
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 9f0aa2456a1b646c98e082d7f0d445680ad72cfb
Merge: 148b16829d 09cb41c0d5
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Tue May 7 17:45:13 2024 +0200
Merge pull request #7352 from apache/delivery
Sync delivery to release220 for 22-rc3
.github/workflows/main.yml | 2 +-
.../modules/apisupport/project/TestBase.java | 2 +-
.../modules/apisupport/project/TestUtil.java | 12 -
.../modules/j2ee/clientproject/test/TestUtil.java | 14 +-
.../modules/j2ee/earproject/test/TestUtil.java | 14 +-
.../modules/j2ee/ejbjarproject/test/TestUtil.java | 15 +-
.../WebInjectionTargetQueryImplementationTest.java | 12 +-
.../netbeans/modules/web/core/test/TestUtil.java | 569 ---------------------
.../modules/web/project/test/TestUtil.java | 14 +-
.../nbjunit/src/org/netbeans/junit/NbTestCase.java | 28 +-
.../modules/ide/kit/VerifySimpleTemplatesTest.java | 13 +-
.../swing/dirchooser/DirectoryChooserUI.java | 4 +-
.../src/org/netbeans/api/project/TestUtil.java | 16 +-
.../netbeans/modules/project/ui/zip/ExportZIP.java | 5 +-
.../addproperty/AddPropertyCodeGenerator.java | 13 +-
.../editor/codegen/EqualsHashCodeGenerator.java | 22 +-
.../java/editor/codegen/GeneratorUtils.java | 3 -
.../java/editor/codegen/GetterSetterGenerator.java | 10 +-
.../codegen/ImplementOverrideMethodGenerator.java | 2 +-
.../java/editor/codegen/ToStringGenerator.java | 50 +-
.../java/editor/codegen/ui/ElementNode.java | 4 +-
.../java/editor/overridden/ComputeOverriders.java | 37 +-
.../java/editor/codegen/ToStringGeneratorTest.java | 84 ++-
.../netbeans/api/java/source/ElementUtilities.java | 14 +-
.../api/java/source/GeneratorUtilities.java | 31 +-
.../source/resources/GeneratedMethodBody.template | 7 +-
.../source/resources/OverriddenMethodBody.template | 3 +-
.../maven/refactoring/MavenRefactoringPlugin.java | 12 +-
.../maven/options/MavenVersionSettings.java | 10 +-
.../test/unit/src/org/netbeans/SetupHid.java | 11 -
platform/o.apache.commons.logging/build.xml | 20 +-
.../o.apache.commons.logging/nbproject/project.xml | 4 +
.../CommonsLoggingBundleActivator.java | 42 ++
.../test/unit/src/org/netbeans/SetupHid.java | 11 +-
.../src/org/openide/util/test/TestFileUtils.java | 148 +++---
35 files changed, 393 insertions(+), 865 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
