You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by mb...@apache.org on 2023/10/05 07:52:55 UTC

[netbeans] branch master updated (e8bcbc6fa7 -> 65b00e7717)

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

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


    from e8bcbc6fa7 Merge pull request #6480 from lahodaj/upgrade-libs-sept-2023
     new 223c298113 Upgrading jdom to jdom2
     new 65b00e7717 Merge pull request #6478 from lahodaj/upgrade-to-jdom2

The 9120 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:
 .../maven/format/checkstyle/ModuleConvertor.java   |   8 +-
 java/maven.embedder/external/binaries-list         |   2 +-
 java/maven.embedder/external/jdom-1.0-license.txt  |  55 -----------
 .../external/jdom2-2.0.6.1-license.txt             |  59 ++++++++++++
 ...dom-1.0-notice.txt => jdom2-2.0.6.1-notice.txt} |   0
 java/maven.embedder/nbproject/project.properties   |   2 +-
 java/maven.embedder/nbproject/project.xml          |  14 +--
 .../org-netbeans-modules-maven-grammar.sig         |  19 ++--
 .../maven/grammar/MavenArchetypeGrammar.java       |   2 +-
 .../maven/grammar/MavenAssemblyGrammar.java        |   2 +-
 .../modules/maven/grammar/MavenNbmGrammar.java     |   2 +-
 .../modules/maven/grammar/MavenProjectGrammar.java |  66 ++++++-------
 .../maven/grammar/MavenSettingsGrammar.java        |   2 +-
 .../grammar/spi/AbstractSchemaBasedGrammar.java    |  88 ++++++------------
 .../grammar/spi/GrammarExtensionProvider.java      |   2 +-
 .../maven/junit/JUnitOutputListenerProvider.java   |   8 +-
 .../maven/osgi/FelixPluginGrammarExtension.java    |   2 +-
 .../maven/nbproject/org-netbeans-modules-maven.sig |  24 ++---
 .../modules/maven/customizer/ActionMappings.java   |   2 +-
 .../maven/customizer/CustomizerProviderImpl.java   |  12 +--
 .../io/jdom/NetbeansBuildActionJDOMWriter.java     |  14 +--
 .../maven/newproject/CatalogRepoProvider.java      |  10 +-
 .../io/jdom/NetbeansBuildActionJDOMWriterTest.java |   6 +-
 nbbuild/licenses/BSD-JDOM                          | 102 +++++++++++----------
 24 files changed, 238 insertions(+), 265 deletions(-)
 delete mode 100644 java/maven.embedder/external/jdom-1.0-license.txt
 create mode 100644 java/maven.embedder/external/jdom2-2.0.6.1-license.txt
 rename java/maven.embedder/external/{jdom-1.0-notice.txt => jdom2-2.0.6.1-notice.txt} (100%)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists