This is an automated email from the ASF dual-hosted git repository. skygo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push: new bd730ef586 add maven 3.8.6 new 9783a439a4 Merge pull request #4333 from ebarboni/maven-3.8.6 bd730ef586 is described below commit bd730ef58625be99b212b983d6cf8e0a03b36996 Author: Eric Barboni <sk...@apache.org> AuthorDate: Tue Jul 5 17:55:44 2022 +0200 add maven 3.8.6 --- ...ense.txt => apache-maven-3.8.6-bin-license.txt} | 2 +- ...otice.txt => apache-maven-3.8.6-bin-notice.txt} | 0 ...ense.txt => apache-maven-3.8.6-epl-license.txt} | 4 +-- ...se.txt => apache-maven-3.8.6-slf4j-license.txt} | 4 +-- java/maven.embedder/external/binaries-list | 2 +- java/maven.embedder/external/binariesembedded-list | 34 +++++++++++----------- java/maven.embedder/nbproject/project.properties | 2 +- java/maven.embedder/nbproject/project.xml | 32 ++++++++++---------- .../org/netbeans/nbbuild/extlibs/ignored-overlaps | 14 ++++----- 9 files changed, 47 insertions(+), 47 deletions(-) diff --git a/java/maven.embedder/external/apache-maven-3.8.5-bin-license.txt b/java/maven.embedder/external/apache-maven-3.8.6-bin-license.txt similarity index 99% rename from java/maven.embedder/external/apache-maven-3.8.5-bin-license.txt rename to java/maven.embedder/external/apache-maven-3.8.6-bin-license.txt index 7600e8c857..93d1be1bf1 100644 --- a/java/maven.embedder/external/apache-maven-3.8.5-bin-license.txt +++ b/java/maven.embedder/external/apache-maven-3.8.6-bin-license.txt @@ -1,6 +1,6 @@ Name: Apache Maven Distribution Description: Apache Maven Distribution -Version: 3.8.5 +Version: 3.8.6 License: Apache-2.0 Origin: Apache Software Foundation URL: https://maven.apache.org/ diff --git a/java/maven.embedder/external/apache-maven-3.8.5-bin-notice.txt b/java/maven.embedder/external/apache-maven-3.8.6-bin-notice.txt similarity index 100% rename from java/maven.embedder/external/apache-maven-3.8.5-bin-notice.txt rename to java/maven.embedder/external/apache-maven-3.8.6-bin-notice.txt diff --git a/java/maven.embedder/external/apache-maven-3.8.5-epl-license.txt b/java/maven.embedder/external/apache-maven-3.8.6-epl-license.txt similarity index 98% rename from java/maven.embedder/external/apache-maven-3.8.5-epl-license.txt rename to java/maven.embedder/external/apache-maven-3.8.6-epl-license.txt index 6198edb661..b106b5ae2e 100644 --- a/java/maven.embedder/external/apache-maven-3.8.5-epl-license.txt +++ b/java/maven.embedder/external/apache-maven-3.8.6-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.3.5.jar org.eclipse.sisu.plexus-0.3.5.jar -Version: 3.8.5 +Version: 3.8.6 License: Maven-EPL-v10 Origin: Apache Software Foundation -Files: apache-maven-3.8.5-bin.zip!/apache-maven-3.8.5/lib/org.eclipse.sisu.inject-0.3.5.jar apache-maven-3.8.5-bin.zip!/apache-maven-3.8.5/lib/org.eclipse.sisu.plexus-0.3.5.jar +Files: apache-maven-3.8.6-bin.zip!/apache-maven-3.8.6/lib/org.eclipse.sisu.inject-0.3.5.jar apache-maven-3.8.6-bin.zip!/apache-maven-3.8.6/lib/org.eclipse.sisu.plexus-0.3.5.jar Eclipse Public License - v 1.0 diff --git a/java/maven.embedder/external/apache-maven-3.8.5-slf4j-license.txt b/java/maven.embedder/external/apache-maven-3.8.6-slf4j-license.txt similarity index 92% rename from java/maven.embedder/external/apache-maven-3.8.5-slf4j-license.txt rename to java/maven.embedder/external/apache-maven-3.8.6-slf4j-license.txt index b2be9548af..c3874aa4fd 100644 --- a/java/maven.embedder/external/apache-maven-3.8.5-slf4j-license.txt +++ b/java/maven.embedder/external/apache-maven-3.8.6-slf4j-license.txt @@ -1,9 +1,9 @@ Name: slf4j Description: Part of Apache Maven Distribution -Version: 3.8.5 +Version: 3.8.6 License: MIT-slf4j Origin: Apache Software Foundation -Files: apache-maven-3.8.5-bin.zip!/apache-maven-3.8.5/lib/slf4j-api-1.7.32.jar +Files: apache-maven-3.8.6-bin.zip!/apache-maven-3.8.6/lib/slf4j-api-1.7.36.jar Copyright (c) 2004-2017 QOS.ch All rights reserved. diff --git a/java/maven.embedder/external/binaries-list b/java/maven.embedder/external/binaries-list index b38b7d4086..12301b7080 100644 --- a/java/maven.embedder/external/binaries-list +++ b/java/maven.embedder/external/binaries-list @@ -16,4 +16,4 @@ # under the License. A2AC1CD690AB4C80DEFE7F9BCE14D35934C35CEC jdom:jdom:1.0 5D9CE6ADD7B714B8095F0E3E396C5E9F8C5DCFEF org.apache.maven.shared:maven-dependency-tree:2.2 -CDAA301B41DE0E511E06540FA1B3BA1ABA12C0EB org.apache.maven:apache-maven:3.8.5:bin@zip +3ABB90E23BE975D397BBAA43773DD0861DAE26C6 org.apache.maven:apache-maven:3.8.6:bin@zip diff --git a/java/maven.embedder/external/binariesembedded-list b/java/maven.embedder/external/binariesembedded-list index 5d905080bd..814ec3882b 100644 --- a/java/maven.embedder/external/binariesembedded-list +++ b/java/maven.embedder/external/binariesembedded-list @@ -22,28 +22,28 @@ BDAAB946CA5AD20253502D873BA0C3313D141036;com.google.guava:guava:25.1-android FA13659F9128F4C011C8E1D06F137083B4876377;com.google.inject:guice:4.2.2:no_aop 321C614F85F1DEA6BB08C1817C60D53B7F3552FD;org.fusesource.jansi:jansi:2.4.0 6975DA39A7040257BD51D21A231B76C915872D38;javax.inject:javax.inject:1 -32C060250BCC5282CDBC1FD7008C12EB4EBAD00E;org.slf4j:jcl-over-slf4j:1.7.32 +D877E195A05ACA4A2F1AD2FF14BFEC1393AF4B5E;org.slf4j:jcl-over-slf4j:1.7.36 479C1E06DB31C432330183F5CAE684163F186146;javax.annotation:javax.annotation.api:1.2 -4433F50C07DEBEFAED0553BD0068F4F48D449313;org.apache.maven:maven-artifact:3.8.5 -941DD5BBAAA1B2134510E7B3C6175911D0BBECCA;org.apache.maven:maven-builder-support:3.8.5 -EE6A51897E7D1E4A0BD03A1B67124EE210A6D100;org.apache.maven:maven-compat:3.8.5 -404E410171F1139D79425C3B1DDDBBA5B2D81A99;org.apache.maven:maven-core:3.8.5 -8B65C02E38CDC3458503D469167DC626C189791F;org.apache.maven:maven-embedder:3.8.5 -A22C2ED76CBD2F78120D9C653F89E15123D473FE;org.apache.maven:maven-model:3.8.5 -D719E354056FCF486CD2300CCE3D1A422349FD38;org.apache.maven:maven-model-builder:3.8.5 -13CDD6E6C4DF758065E1E367E9E60A3A6C622E7B;org.apache.maven:maven-plugin-api:3.8.5 -A9CF3FF3E565DEDD8231C05F4CCB6B61E6215A82;org.apache.maven:maven-repository-metadata:3.8.5 +1637B7E8FC392E389752E79B827B883629285626;org.apache.maven:maven-artifact:3.8.6 +4D22A3FAA8880EFEF2E960BB8A00C2A0B351C46A;org.apache.maven:maven-builder-support:3.8.6 +CAF3154F8E2DBBA1CAD6625919F795F19C50EA69;org.apache.maven:maven-compat:3.8.6 +F945F1F19452214D360D453D9357275313F1CFD9;org.apache.maven:maven-core:3.8.6 +9E13CAA4D04B3DE8E990E68FB955C65E9D2E0D8F;org.apache.maven:maven-embedder:3.8.6 +8AD31867C493C63AC60A3FA42356A72D20F8457B;org.apache.maven:maven-model:3.8.6 +8323A726C657BECBFFC8EA807970935DDE3E3903;org.apache.maven:maven-model-builder:3.8.6 +4138E2E9B39F364902AC263888FEB7B2407A298E;org.apache.maven:maven-plugin-api:3.8.6 +C60A7640E1B829E60F8791B5EDF3CF56A6556ACA;org.apache.maven:maven-repository-metadata:3.8.6 5EE235AA5AC5994B5DC847F8E78FFE9D77DD55D7;org.apache.maven.resolver:maven-resolver-api:1.6.3 D1C8F8E30C2AAE85330E21329D42D7E7F12A7CC3;org.apache.maven.resolver:maven-resolver-connector-basic:1.6.3 2714FFE60BD71259A41B3E4816122504B5F2DB93;org.apache.maven.resolver:maven-resolver-impl:1.6.3 -91F423A4584F2FC7F45CAC5B0B58EDC33C077249;org.apache.maven:maven-resolver-provider:3.8.5 +C6DADEDC9F6B5C1C02D0A93AFD1857460B0F501D;org.apache.maven:maven-resolver-provider:3.8.6 176425F73FE768BF9CDB8B5A742E7A00C1D8D178;org.apache.maven.resolver:maven-resolver-spi:1.6.3 7BEC7BC7F6C71A0A793EF355CC908BFAA3DD5F6D;org.apache.maven.resolver:maven-resolver-transport-wagon:1.6.3 07D5A6879037B34C61C2F527DFCFB59084E86ED0;org.apache.maven.resolver:maven-resolver-util:1.6.3 -A684F5BA0B738448CEED64894D0789442B11DF8F;org.apache.maven:maven-settings:3.8.5 -B15BFE81E7EDCB140A3D19B305A7CB4B9F32B758;org.apache.maven:maven-settings-builder:3.8.5 +9BA5114C6C61C66FBC6B93C73085DC5B15585524;org.apache.maven:maven-settings:3.8.6 +E5C92138DFFD1F9E5454CD8224CF8E18253B1803;org.apache.maven:maven-settings-builder:3.8.6 F87A61ADB1E12A00DCC6CC6005A51E693AA7C4AC;org.apache.maven.shared:maven-shared-utils:3.3.4 -3E2B8D52E22D45FC6D98E488DCE4C24DDCB37B94;org.apache.maven:maven-slf4j-provider:3.8.5 +F68CB36830CD5B163BAD35F065A77E1248332983;org.apache.maven:maven-slf4j-provider:3.8.6 D4265DD4F0F1D7A06D80DF5A5F475D5FF9C17140;org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5 D71996BB2E536F966B3B70E647067FFF3B73D32F;org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.5 425EA8E534716B4BFF1EA90F39BD76BE951D651B;org.codehaus.plexus:plexus-cipher:2.0 @@ -51,8 +51,8 @@ D71996BB2E536F966B3B70E647067FFF3B73D32F;org.eclipse.sisu:org.eclipse.sisu.plexu 2F2147A6CC6A119A1B51A96F31D45C557F6244B9;org.codehaus.plexus:plexus-component-annotations:2.1.0 25B919C664B79795CCDE0EDE5CEE0FD68B544197;org.codehaus.plexus:plexus-interpolation:1.26 F89C5080614FFD0764E49861895DBEDDE1B47237;org.codehaus.plexus:plexus-sec-dispatcher:2.0 -CF43B5391DE623B36FE066A21127BAEF82C64022;org.codehaus.plexus:plexus-utils:3.3.0 -CDCFF33940D9F2DE763BC41EA05A0BE5941176C3;org.slf4j:slf4j-api:1.7.32 +9B41B2B76B1BFE3774411FE22F5868058A9FC822;org.codehaus.plexus:plexus-utils:3.3.1 +6C62681A2F655B49963A5983B8B0950A6120AE14;org.slf4j:slf4j-api:1.7.36 292E503E558E6758FC3A6D26A80B46017D4FEDEA;org.apache.maven.wagon:wagon-file:3.5.1 -06F1CF071AFB2D3B1190D7EF047E24F7C3EDFF11;org.apache.maven.wagon:wagon-http:3.5.1:shaded +C7504D054C4D909D0C1C8CE8883B70DD337971FE;org.apache.maven.wagon:wagon-http:3.5.1:shaded 118E63F22D05B14535451933AE207BE47EC45D91;org.apache.maven.wagon:wagon-provider-api:3.5.1 diff --git a/java/maven.embedder/nbproject/project.properties b/java/maven.embedder/nbproject/project.properties index 79118818de..a37a104979 100644 --- a/java/maven.embedder/nbproject/project.properties +++ b/java/maven.embedder/nbproject/project.properties @@ -20,7 +20,7 @@ javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial release.external/jdom-1.0.jar=modules/ext/maven/jdom-1.0.jar release.external/maven-dependency-tree-2.2.jar=modules/ext/maven/maven-dependency-tree-2.2.jar -bundled.maven=apache-maven-3.8.5 +bundled.maven=apache-maven-3.8.6 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 cb0f0d67c1..66fedf6f0d 100644 --- a/java/maven.embedder/nbproject/project.xml +++ b/java/maven.embedder/nbproject/project.xml @@ -313,34 +313,34 @@ <runtime-relative-path>../maven/lib/javax.inject-1.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/jcl-over-slf4j-1.7.32.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/jcl-over-slf4j-1.7.36.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-artifact-3.8.5.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-artifact-3.8.6.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-builder-support-3.8.5.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-builder-support-3.8.6.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-compat-3.8.5.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-compat-3.8.6.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-core-3.8.5.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-core-3.8.6.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-embedder-3.8.5.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-embedder-3.8.6.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-model-3.8.5.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-model-3.8.6.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-model-builder-3.8.5.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-model-builder-3.8.6.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-plugin-api-3.8.5.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-plugin-api-3.8.6.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-repository-metadata-3.8.5.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-repository-metadata-3.8.6.jar</runtime-relative-path> </class-path-extension> <class-path-extension> <runtime-relative-path>../maven/lib/maven-resolver-api-1.6.3.jar</runtime-relative-path> @@ -352,7 +352,7 @@ <runtime-relative-path>../maven/lib/maven-resolver-impl-1.6.3.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-resolver-provider-3.8.5.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-resolver-provider-3.8.6.jar</runtime-relative-path> </class-path-extension> <class-path-extension> <runtime-relative-path>../maven/lib/maven-resolver-spi-1.6.3.jar</runtime-relative-path> @@ -364,16 +364,16 @@ <runtime-relative-path>../maven/lib/maven-resolver-util-1.6.3.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-settings-3.8.5.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-settings-3.8.6.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-settings-builder-3.8.5.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-settings-builder-3.8.6.jar</runtime-relative-path> </class-path-extension> <class-path-extension> <runtime-relative-path>../maven/lib/maven-shared-utils-3.3.4.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-slf4j-provider-3.8.5.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-slf4j-provider-3.8.6.jar</runtime-relative-path> </class-path-extension> <class-path-extension> <runtime-relative-path>../maven/lib/org.eclipse.sisu.inject-0.3.5.jar</runtime-relative-path> @@ -394,10 +394,10 @@ <runtime-relative-path>../maven/lib/plexus-sec-dispatcher-2.0.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/plexus-utils-3.3.0.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/plexus-utils-3.3.1.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/slf4j-api-1.7.32.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/slf4j-api-1.7.36.jar</runtime-relative-path> </class-path-extension> <class-path-extension> <runtime-relative-path>../maven/lib/wagon-file-3.5.1.jar</runtime-relative-path> diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps index 637aaea636..4b2031e724 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps +++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps @@ -29,8 +29,8 @@ ide/db.sql.visualeditor/external/javacc-7.0.10.jar java/performance/external/jav # It happens that maven 3.3.9 uses commons-lang-2.6.jar, same as o.apache.commons.lang # and commons-io-2.5.jar, same as java.lsp.server # These are used independently, different functional goals -# maven 3.8.5 use common-io-2.6 java/java.lsp.server/external/commons-io-2.5.jar java/maven.embedder/external/apache-maven-3.6.3-bin.zip -platform/o.apache.commons.io/external/commons-io-2.6.jar java/maven.embedder/external/apache-maven-3.8.5-bin.zip +# maven 3.8.6 use common-io-2.6 java/java.lsp.server/external/commons-io-2.5.jar java/maven.embedder/external/apache-maven-3.6.3-bin.zip +platform/o.apache.commons.io/external/commons-io-2.6.jar java/maven.embedder/external/apache-maven-3.8.6-bin.zip # Contains test data (badPackageFileInJar.jar is packaged twice) - this is an # upstream problem @@ -46,9 +46,9 @@ webcommon/javascript2.jade/external/jflex-1.4.3.jar webcommon/javascript2.lexer/ enterprise/javaee.api/external/javax.annotation-api-1.2.jar java/maven.indexer/external/javax.annotation-api-1.2.jar enterprise/javaee7.api/external/javax.annotation-api-1.2.jar enterprise/javaee8.api/external/javax.annotation-api-1.2.jar enterprise/javaee8.api/external/javax.annotation-api-1.2.jar java/maven.indexer/external/javax.annotation-api-1.2.jar -enterprise/javaee8.api/external/javax.annotation-api-1.2.jar java/maven.embedder/external/apache-maven-3.8.5-bin.zip -enterprise/javaee7.api/external/javax.annotation-api-1.2.jar java/maven.embedder/external/apache-maven-3.8.5-bin.zip -java/maven.indexer/external/javax.annotation-api-1.2.jar java/maven.embedder/external/apache-maven-3.8.5-bin.zip +enterprise/javaee8.api/external/javax.annotation-api-1.2.jar java/maven.embedder/external/apache-maven-3.8.6-bin.zip +enterprise/javaee7.api/external/javax.annotation-api-1.2.jar java/maven.embedder/external/apache-maven-3.8.6-bin.zip +java/maven.indexer/external/javax.annotation-api-1.2.jar java/maven.embedder/external/apache-maven-3.8.6-bin.zip # jaxb-api-osgi is used by multiple modules. @@ -74,7 +74,7 @@ extide/gradle/external/gradle-7.4-bin.zip ide/libs.antlr4.runtime/external/antlr extide/gradle/external/gradle-7.4-bin.zip ide/libs.commons_compress/external/commons-compress-1.21.jar extide/gradle/external/gradle-7.4-bin.zip ide/o.apache.commons.lang/external/commons-lang-2.6.jar extide/gradle/external/gradle-7.4-bin.zip ide/o.eclipse.jgit/external/org.eclipse.jgit-5.7.0.202003110725-r.jar -extide/gradle/external/gradle-7.4-bin.zip java/maven.embedder/external/apache-maven-3.8.5-bin.zip +extide/gradle/external/gradle-7.4-bin.zip java/maven.embedder/external/apache-maven-3.8.6-bin.zip extide/gradle/external/gradle-7.4-bin.zip platform/libs.junit4/external/hamcrest-core-1.3.jar extide/gradle/external/gradle-7.4-bin.zip platform/libs.junit4/external/junit-4.13.2.jar extide/gradle/external/gradle-7.4-bin.zip platform/libs.testng/external/jcommander-1.78.jar @@ -121,4 +121,4 @@ java/libs.javacapi/external/nb-javac-jdk-18.0.1+10-api.jar java/libs.nbjavacapi/ java/libs.javacapi/external/nb-javac-jdk-18.0.1+10.jar java/libs.nbjavacapi/external/nb-javac-jdk-18.0.1+10.jar # Maven and Gradle are self-contained distributions - ignoring overlaps -platform/o.apache.commons.lang3/external/commons-lang3-3.8.1.jar java/maven.embedder/external/apache-maven-3.8.5-bin.zip +platform/o.apache.commons.lang3/external/commons-lang3-3.8.1.jar java/maven.embedder/external/apache-maven-3.8.6-bin.zip --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists