This is an automated email from the ASF dual-hosted git repository. ebarboni pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 5c806a4d95ea4face79214dff1e217b5130f3dd8 Merge: 07c92138b29 9394cb2ac07 Author: Eric Barboni <[email protected]> AuthorDate: Thu Apr 23 12:43:45 2026 +0200 Merge pull request #9356 from apache/delivery Sync delivery to master after 30-rc2 .../env/hints/HintsControllerFactory.java | 7 ----- .../modules/languages/env/resources/layer.xml | 1 - ...nse.txt => apache-maven-3.9.15-bin-license.txt} | 2 +- ...tice.txt => apache-maven-3.9.15-bin-notice.txt} | 2 +- ...nse.txt => apache-maven-3.9.15-epl-license.txt} | 4 +-- ...e-maven-3.9.15-failureaccess-1.0.3-license.txt} | 2 +- ...ache-maven-3.9.15-guava-33.5.0-jre-license.txt} | 2 +- ...-3.9.15-javax.annotation-api-1.3.2-license.txt} | 2 +- ...> apache-maven-3.9.15-slf4j-1.7.36-license.txt} | 2 +- java/maven.embedder/external/binaries-list | 2 +- java/maven.embedder/external/binariesembedded-list | 30 +++++++++++----------- java/maven.embedder/nbproject/project.properties | 2 +- java/maven.embedder/nbproject/project.xml | 30 +++++++++++----------- java/maven/nbproject/project.properties | 8 +++--- .../org/netbeans/nbbuild/extlibs/ignored-overlaps | 20 +++++++-------- .../editor/formatter/JsFormatVisitor.java | 16 +++++++----- .../testfiles/formatter/staticClassInitializer1.js | 9 +++++++ .../formatter/staticClassInitializer1.js.formatted | 9 +++++++ .../editor/formatter/JsFormatterTest.java | 4 +++ 19 files changed, 85 insertions(+), 69 deletions(-) --------------------------------------------------------------------- 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
