diff --git a/java/maven.embedder/external/apache-maven-3.9.12-bin-license.txt b/java/maven.embedder/external/apache-maven-3.9.14-bin-license.txt similarity index 99% rename from java/maven.embedder/external/apache-maven-3.9.12-bin-license.txt rename to java/maven.embedder/external/apache-maven-3.9.14-bin-license.txt index c6cd21b1db77..14811a288162 100644 --- a/java/maven.embedder/external/apache-maven-3.9.12-bin-license.txt +++ b/java/maven.embedder/external/apache-maven-3.9.14-bin-license.txt @@ -1,6 +1,6 @@ Name: Apache Maven Distribution Description: Apache Maven Distribution -Version: 3.9.12 +Version: 3.9.14 License: Apache-2.0 Origin: Apache Software Foundation URL: https://maven.apache.org/ diff --git a/java/maven.embedder/external/apache-maven-3.9.12-bin-notice.txt b/java/maven.embedder/external/apache-maven-3.9.14-bin-notice.txt similarity index 98% rename from java/maven.embedder/external/apache-maven-3.9.12-bin-notice.txt rename to java/maven.embedder/external/apache-maven-3.9.14-bin-notice.txt index 0b079aa60d3c..006d6f1ab5e3 100644 --- a/java/maven.embedder/external/apache-maven-3.9.12-bin-notice.txt +++ b/java/maven.embedder/external/apache-maven-3.9.14-bin-notice.txt @@ -24,7 +24,7 @@ javolution (http://javolution.org/). This product includes software developed by Rome (https://rome.dev.java.net/). -about.html in archive lib/org.eclipse.sisu.inject-0.9.0.M4.jar +about.html in archive lib/org.eclipse.sisu.inject-1.0.0.jar diff --git a/java/maven.embedder/external/apache-maven-3.9.12-epl-license.txt b/java/maven.embedder/external/apache-maven-3.9.14-epl-license.txt similarity index 97% rename from java/maven.embedder/external/apache-maven-3.9.12-epl-license.txt rename to java/maven.embedder/external/apache-maven-3.9.14-epl-license.txt index ce3e922e2770..5efebba134a8 100644 --- a/java/maven.embedder/external/apache-maven-3.9.12-epl-license.txt +++ b/java/maven.embedder/external/apache-maven-3.9.14-epl-license.txt @@ -1,9 +1,9 @@ Name: Apache Maven components under EPL v1.0 -Description: These Apache Maven components are under EPL v1.0: org.eclipse.sisu.inject-0.9.0.M4.jar org.eclipse.sisu.plexus-0.9.0.M4.jar -Version: 3.9.12 +Description: These Apache Maven components are under EPL v1.0: org.eclipse.sisu.inject-1.0.0.jar org.eclipse.sisu.plexus-1.0.0.jar +Version: 3.9.14 License: Maven-EPL-v10 Origin: Apache Software Foundation -Files: apache-maven-3.9.12-bin.zip!/apache-maven-3.9.12/lib/org.eclipse.sisu.inject-0.9.0.M4.jar apache-maven-3.9.12-bin.zip!/apache-maven-3.9.12/lib/org.eclipse.sisu.plexus-0.9.0.M4.jar +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 Eclipse Public License - v 1.0 diff --git a/java/maven.embedder/external/apache-maven-3.9.12-failureaccess-1.0.3-license.txt b/java/maven.embedder/external/apache-maven-3.9.14-failureaccess-1.0.3-license.txt similarity index 99% rename from java/maven.embedder/external/apache-maven-3.9.12-failureaccess-1.0.3-license.txt rename to java/maven.embedder/external/apache-maven-3.9.14-failureaccess-1.0.3-license.txt index 3c8273ebffcc..472682ecc720 100644 --- a/java/maven.embedder/external/apache-maven-3.9.12-failureaccess-1.0.3-license.txt +++ b/java/maven.embedder/external/apache-maven-3.9.14-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.12-bin.zip!/apache-maven-3.9.12/lib/failureaccess-1.0.3.jar +Files: apache-maven-3.9.14-bin.zip!/apache-maven-3.9.14/lib/failureaccess-1.0.3.jar Apache License Version 2.0, January 2004 diff --git a/java/maven.embedder/external/apache-maven-3.9.12-guava-33.5.0-jre-license.txt b/java/maven.embedder/external/apache-maven-3.9.14-guava-33.5.0-jre-license.txt similarity index 99% rename from java/maven.embedder/external/apache-maven-3.9.12-guava-33.5.0-jre-license.txt rename to java/maven.embedder/external/apache-maven-3.9.14-guava-33.5.0-jre-license.txt index 824854af9867..157fb6a7e1e9 100644 --- a/java/maven.embedder/external/apache-maven-3.9.12-guava-33.5.0-jre-license.txt +++ b/java/maven.embedder/external/apache-maven-3.9.14-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.12-bin.zip!/apache-maven-3.9.12/lib/guava-33.5.0-jre.jar +Files: apache-maven-3.9.14-bin.zip!/apache-maven-3.9.14/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.12-javax.annotation-api-1.3.2-license.txt b/java/maven.embedder/external/apache-maven-3.9.14-javax.annotation-api-1.3.2-license.txt similarity index 99% rename from java/maven.embedder/external/apache-maven-3.9.12-javax.annotation-api-1.3.2-license.txt rename to java/maven.embedder/external/apache-maven-3.9.14-javax.annotation-api-1.3.2-license.txt index cba2641060a3..29139439122f 100644 --- a/java/maven.embedder/external/apache-maven-3.9.12-javax.annotation-api-1.3.2-license.txt +++ b/java/maven.embedder/external/apache-maven-3.9.14-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.12-bin.zip!/apache-maven-3.9.12/lib/javax.annotation-api-1.3.2.jar +Files: apache-maven-3.9.14-bin.zip!/apache-maven-3.9.14/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.12-slf4j-1.7.36-license.txt b/java/maven.embedder/external/apache-maven-3.9.14-slf4j-1.7.36-license.txt similarity index 95% rename from java/maven.embedder/external/apache-maven-3.9.12-slf4j-1.7.36-license.txt rename to java/maven.embedder/external/apache-maven-3.9.14-slf4j-1.7.36-license.txt index 6f774902e10c..9d9b119a9da0 100644 --- a/java/maven.embedder/external/apache-maven-3.9.12-slf4j-1.7.36-license.txt +++ b/java/maven.embedder/external/apache-maven-3.9.14-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.12-bin.zip!/apache-maven-3.9.12/lib/slf4j-api-1.7.36.jar +Files: apache-maven-3.9.14-bin.zip!/apache-maven-3.9.14/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 f332f9d4aee9..1d22fc211d7d 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 -F0EE4660E55FDD9BC7F181843E41301D9292312A org.apache.maven:apache-maven:3.9.12:bin@zip +487713BBA197D8E735ACF13712604C33C408F4A7 https://release-test.apache.org/download/path/maven/3.9.14/binaries/apache-maven-3.9.14-bin.zip apache-maven-3.9.14-bin.zip diff --git a/java/maven.embedder/external/binariesembedded-list b/java/maven.embedder/external/binariesembedded-list index e59d2e2c1e49..ab2c31c071ef 100644 --- a/java/maven.embedder/external/binariesembedded-list +++ b/java/maven.embedder/external/binariesembedded-list @@ -15,13 +15,13 @@ # specific language governing permissions and limitations # under the License. -C29635C8A7AFA03D74B33C1884DF8ABB2B3F3DCC;org.ow2.asm:asm:9.9 +2CEEA6AB43BCAE1979B2A6D85FC0CA429877E5AB;org.ow2.asm:asm:9.9.1 0235BA8B489512805AC13A8F9EA77A1CA5EBE3E8;aopalliance:aopalliance:1.0 1194890E6F56EC29177673F2F12D0B8E627DEC98;org.apache.httpcomponents:httpclient:4.5.14 51CF043C87253C9F58B539C9F7E44C8894223850;org.apache.httpcomponents:httpcore:4.4.16 AEAFFD00D57023A2C947393ED251F0354F0985FC;com.google.guava:failureaccess:1.0.3 A461452D3E31BEBF2706323F8738EC44B19C96E1;commons-cli:commons-cli:1.11.0 -6A671D1C456A875FF61ABEC63216F754078BB0ED;commons-codec:commons-codec:1.20.0 +D95F998DB5F89900FE895DAF6CD2CDDCB2F1D64B;commons-codec:commons-codec:1.21.0 48B8230771E573B54CE6E867A9001E75977FE78E;com.google.code.gson:gson:2.13.2 4381275EFDEF6DDFAE38F002C31E84CD001C97F0;com.google.errorprone:error_prone_annotations:2.41.0 8699DE25F2F979108D6C1B804A7BA38CDA1116BC;com.google.guava:guava:33.5.0-jre @@ -31,31 +31,31 @@ BA7387C31622C6650B83EDBA1BBB115F1FE462BA;org.fusesource.jansi:jansi:2.4.2 6975DA39A7040257BD51D21A231B76C915872D38;javax.inject:javax.inject:1 D877E195A05ACA4A2F1AD2FF14BFEC1393AF4B5E;org.slf4j:jcl-over-slf4j:1.7.36 934C04D3CFEF185A8008E7BF34331B79730A9D43;javax.annotation:javax.annotation-api:1.3.2 -39ACDD4AD6B74B1C001AE7C0858482A11D0EAD59;org.apache.maven:maven-artifact:3.9.12 -FE2FE54522EB2F77BD9B30CEFC959D728D3F8105;org.apache.maven:maven-builder-support:3.9.12 -816D73144A402059010EF0735B4BF9F961C5A0F4;org.apache.maven:maven-compat:3.9.12 -A349A9DADEBCA9F2A2D1F99876F651A02961A366;org.apache.maven:maven-core:3.9.12 -DEA388FD5B198516175443C098EA1E8D6C2D8BB5;org.apache.maven:maven-embedder:3.9.12 -6F91CB0E47B7FC6DB492ED307B0C91B38BFCE924;org.apache.maven:maven-model:3.9.12 -C1A74479D447E70D98ED5F03F6B32D54818CA046;org.apache.maven:maven-model-builder:3.9.12 -2C2D5180B3DAE0E6F91575FC2507429727E01CC9;org.apache.maven:maven-plugin-api:3.9.12 -3ECFC216F9A56F15C6BD6B3E22567B0B6CB2183E;org.apache.maven:maven-repository-metadata:3.9.12 -8B670256B812A45B1CA9AE1BBF7F1C0D00A9D4E4;org.apache.maven.resolver:maven-resolver-api:1.9.25 -6DCD7E2076BAECBCFA77E781112BD110EA379D07;org.apache.maven.resolver:maven-resolver-connector-basic:1.9.25 -CC1BDE9B56A2E95A181207958DCF40715DC71AB3;org.apache.maven.resolver:maven-resolver-impl:1.9.25 -FB1C8C95F17C816C3CEB8692AA84CBB068DF5D94;org.apache.maven.resolver:maven-resolver-named-locks:1.9.25 -44963F45B78F89A8479705493C48E01FC54FF9D6;org.apache.maven:maven-resolver-provider:3.9.12 -F81237D0140F9222CF4437C44756A53368A2D152;org.apache.maven.resolver:maven-resolver-spi:1.9.25 -E51BC8226E19631B5191CB106B5F1CCE60F86DC7;org.apache.maven.resolver:maven-resolver-transport-http:1.9.25 -9B5AF36B4BAFBEC8F71430B6BB3A4802A9EBBF65;org.apache.maven.resolver:maven-resolver-transport-wagon:1.9.25 -D7E46F0D9422856532555AC98737C513BAF86EFD;org.apache.maven.resolver:maven-resolver-transport-file:1.9.25 -F755F6816D8FD63B09B8F2C9E1EAAA1F60C179E8;org.apache.maven.resolver:maven-resolver-util:1.9.25 -CA072F2B90A59D36D8218DD4E1460722DB6E2322;org.apache.maven:maven-settings:3.9.12 -1DDD0B8DA05D120768142176476A06F489CEA11C;org.apache.maven:maven-settings-builder:3.9.12 +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 +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 +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 BFA28296272A5915B08DE9F11F34A94B0A818FD0;org.apache.maven.shared:maven-shared-utils:3.4.2 -ED78BE9181CEA023BF4210D4D01810DE9961BE41;org.apache.maven:maven-slf4j-provider:3.9.12 -A062D8E12DC62E698C9F943A3FCE94E366B4E220;org.eclipse.sisu:org.eclipse.sisu.inject:0.9.0.M4 -478F7935E88CD9DA7EF01F509E4853E80EDE9034;org.eclipse.sisu:org.eclipse.sisu.plexus:0.9.0.M4 +E612704EEC107AACE14B3FFD155E2CBFC3C42B60;org.apache.maven:maven-slf4j-provider:3.9.14 +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 ACE0820F34DE49F69511F5263BCEBB09FAC9731A;org.codehaus.plexus:plexus-classworlds:2.9.0 A506F84636EA7AE370D04167DD155C103E616F68;org.codehaus.plexus:plexus-component-annotations:2.2.0 diff --git a/java/maven.embedder/nbproject/project.properties b/java/maven.embedder/nbproject/project.properties index 3657d8a14526..e9ef864fccad 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.12 +bundled.maven=apache-maven-3.9.14 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 fc2c24f1cfe0..ec4ce04ec9c9 100644 --- a/java/maven.embedder/nbproject/project.xml +++ b/java/maven.embedder/nbproject/project.xml @@ -327,13 +327,13 @@ ../maven/lib/aopalliance-1.0.jar - ../maven/lib/asm-9.9.jar + ../maven/lib/asm-9.9.1.jar ../maven/lib/commons-cli-1.11.0.jar - ../maven/lib/commons-codec-1.20.0.jar + ../maven/lib/commons-codec-1.21.0.jar ../maven/lib/error_prone_annotations-2.41.0.jar @@ -377,79 +377,79 @@ ../maven/lib/jspecify-1.0.0.jar - ../maven/lib/maven-artifact-3.9.12.jar + ../maven/lib/maven-artifact-3.9.14.jar - ../maven/lib/maven-builder-support-3.9.12.jar + ../maven/lib/maven-builder-support-3.9.14.jar - ../maven/lib/maven-compat-3.9.12.jar + ../maven/lib/maven-compat-3.9.14.jar - ../maven/lib/maven-core-3.9.12.jar + ../maven/lib/maven-core-3.9.14.jar - ../maven/lib/maven-embedder-3.9.12.jar + ../maven/lib/maven-embedder-3.9.14.jar - ../maven/lib/maven-model-3.9.12.jar + ../maven/lib/maven-model-3.9.14.jar - ../maven/lib/maven-model-builder-3.9.12.jar + ../maven/lib/maven-model-builder-3.9.14.jar - ../maven/lib/maven-plugin-api-3.9.12.jar + ../maven/lib/maven-plugin-api-3.9.14.jar - ../maven/lib/maven-repository-metadata-3.9.12.jar + ../maven/lib/maven-repository-metadata-3.9.14.jar - ../maven/lib/maven-resolver-api-1.9.25.jar + ../maven/lib/maven-resolver-api-1.9.27.jar - ../maven/lib/maven-resolver-connector-basic-1.9.25.jar + ../maven/lib/maven-resolver-connector-basic-1.9.27.jar - ../maven/lib/maven-resolver-impl-1.9.25.jar + ../maven/lib/maven-resolver-impl-1.9.27.jar - ../maven/lib/maven-resolver-named-locks-1.9.25.jar + ../maven/lib/maven-resolver-named-locks-1.9.27.jar - ../maven/lib/maven-resolver-provider-3.9.12.jar + ../maven/lib/maven-resolver-provider-3.9.14.jar - ../maven/lib/maven-resolver-spi-1.9.25.jar + ../maven/lib/maven-resolver-spi-1.9.27.jar - ../maven/lib/maven-resolver-transport-file-1.9.25.jar + ../maven/lib/maven-resolver-transport-file-1.9.27.jar - ../maven/lib/maven-resolver-transport-http-1.9.25.jar + ../maven/lib/maven-resolver-transport-http-1.9.27.jar - ../maven/lib/maven-resolver-transport-wagon-1.9.25.jar + ../maven/lib/maven-resolver-transport-wagon-1.9.27.jar - ../maven/lib/maven-resolver-util-1.9.25.jar + ../maven/lib/maven-resolver-util-1.9.27.jar - ../maven/lib/maven-settings-3.9.12.jar + ../maven/lib/maven-settings-3.9.14.jar - ../maven/lib/maven-settings-builder-3.9.12.jar + ../maven/lib/maven-settings-builder-3.9.14.jar ../maven/lib/maven-shared-utils-3.4.2.jar - ../maven/lib/maven-slf4j-provider-3.9.12.jar + ../maven/lib/maven-slf4j-provider-3.9.14.jar - ../maven/lib/org.eclipse.sisu.inject-0.9.0.M4.jar + ../maven/lib/org.eclipse.sisu.inject-1.0.0.jar - ../maven/lib/org.eclipse.sisu.plexus-0.9.0.M4.jar + ../maven/lib/org.eclipse.sisu.plexus-1.0.0.jar ../maven/lib/plexus-cipher-2.0.jar diff --git a/java/maven.embedder/test/unit/src/org/netbeans/modules/maven/embedder/impl/NbRepositoryCacheTest.java b/java/maven.embedder/test/unit/src/org/netbeans/modules/maven/embedder/impl/NbRepositoryCacheTest.java index a887ba62d0bb..05e9ceac05a9 100644 --- a/java/maven.embedder/test/unit/src/org/netbeans/modules/maven/embedder/impl/NbRepositoryCacheTest.java +++ b/java/maven.embedder/test/unit/src/org/netbeans/modules/maven/embedder/impl/NbRepositoryCacheTest.java @@ -36,7 +36,7 @@ public NbRepositoryCacheTest() { @Test @Ignore("Classpath is not setup correctly for test - needs investigation") public void testConstants() throws Exception { - Class cl = Class.forName("org.eclipse.aether.internal.impl.DataPool"); + Class cl = Class.forName("org.eclipse.aether.internal.impl.DataPool"); assertNotNull("The constant value has changed most likely", cl); } diff --git a/java/maven/nbproject/project.properties b/java/maven/nbproject/project.properties index 02d06cb05fad..85412150adb1 100644 --- a/java/maven/nbproject/project.properties +++ b/java/maven/nbproject/project.properties @@ -39,6 +39,8 @@ requires.nb.javac=true test-unit-sys-prop.test.netbeans.dest.dir=${netbeans.dest.dir} +# TODO update when embedded maven updates + # Classpath for agent injected into maven run (sourcecode in mavensrc) mavensrc.cp=:\ ./external/aether-api-1.13.1.jar:\ @@ -46,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.12.jar:\ - ${maven.embedder.dir}/maven/lib/maven-model-3.9.12.jar:\ - ${maven.embedder.dir}/maven/lib/maven-plugin-api-3.9.12.jar:\ - ${maven.embedder.dir}/maven/lib/maven-resolver-api-1.9.25.jar:\ - ${maven.embedder.dir}/maven/lib/org.eclipse.sisu.plexus-0.9.0.M4.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-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 diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps index 4680706f7904..9e46ce973be4 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.12-bin.zip ide/slf4j.api/external/slf4j-api-1.7.36.jar -java/maven.embedder/external/apache-maven-3.9.12-bin.zip platform/libs.asm/external/asm-9.9.jar -java/maven.embedder/external/apache-maven-3.9.12-bin.zip platform/o.apache.commons.codec/external/commons-codec-1.18.0.jar -java/maven.embedder/external/apache-maven-3.9.12-bin.zip ide/c.google.guava.failureaccess/external/failureaccess-1.0.3.jar -java/maven.embedder/external/apache-maven-3.9.12-bin.zip ide/c.google.guava/external/guava-33.4.6-jre.jar -java/maven.embedder/external/apache-maven-3.9.12-bin.zip ide/c.google.gson/external/gson-2.13.2.jar -java/maven.embedder/external/apache-maven-3.9.12-bin.zip java/maven.indexer/external/javax.annotation-api-1.3.2.jar +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.18.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 # 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.12-bin.zip +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 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.12-bin.zip +enterprise/websvc.restlib/external/javax.annotation-api-1.3.2.jar java/maven.embedder/external/apache-maven-3.9.14-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.12-bin.zip +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 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