This is an automated email from the ASF dual-hosted git repository. skygo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 3b74c2f18803a2954b99ca9a5cf00860e5826404 Merge: 35028307bd 3134074ad9 Author: Eric Barboni <[email protected]> AuthorDate: Wed Aug 7 18:33:00 2024 +0200 Merge pull request #7630 from apache/delivery Sync delivery to master after 23-rc2 .../modules/maven/apisupport/NBMNativeMWI.java | 52 ++++++++--------- .../modules/maven/apisupport/NBMNativeMWITest.java | 12 ++-- .../nbproject/project.properties | 2 +- .../debugger/jpda/truffle/RemoteServices.java | 6 +- .../jpda/models/VariableMirrorTranslator.java | 9 ++- .../modules/editor/java/JavaCompletionItem.java | 12 ++-- .../netbeans/modules/editor/java/LazySortText.java | 65 ++++++++++++++++++++-- .../lsp/server/protocol/ConstructorGenerator.java | 2 +- .../server/protocol/DelegateMethodGenerator.java | 2 +- .../server/protocol/EqualsHashCodeGenerator.java | 6 +- .../lsp/server/protocol/GetterSetterGenerator.java | 6 +- .../protocol/ImplementOverrideMethodGenerator.java | 4 +- .../java/lsp/server/protocol/LoggerGenerator.java | 2 +- .../lsp/server/protocol/ToStringGenerator.java | 2 +- .../modules/java/classfile/CodeGenerator.java | 9 +++ java/libs.javacapi/external/binaries-list | 4 +- .../external/nb-javac-jdk-23+35-license.txt} | 4 +- java/libs.javacapi/nbproject/project.xml | 4 +- java/libs.nbjavacapi/external/binaries-list | 4 +- .../external/nb-javac-jdk-23+35-license.txt} | 4 +- java/libs.nbjavacapi/nbproject/project.properties | 4 +- java/libs.nbjavacapi/nbproject/project.xml | 4 +- .../maven/options/MavenVersionSettings.java | 9 +-- .../org/netbeans/nbbuild/extlibs/ignored-overlaps | 4 +- platform/libs.flatlaf/external/binaries-list | 2 +- ...f-3.5-license.txt => flatlaf-3.5.1-license.txt} | 4 +- platform/libs.flatlaf/manifest.mf | 2 +- platform/libs.flatlaf/nbproject/project.properties | 14 ++--- platform/libs.flatlaf/nbproject/project.xml | 4 +- 29 files changed, 161 insertions(+), 97 deletions(-) diff --cc platform/libs.flatlaf/manifest.mf index 98c32be40e,bcbb248aff..fd007c571a --- a/platform/libs.flatlaf/manifest.mf +++ b/platform/libs.flatlaf/manifest.mf @@@ -2,6 -2,6 +2,6 @@@ Manifest-Version: 1. OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/flatlaf/Bundle.properties OpenIDE-Module: org.netbeans.libs.flatlaf/1 OpenIDE-Module-Install: org/netbeans/libs/flatlaf/Installer.class -OpenIDE-Module-Specification-Version: 1.19 +OpenIDE-Module-Specification-Version: 1.20 AutoUpdate-Show-In-Client: false - OpenIDE-Module-Implementation-Version: 3.5 + OpenIDE-Module-Implementation-Version: 3.5.1 --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
