From dc6c749fe047c67b1732a11c93a3b78156a590df Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Wed, 15 Apr 2026 13:17:50 +0200 Subject: [PATCH] Update bundled maven to 3.9.15 --- ...xt => apache-maven-3.9.15-bin-license.txt} | 2 +- ...txt => apache-maven-3.9.15-bin-notice.txt} | 2 +- ...xt => apache-maven-3.9.15-epl-license.txt} | 4 +-- ...en-3.9.15-failureaccess-1.0.3-license.txt} | 2 +- ...maven-3.9.15-guava-33.5.0-jre-license.txt} | 2 +- ...15-javax.annotation-api-1.3.2-license.txt} | 2 +- ...che-maven-3.9.15-slf4j-1.7.36-license.txt} | 2 +- java/maven.embedder/external/binaries-list | 2 +- .../external/binariesembedded-list | 30 +++++++++---------- .../nbproject/project.properties | 2 +- java/maven.embedder/nbproject/project.xml | 30 +++++++++---------- java/maven/nbproject/project.properties | 8 ++--- .../netbeans/nbbuild/extlibs/ignored-overlaps | 20 ++++++------- 13 files changed, 54 insertions(+), 54 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%) diff --git a/java/maven.embedder/external/apache-maven-3.9.14-bin-license.txt b/java/maven.embedder/external/apache-maven-3.9.15-bin-license.txt similarity index 99% rename from java/maven.embedder/external/apache-maven-3.9.14-bin-license.txt rename to java/maven.embedder/external/apache-maven-3.9.15-bin-license.txt index 14811a288162..f76b985ff12f 100644 --- a/java/maven.embedder/external/apache-maven-3.9.14-bin-license.txt +++ b/java/maven.embedder/external/apache-maven-3.9.15-bin-license.txt @@ -1,6 +1,6 @@ Name: Apache Maven Distribution Description: Apache Maven Distribution -Version: 3.9.14 +Version: 3.9.15 License: Apache-2.0 Origin: Apache Software Foundation URL: https://maven.apache.org/ diff --git a/java/maven.embedder/external/apache-maven-3.9.14-bin-notice.txt b/java/maven.embedder/external/apache-maven-3.9.15-bin-notice.txt similarity index 98% rename from java/maven.embedder/external/apache-maven-3.9.14-bin-notice.txt rename to java/maven.embedder/external/apache-maven-3.9.15-bin-notice.txt index 006d6f1ab5e3..7e1d822c1199 100644 --- a/java/maven.embedder/external/apache-maven-3.9.14-bin-notice.txt +++ b/java/maven.embedder/external/apache-maven-3.9.15-bin-notice.txt @@ -12,7 +12,7 @@ Copyright 2006-2022 Google, Inc. This product includes software developed at The Apache Software Foundation (http://www.apache.org/). -META-INF/NOTICE in archive lib/plexus-utils-3.6.0.jar +META-INF/NOTICE in archive lib/plexus-utils-3.6.1.jar This product includes software developed by the Indiana University Extreme! Lab (http://www.extreme.indiana.edu/). This product includes software developed by diff --git a/java/maven.embedder/external/apache-maven-3.9.14-epl-license.txt b/java/maven.embedder/external/apache-maven-3.9.15-epl-license.txt similarity index 98% rename from java/maven.embedder/external/apache-maven-3.9.14-epl-license.txt rename to java/maven.embedder/external/apache-maven-3.9.15-epl-license.txt index 1d453c539b49..05271133bd58 100644 --- a/java/maven.embedder/external/apache-maven-3.9.14-epl-license.txt +++ b/java/maven.embedder/external/apache-maven-3.9.15-epl-license.txt @@ -1,9 +1,9 @@ Name: Apache Maven components under EPL v2.0 Description: These Apache Maven components are under EPL v2.0: org.eclipse.sisu.inject-1.0.0.jar org.eclipse.sisu.plexus-1.0.0.jar -Version: 3.9.14 +Version: 3.9.15 License: EPL-v20 Origin: Apache Software Foundation -Files: apache-maven-3.9.14-bin.zip!/apache-maven-3.9.14/lib/org.eclipse.sisu.inject-1.0.0.jar apache-maven-3.9.14-bin.zip!/apache-maven-3.9.14/lib/org.eclipse.sisu.plexus-1.0.0.jar +Files: apache-maven-3.9.15-bin.zip!/apache-maven-3.9.15/lib/org.eclipse.sisu.inject-1.0.0.jar apache-maven-3.9.15-bin.zip!/apache-maven-3.9.15/lib/org.eclipse.sisu.plexus-1.0.0.jar Eclipse Public License - v 2.0 diff --git a/java/maven.embedder/external/apache-maven-3.9.14-failureaccess-1.0.3-license.txt b/java/maven.embedder/external/apache-maven-3.9.15-failureaccess-1.0.3-license.txt similarity index 99% rename from java/maven.embedder/external/apache-maven-3.9.14-failureaccess-1.0.3-license.txt rename to java/maven.embedder/external/apache-maven-3.9.15-failureaccess-1.0.3-license.txt index 472682ecc720..bc484a35c9f1 100644 --- a/java/maven.embedder/external/apache-maven-3.9.14-failureaccess-1.0.3-license.txt +++ b/java/maven.embedder/external/apache-maven-3.9.15-failureaccess-1.0.3-license.txt @@ -3,7 +3,7 @@ Version: 1.0.3 License: Apache-2.0 Origin: https://github.com/google/guava Description: A Guava subproject -Files: apache-maven-3.9.14-bin.zip!/apache-maven-3.9.14/lib/failureaccess-1.0.3.jar +Files: apache-maven-3.9.15-bin.zip!/apache-maven-3.9.15/lib/failureaccess-1.0.3.jar Apache License Version 2.0, January 2004 diff --git a/java/maven.embedder/external/apache-maven-3.9.14-guava-33.5.0-jre-license.txt b/java/maven.embedder/external/apache-maven-3.9.15-guava-33.5.0-jre-license.txt similarity index 99% rename from java/maven.embedder/external/apache-maven-3.9.14-guava-33.5.0-jre-license.txt rename to java/maven.embedder/external/apache-maven-3.9.15-guava-33.5.0-jre-license.txt index 157fb6a7e1e9..aec9089fcb8e 100644 --- a/java/maven.embedder/external/apache-maven-3.9.14-guava-33.5.0-jre-license.txt +++ b/java/maven.embedder/external/apache-maven-3.9.15-guava-33.5.0-jre-license.txt @@ -3,7 +3,7 @@ Version: 33.5.0 License: Apache-2.0 Origin: https://github.com/google/guava Description: Guava is a set of core libraries that includes new collection types (such as multimap and multiset), immutable collections, a graph library, and utilities for concurrency, I/O, hashing, primitives, strings, and more. -Files: apache-maven-3.9.14-bin.zip!/apache-maven-3.9.14/lib/guava-33.5.0-jre.jar +Files: apache-maven-3.9.15-bin.zip!/apache-maven-3.9.15/lib/guava-33.5.0-jre.jar Apache License Version 2.0, January 2004 diff --git a/java/maven.embedder/external/apache-maven-3.9.14-javax.annotation-api-1.3.2-license.txt b/java/maven.embedder/external/apache-maven-3.9.15-javax.annotation-api-1.3.2-license.txt similarity index 99% rename from java/maven.embedder/external/apache-maven-3.9.14-javax.annotation-api-1.3.2-license.txt rename to java/maven.embedder/external/apache-maven-3.9.15-javax.annotation-api-1.3.2-license.txt index 29139439122f..cb71f3fd71ac 100644 --- a/java/maven.embedder/external/apache-maven-3.9.14-javax.annotation-api-1.3.2-license.txt +++ b/java/maven.embedder/external/apache-maven-3.9.15-javax.annotation-api-1.3.2-license.txt @@ -3,7 +3,7 @@ Version: 1.3.2 Description: Part of Apache Maven Distribution License: CDDL-1.1 Origin: Apache Maven -Files: apache-maven-3.9.14-bin.zip!/apache-maven-3.9.14/lib/javax.annotation-api-1.3.2.jar +Files: apache-maven-3.9.15-bin.zip!/apache-maven-3.9.15/lib/javax.annotation-api-1.3.2.jar COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1 diff --git a/java/maven.embedder/external/apache-maven-3.9.14-slf4j-1.7.36-license.txt b/java/maven.embedder/external/apache-maven-3.9.15-slf4j-1.7.36-license.txt similarity index 95% rename from java/maven.embedder/external/apache-maven-3.9.14-slf4j-1.7.36-license.txt rename to java/maven.embedder/external/apache-maven-3.9.15-slf4j-1.7.36-license.txt index 9d9b119a9da0..c8503f2029c5 100644 --- a/java/maven.embedder/external/apache-maven-3.9.14-slf4j-1.7.36-license.txt +++ b/java/maven.embedder/external/apache-maven-3.9.15-slf4j-1.7.36-license.txt @@ -3,7 +3,7 @@ Description: Part of Apache Maven Distribution Version: 1.7.36 License: MIT-slf4j-22 Origin: Apache Software Foundation -Files: apache-maven-3.9.14-bin.zip!/apache-maven-3.9.14/lib/slf4j-api-1.7.36.jar +Files: apache-maven-3.9.15-bin.zip!/apache-maven-3.9.15/lib/slf4j-api-1.7.36.jar Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland) All rights reserved. diff --git a/java/maven.embedder/external/binaries-list b/java/maven.embedder/external/binaries-list index 478bca4fe511..bb500c2bc927 100644 --- a/java/maven.embedder/external/binaries-list +++ b/java/maven.embedder/external/binaries-list @@ -16,4 +16,4 @@ # under the License. DC15DFF8F701B227EE523EEB7A17F77C10EAFE2F org.jdom:jdom2:2.0.6.1 5D9CE6ADD7B714B8095F0E3E396C5E9F8C5DCFEF org.apache.maven.shared:maven-dependency-tree:2.2 -487713BBA197D8E735ACF13712604C33C408F4A7 org.apache.maven:apache-maven:3.9.14:bin@zip +89A4C9966596FAF1E444CE1C6F99BE1EBF83F1A2 https://dist.apache.org/repos/dist/dev/maven/maven-3/3.9.15/binaries/apache-maven-3.9.15-bin.zip apache-maven-3.9.15-bin.zip diff --git a/java/maven.embedder/external/binariesembedded-list b/java/maven.embedder/external/binariesembedded-list index ab2c31c071ef..b9885306e513 100644 --- a/java/maven.embedder/external/binariesembedded-list +++ b/java/maven.embedder/external/binariesembedded-list @@ -26,34 +26,34 @@ D95F998DB5F89900FE895DAF6CD2CDDCB2F1D64B;commons-codec:commons-codec:1.21.0 4381275EFDEF6DDFAE38F002C31E84CD001C97F0;com.google.errorprone:error_prone_annotations:2.41.0 8699DE25F2F979108D6C1B804A7BA38CDA1116BC;com.google.guava:guava:33.5.0-jre E7BA4C25BEC3761840F67C73F166C0D509D01D1D;com.google.inject:guice:5.1.0:classes -BA7387C31622C6650B83EDBA1BBB115F1FE462BA;org.fusesource.jansi:jansi:2.4.2 +C8DC6E80D4FF74B0ECE025CF7EFA583C49CECF70;org.fusesource.jansi:jansi:2.4.3 7425A601C1C7EC76645A78D22B8C6A627EDEE507;org.jspecify:jspecify:1.0.0 6975DA39A7040257BD51D21A231B76C915872D38;javax.inject:javax.inject:1 D877E195A05ACA4A2F1AD2FF14BFEC1393AF4B5E;org.slf4j:jcl-over-slf4j:1.7.36 934C04D3CFEF185A8008E7BF34331B79730A9D43;javax.annotation:javax.annotation-api:1.3.2 -921C4F90EC434E29B399796077A08459571D048A;org.apache.maven:maven-artifact:3.9.14 -FD7EFF42958F7A6CE02710F02127BC158D710D4E;org.apache.maven:maven-builder-support:3.9.14 -D526B5286F4927A79120A2765A85AFF50B6889A9;org.apache.maven:maven-compat:3.9.14 -39808A75B5625DDD0E8BBA0BD8F9E953DA940ADD;org.apache.maven:maven-core:3.9.14 -8BFC827FBF237EF8C53F7264DCB6F59910D1D833;org.apache.maven:maven-embedder:3.9.14 -623D1A652D2657577BE0C8D3C249A4AB2830A843;org.apache.maven:maven-model:3.9.14 -45299E0BBEFB6575BA18214D822753A373D49AA9;org.apache.maven:maven-model-builder:3.9.14 -67A865F97A78CBD97773542FF3CB838D6624B5C1;org.apache.maven:maven-plugin-api:3.9.14 -231607AFCE2005CB03F2F882B347189F7FF27686;org.apache.maven:maven-repository-metadata:3.9.14 +1BDD4EEE8F1853FDFDEFBDEFDAAC1BB708138C93;org.apache.maven:maven-artifact:3.9.15 +9BBD9729AC0667B6C11D5A62574CBF8581494EAC;org.apache.maven:maven-builder-support:3.9.15 +0DC9687C9E8C4F39F621B987B86BAA685308FDD6;org.apache.maven:maven-compat:3.9.15 +FEA27D454846597BE5845BEC1060DD433AE0EC5E;org.apache.maven:maven-core:3.9.15 +8588D2208B4D6496ACD76C191A0501F669637300;org.apache.maven:maven-embedder:3.9.15 +2193E5C1BE2117D14A461E215943012C1599494E;org.apache.maven:maven-model:3.9.15 +53F57AAC9BD7D78BB7F6D6757FD3B37128C4141F;org.apache.maven:maven-model-builder:3.9.15 +9471D03F15536A08100157FAB73512A3297423FA;org.apache.maven:maven-plugin-api:3.9.15 +D4C8AF2FC537FCA6CD1F260219CD7AB4BC20BA22;org.apache.maven:maven-repository-metadata:3.9.15 2FE7E86E3C193121789470507CF4FADD5BD7AD59;org.apache.maven.resolver:maven-resolver-api:1.9.27 219C1F8C3289B9382B1F86FC278430D3A22968C3;org.apache.maven.resolver:maven-resolver-connector-basic:1.9.27 876FC89223D9572CADE60A1B8158846724548D07;org.apache.maven.resolver:maven-resolver-impl:1.9.27 72C89AD87BE374309A7308EE144949360ED482E8;org.apache.maven.resolver:maven-resolver-named-locks:1.9.27 -9927E911DFC855A462EE79E3F5BB3FD5EFFD8B82;org.apache.maven:maven-resolver-provider:3.9.14 +56F5162B7DEE47F803C833BE26E386B1BF7BD808;org.apache.maven:maven-resolver-provider:3.9.15 FB64E47ACDC73F938B4D5B6464EF7A6351F983D5;org.apache.maven.resolver:maven-resolver-spi:1.9.27 6931510AEC55201631D9D904A7D4F8F81541A335;org.apache.maven.resolver:maven-resolver-transport-http:1.9.27 23AF71B8583C0EF51004590196DE12C410DBCCF6;org.apache.maven.resolver:maven-resolver-transport-wagon:1.9.27 89A2B09002672807C05B3B10AFCCBCB9CFCD8486;org.apache.maven.resolver:maven-resolver-transport-file:1.9.27 7EE4446AF6AAB27475765EC9C9DC1FB2B082AF2B;org.apache.maven.resolver:maven-resolver-util:1.9.27 -B438FF21305253DED45570A74622595963942E65;org.apache.maven:maven-settings:3.9.14 -2B28C76E3C83715179B96404C0C003A91D543ABA;org.apache.maven:maven-settings-builder:3.9.14 +2034380AB005695D22BB9D243210BE44B63BEE9C;org.apache.maven:maven-settings:3.9.15 +8E70FEBB4859716C61068D06E0BF59F398E63568;org.apache.maven:maven-settings-builder:3.9.15 BFA28296272A5915B08DE9F11F34A94B0A818FD0;org.apache.maven.shared:maven-shared-utils:3.4.2 -E612704EEC107AACE14B3FFD155E2CBFC3C42B60;org.apache.maven:maven-slf4j-provider:3.9.14 +1B26210E61F2FC2C389C3531662BCF208F44CA88;org.apache.maven:maven-slf4j-provider:3.9.15 D9C2D6FF4B461AB9492EDB1CD9D8239CFB41F4CA;org.eclipse.sisu:org.eclipse.sisu.inject:1.0.0 873767E95597C9E31749123A408BD4949C29A46C;org.eclipse.sisu:org.eclipse.sisu.plexus:1.0.0 425EA8E534716B4BFF1EA90F39BD76BE951D651B;org.codehaus.plexus:plexus-cipher:2.0 @@ -61,7 +61,7 @@ ACE0820F34DE49F69511F5263BCEBB09FAC9731A;org.codehaus.plexus:plexus-classworlds: A506F84636EA7AE370D04167DD155C103E616F68;org.codehaus.plexus:plexus-component-annotations:2.2.0 5DD1B1FBACA263AD5BAA169FBD8E804C789C9DB5;org.codehaus.plexus:plexus-interpolation:1.29 F89C5080614FFD0764E49861895DBEDDE1B47237;org.codehaus.plexus:plexus-sec-dispatcher:2.0 -E8BC129728F22671A36FFF3B604EDCD39073A7B1;org.codehaus.plexus:plexus-utils:3.6.0 +9DCE1B9C69B197F453223E45A2CB9FA0CD48B424;org.codehaus.plexus:plexus-utils:3.6.1 6C62681A2F655B49963A5983B8B0950A6120AE14;org.slf4j:slf4j-api:1.7.36 A09F59BE3767DBFF0401828463D1752A9CB0C551;org.apache.maven.wagon:wagon-file:3.5.3 673D54E78F83C4700C8250A48C61F4C70EEF9BC3;org.apache.maven.wagon:wagon-http:3.5.3 diff --git a/java/maven.embedder/nbproject/project.properties b/java/maven.embedder/nbproject/project.properties index 3f5b9a9b17a8..2cfb3c8e30fe 100644 --- a/java/maven.embedder/nbproject/project.properties +++ b/java/maven.embedder/nbproject/project.properties @@ -20,7 +20,7 @@ javac.release=17 javac.compilerargs=-Xlint -Xlint:-serial release.external/jdom2-2.0.6.1.jar=modules/ext/maven/jdom2-2.0.6.1.jar release.external/maven-dependency-tree-2.2.jar=modules/ext/maven/maven-dependency-tree-2.2.jar -bundled.maven=apache-maven-3.9.14 +bundled.maven=apache-maven-3.9.15 extra.module.files=maven/ nbm.executable.files=maven/bin/mvn,maven/bin/mvnDebug,maven/bin/mvnyjp extra.license.files=${cluster}/maven/LICENSE.txt,${cluster}/maven/NOTICE.txt diff --git a/java/maven.embedder/nbproject/project.xml b/java/maven.embedder/nbproject/project.xml index ec4ce04ec9c9..c2985384efaa 100644 --- a/java/maven.embedder/nbproject/project.xml +++ b/java/maven.embedder/nbproject/project.xml @@ -361,7 +361,7 @@ maven-slf4j-provider injects MavenSimpleLogger which decorates the output for terminal use this causes problems in log files, tests etc which don't expect or cant display them properly - ../maven/lib/jansi-2.4.2.jar + ../maven/lib/jansi-2.4.3.jar --> @@ -377,31 +377,31 @@ ../maven/lib/jspecify-1.0.0.jar - ../maven/lib/maven-artifact-3.9.14.jar + ../maven/lib/maven-artifact-3.9.15.jar - ../maven/lib/maven-builder-support-3.9.14.jar + ../maven/lib/maven-builder-support-3.9.15.jar - ../maven/lib/maven-compat-3.9.14.jar + ../maven/lib/maven-compat-3.9.15.jar - ../maven/lib/maven-core-3.9.14.jar + ../maven/lib/maven-core-3.9.15.jar - ../maven/lib/maven-embedder-3.9.14.jar + ../maven/lib/maven-embedder-3.9.15.jar - ../maven/lib/maven-model-3.9.14.jar + ../maven/lib/maven-model-3.9.15.jar - ../maven/lib/maven-model-builder-3.9.14.jar + ../maven/lib/maven-model-builder-3.9.15.jar - ../maven/lib/maven-plugin-api-3.9.14.jar + ../maven/lib/maven-plugin-api-3.9.15.jar - ../maven/lib/maven-repository-metadata-3.9.14.jar + ../maven/lib/maven-repository-metadata-3.9.15.jar ../maven/lib/maven-resolver-api-1.9.27.jar @@ -416,7 +416,7 @@ ../maven/lib/maven-resolver-named-locks-1.9.27.jar - ../maven/lib/maven-resolver-provider-3.9.14.jar + ../maven/lib/maven-resolver-provider-3.9.15.jar ../maven/lib/maven-resolver-spi-1.9.27.jar @@ -434,16 +434,16 @@ ../maven/lib/maven-resolver-util-1.9.27.jar - ../maven/lib/maven-settings-3.9.14.jar + ../maven/lib/maven-settings-3.9.15.jar - ../maven/lib/maven-settings-builder-3.9.14.jar + ../maven/lib/maven-settings-builder-3.9.15.jar ../maven/lib/maven-shared-utils-3.4.2.jar - ../maven/lib/maven-slf4j-provider-3.9.14.jar + ../maven/lib/maven-slf4j-provider-3.9.15.jar ../maven/lib/org.eclipse.sisu.inject-1.0.0.jar @@ -464,7 +464,7 @@ ../maven/lib/plexus-sec-dispatcher-2.0.jar - ../maven/lib/plexus-utils-3.6.0.jar + ../maven/lib/plexus-utils-3.6.1.jar ../maven/lib/slf4j-api-1.7.36.jar diff --git a/java/maven/nbproject/project.properties b/java/maven/nbproject/project.properties index 85412150adb1..743e68471068 100644 --- a/java/maven/nbproject/project.properties +++ b/java/maven/nbproject/project.properties @@ -48,9 +48,9 @@ mavensrc.cp=:\ ${maven.embedder.dir}/maven/boot/plexus-classworlds-2.9.0.jar:\ ${maven.embedder.dir}/maven/lib/javax.annotation-api-1.3.2.jar:\ ${maven.embedder.dir}/maven/lib/javax.inject-1.jar:\ - ${maven.embedder.dir}/maven/lib/maven-core-3.9.14.jar:\ - ${maven.embedder.dir}/maven/lib/maven-model-3.9.14.jar:\ - ${maven.embedder.dir}/maven/lib/maven-plugin-api-3.9.14.jar:\ + ${maven.embedder.dir}/maven/lib/maven-core-3.9.15.jar:\ + ${maven.embedder.dir}/maven/lib/maven-model-3.9.15.jar:\ + ${maven.embedder.dir}/maven/lib/maven-plugin-api-3.9.15.jar:\ ${maven.embedder.dir}/maven/lib/maven-resolver-api-1.9.27.jar:\ ${maven.embedder.dir}/maven/lib/org.eclipse.sisu.plexus-1.0.0.jar:\ - ${maven.embedder.dir}/maven/lib/plexus-utils-3.6.0.jar + ${maven.embedder.dir}/maven/lib/plexus-utils-3.6.1.jar diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps index 12e962c4c826..9e62dc7965f7 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps +++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps @@ -23,13 +23,13 @@ ide/db.sql.visualeditor/external/javacc-7.0.10.jar java/performance/external/javacc-7.0.10.jar # bundled maven conflicts with other libraries -java/maven.embedder/external/apache-maven-3.9.14-bin.zip ide/slf4j.api/external/slf4j-api-1.7.36.jar -java/maven.embedder/external/apache-maven-3.9.14-bin.zip platform/libs.asm/external/asm-9.9.jar -java/maven.embedder/external/apache-maven-3.9.14-bin.zip platform/o.apache.commons.codec/external/commons-codec-1.21.0.jar -java/maven.embedder/external/apache-maven-3.9.14-bin.zip ide/c.google.guava.failureaccess/external/failureaccess-1.0.3.jar -java/maven.embedder/external/apache-maven-3.9.14-bin.zip ide/c.google.guava/external/guava-33.4.6-jre.jar -java/maven.embedder/external/apache-maven-3.9.14-bin.zip ide/c.google.gson/external/gson-2.13.2.jar -java/maven.embedder/external/apache-maven-3.9.14-bin.zip java/maven.indexer/external/javax.annotation-api-1.3.2.jar +java/maven.embedder/external/apache-maven-3.9.15-bin.zip ide/slf4j.api/external/slf4j-api-1.7.36.jar +java/maven.embedder/external/apache-maven-3.9.15-bin.zip platform/libs.asm/external/asm-9.9.jar +java/maven.embedder/external/apache-maven-3.9.15-bin.zip platform/o.apache.commons.codec/external/commons-codec-1.21.0.jar +java/maven.embedder/external/apache-maven-3.9.15-bin.zip ide/c.google.guava.failureaccess/external/failureaccess-1.0.3.jar +java/maven.embedder/external/apache-maven-3.9.15-bin.zip ide/c.google.guava/external/guava-33.4.6-jre.jar +java/maven.embedder/external/apache-maven-3.9.15-bin.zip ide/c.google.gson/external/gson-2.13.2.jar +java/maven.embedder/external/apache-maven-3.9.15-bin.zip java/maven.indexer/external/javax.annotation-api-1.3.2.jar # Used to parse data during build, but need to as a lib for ide cluster nbbuild/external/json-simple-1.1.1.jar ide/libs.json_simple/external/json-simple-1.1.1.jar @@ -39,9 +39,9 @@ webcommon/javascript2.jade/external/jflex-1.4.3.jar webcommon/javascript2.lexer/ # javax.annotation-api is used by multiple modules. enterprise/javaee8.api/external/javax.annotation-api-1.3.2.jar java/maven.indexer/external/javax.annotation-api-1.3.2.jar -enterprise/javaee8.api/external/javax.annotation-api-1.3.2.jar java/maven.embedder/external/apache-maven-3.9.14-bin.zip +enterprise/javaee8.api/external/javax.annotation-api-1.3.2.jar java/maven.embedder/external/apache-maven-3.9.15-bin.zip enterprise/javaee8.api/external/javax.annotation-api-1.3.2.jar enterprise/websvc.restlib/external/javax.annotation-api-1.3.2.jar -enterprise/websvc.restlib/external/javax.annotation-api-1.3.2.jar java/maven.embedder/external/apache-maven-3.9.14-bin.zip +enterprise/websvc.restlib/external/javax.annotation-api-1.3.2.jar java/maven.embedder/external/apache-maven-3.9.15-bin.zip # jaxb-api-osgi is used by multiple modules. enterprise/javaee.api/external/jaxb-api-osgi-2.2.7.jar enterprise/javaee7.api/external/jaxb-api-osgi-2.2.7.jar @@ -56,7 +56,7 @@ enterprise/websvc.restlib/external/osgi.core-8.0.0.jar platform/libs.osgi/extern extide/gradle/external/gradle-8.11.1-bin.zip extide/o.apache.tools.ant.module/external/apache-ant-1.10.14-bin.zip extide/gradle/external/gradle-8.11.1-bin.zip ide/o.apache.commons.lang/external/commons-lang-2.6.jar extide/gradle/external/gradle-8.11.1-bin.zip ide/slf4j.api/external/slf4j-api-1.7.36.jar -extide/gradle/external/gradle-8.11.1-bin.zip java/maven.embedder/external/apache-maven-3.9.14-bin.zip +extide/gradle/external/gradle-8.11.1-bin.zip java/maven.embedder/external/apache-maven-3.9.15-bin.zip extide/gradle/external/gradle-8.11.1-bin.zip nbbuild/external/jsoup-1.15.3.jar extide/gradle/external/gradle-8.11.1-bin.zip platform/libs.junit4/external/hamcrest-core-1.3.jar extide/gradle/external/gradle-8.11.1-bin.zip platform/libs.junit4/external/junit-4.13.2.jar