This is an automated email from the ASF dual-hosted git repository.

ebarboni pushed a change to branch release300
in repository https://gitbox.apache.org/repos/asf/netbeans.git


    from 10ae5006796 Merge pull request #8899 from jGauravGupta/FISH-11704
     add f22269caf6d Update bundled maven to 3.9.15
     add b7005db3a69 Merge pull request #9343 from mbien/maven-3915
     add 8146cc11ce8 Fix env files hints options panel registration
     add 41b6d91baae Merge pull request #9352 from mbien/env-hints-panel-fix
     add 86d13233902 JS: reformatting fails for classes that contain a static 
initializer
     add 9394cb2ac07 Merge pull request #9358 from 
matthiasblaesing/js_static_init
     new 46c1feab2cb Merge pull request #9355 from apache/delivery

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../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(-)
 rename java/maven.embedder/external/{apache-maven-3.9.14-bin-license.txt => 
apache-maven-3.9.15-bin-license.txt} (99%)
 rename java/maven.embedder/external/{apache-maven-3.9.14-bin-notice.txt => 
apache-maven-3.9.15-bin-notice.txt} (98%)
 rename java/maven.embedder/external/{apache-maven-3.9.14-epl-license.txt => 
apache-maven-3.9.15-epl-license.txt} (98%)
 rename 
java/maven.embedder/external/{apache-maven-3.9.14-failureaccess-1.0.3-license.txt
 => apache-maven-3.9.15-failureaccess-1.0.3-license.txt} (99%)
 rename 
java/maven.embedder/external/{apache-maven-3.9.14-guava-33.5.0-jre-license.txt 
=> apache-maven-3.9.15-guava-33.5.0-jre-license.txt} (99%)
 rename 
java/maven.embedder/external/{apache-maven-3.9.14-javax.annotation-api-1.3.2-license.txt
 => apache-maven-3.9.15-javax.annotation-api-1.3.2-license.txt} (99%)
 rename 
java/maven.embedder/external/{apache-maven-3.9.14-slf4j-1.7.36-license.txt => 
apache-maven-3.9.15-slf4j-1.7.36-license.txt} (95%)
 create mode 100644 
webcommon/javascript2.editor/test/unit/data/testfiles/formatter/staticClassInitializer1.js
 create mode 100644 
webcommon/javascript2.editor/test/unit/data/testfiles/formatter/staticClassInitializer1.js.formatted


---------------------------------------------------------------------
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

Reply via email to