This is an automated email from the ASF dual-hosted git repository. mbien pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 34d371d2fb3b8ae110743e8008a0a752d0d691d7 Merge: 54e4883a489 151d4d24240 Author: Michael Bien <[email protected]> AuthorDate: Tue Jul 16 03:16:19 2024 +0200 Merge pull request #7569 from mbien/lib-upgrades-nb23 Upgrade commons libs, freemarker, jackson, guava, gson, maven-indexer, junit and jgit enterprise/libs.jackson/external/binaries-list | 12 +- ...17.0-license.txt => jackson-2.17.2-license.txt} | 4 +- .../libs.jackson/nbproject/project.properties | 12 +- enterprise/libs.jackson/nbproject/project.xml | 24 +-- ide/c.google.gson/external/binaries-list | 2 +- ...n-2.8.9-license.txt => gson-2.11.0-license.txt} | 2 +- ide/c.google.gson/nbproject/project.properties | 2 +- ide/c.google.gson/nbproject/project.xml | 2 +- ide/c.google.guava/external/binaries-list | 2 +- ...re-license.txt => guava-33.2.1-jre-license.txt} | 2 +- ide/c.google.guava/nbproject/project.properties | 2 +- ide/c.google.guava/nbproject/project.xml | 2 +- ide/libs.commons_compress/external/binaries-list | 2 +- ...nse.txt => commons-compress-1.26.2-license.txt} | 2 +- ...tice.txt => commons-compress-1.26.2-notice.txt} | 0 .../nbproject/project.properties | 2 +- ide/libs.commons_compress/nbproject/project.xml | 4 +- .../netbeans/libs/commons_compress/mf-layer.xml | 2 +- ide/libs.commons_net/external/binaries-list | 2 +- ...-license.txt => commons-net-3.11.1-license.txt} | 2 +- ....0-notice.txt => commons-net-3.11.1-notice.txt} | 0 ide/libs.commons_net/nbproject/project.properties | 2 +- ide/libs.commons_net/nbproject/project.xml | 4 +- .../src/org/netbeans/libs/commons_net/mf-layer.xml | 2 +- ide/libs.freemarker/external/binaries-list | 2 +- ...2-license.txt => freemarker-2.3.33-license.txt} | 2 +- ....32-notice.txt => freemarker-2.3.33-notice.txt} | 0 ide/libs.freemarker/nbproject/project.properties | 4 +- ide/libs.freemarker/nbproject/project.xml | 4 +- .../netbeans/libs/freemarker/FreemarkerEngine.java | 24 +-- .../libs/freemarker/FreemarkerFactory.java | 62 ++---- .../org/netbeans/libs/freemarker/RsrcLoader.java | 4 +- ide/o.eclipse.jgit.gpg.bc/external/binaries-list | 2 +- ....jgit.gpg.bc-6.10.0.202406032230-r-license.txt} | 2 +- .../nbproject/project.properties | 2 +- ide/o.eclipse.jgit.gpg.bc/nbproject/project.xml | 2 +- ide/o.eclipse.jgit.lfs/external/binaries-list | 2 +- ...pse.jgit.lfs-6.10.0.202406032230-r-license.txt} | 2 +- .../nbproject/project.properties | 2 +- ide/o.eclipse.jgit.lfs/nbproject/project.xml | 2 +- ide/o.eclipse.jgit.ssh.jsch/external/binaries-list | 2 +- ...git.ssh.jsch-6.10.0.202406032230-r-license.txt} | 2 +- .../nbproject/project.properties | 2 +- ide/o.eclipse.jgit.ssh.jsch/nbproject/project.xml | 2 +- ide/o.eclipse.jgit/external/binaries-list | 2 +- ...eclipse.jgit-6.10.0.202406032230-r-license.txt} | 2 +- ide/o.eclipse.jgit/nbproject/project.properties | 2 +- ide/o.eclipse.jgit/nbproject/project.xml | 2 +- java/maven.indexer/external/binaries-list | 17 +- .../maven.indexer/external/gson-2.11.0-license.txt | 208 --------------------- ...-license.txt => indexer-core-7.1.4-license.txt} | 4 +- ....3-notice.txt => indexer-core-7.1.4-notice.txt} | 0 ....11.0-license.txt => lucene-9.11.1-license.txt} | 4 +- ...-9.11.0-notice.txt => lucene-9.11.1-notice.txt} | 0 java/maven.indexer/nbproject/project.properties | 17 +- java/maven.indexer/nbproject/project.xml | 40 ++-- .../org/netbeans/nbbuild/extlibs/ignored-overlaps | 7 +- platform/junitlib/external/binaries-list | 12 +- ...se.txt => junit-jupiter-api-5.10.3-license.txt} | 4 +- ...txt => junit-jupiter-engine-5.10.3-license.txt} | 4 +- ...txt => junit-jupiter-params-5.10.3-license.txt} | 4 +- platform/junitlib/nbproject/project.properties | 24 +-- .../netbeans/modules/junitlib/Bundle.properties | 2 +- .../src/org/netbeans/modules/junitlib/junit_5.xml | 24 +-- platform/libs.junit5/external/binaries-list | 6 +- ...icense.txt => junit-jupiter-5.10.3-license.txt} | 6 +- platform/libs.junit5/nbproject/project.properties | 6 +- platform/libs.junit5/nbproject/project.xml | 12 +- platform/o.apache.commons.codec/build.xml | 8 +- .../o.apache.commons.codec/external/binaries-list | 2 +- ...icense.txt => commons-codec-1.17.0-license.txt} | 2 +- ...-notice.txt => commons-codec-1.17.0-notice.txt} | 0 .../o.apache.commons.codec/nbproject/project.xml | 2 +- .../external/binaries-list | 2 +- ...0-license.txt => commons-io-2.16.1-license.txt} | 2 +- ...6.0-notice.txt => commons-io-2.16.1-notice.txt} | 0 .../nbproject/project.properties | 2 +- .../nbproject/project.xml | 4 +- platform/o.apache.commons.logging/build.xml | 8 +- .../external/binaries-list | 2 +- ...cense.txt => commons-logging-1.3.3-license.txt} | 2 +- ...notice.txt => commons-logging-1.3.3-notice.txt} | 0 .../o.apache.commons.logging/nbproject/project.xml | 2 +- 83 files changed, 212 insertions(+), 453 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
