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
The following commit(s) were added to refs/heads/master by this push: new cddb4280f4 upgrade bundled maven to 3.9.3. new 089991cb1d Merge pull request #6117 from mbien/maven-393 cddb4280f4 is described below commit cddb4280f495f612f763ed1acaee3a56f62c8857 Author: Michael Bien <mbie...@gmail.com> AuthorDate: Fri Jun 23 16:26:16 2023 +0200 upgrade bundled maven to 3.9.3. --- ...ense.txt => apache-maven-3.9.3-bin-license.txt} | 2 +- ...otice.txt => apache-maven-3.9.3-bin-notice.txt} | 0 ...ense.txt => apache-maven-3.9.3-epl-license.txt} | 4 +- ...se.txt => apache-maven-3.9.3-slf4j-license.txt} | 4 +- java/maven.embedder/external/binaries-list | 2 +- java/maven.embedder/external/binariesembedded-list | 44 +++++++++++----------- java/maven.embedder/nbproject/project.properties | 2 +- java/maven.embedder/nbproject/project.xml | 44 +++++++++++----------- .../org/netbeans/nbbuild/extlibs/ignored-overlaps | 10 ++--- 9 files changed, 56 insertions(+), 56 deletions(-) diff --git a/java/maven.embedder/external/apache-maven-3.9.2-bin-license.txt b/java/maven.embedder/external/apache-maven-3.9.3-bin-license.txt similarity index 99% rename from java/maven.embedder/external/apache-maven-3.9.2-bin-license.txt rename to java/maven.embedder/external/apache-maven-3.9.3-bin-license.txt index 9161bcbb57..6c30dbd641 100644 --- a/java/maven.embedder/external/apache-maven-3.9.2-bin-license.txt +++ b/java/maven.embedder/external/apache-maven-3.9.3-bin-license.txt @@ -1,6 +1,6 @@ Name: Apache Maven Distribution Description: Apache Maven Distribution -Version: 3.9.2 +Version: 3.9.3 License: Apache-2.0 Origin: Apache Software Foundation URL: https://maven.apache.org/ diff --git a/java/maven.embedder/external/apache-maven-3.9.2-bin-notice.txt b/java/maven.embedder/external/apache-maven-3.9.3-bin-notice.txt similarity index 100% rename from java/maven.embedder/external/apache-maven-3.9.2-bin-notice.txt rename to java/maven.embedder/external/apache-maven-3.9.3-bin-notice.txt diff --git a/java/maven.embedder/external/apache-maven-3.9.2-epl-license.txt b/java/maven.embedder/external/apache-maven-3.9.3-epl-license.txt similarity index 98% rename from java/maven.embedder/external/apache-maven-3.9.2-epl-license.txt rename to java/maven.embedder/external/apache-maven-3.9.3-epl-license.txt index 6c8fc00999..5862ceb1b6 100644 --- a/java/maven.embedder/external/apache-maven-3.9.2-epl-license.txt +++ b/java/maven.embedder/external/apache-maven-3.9.3-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.9.2 +Version: 3.9.3 License: Maven-EPL-v10 Origin: Apache Software Foundation -Files: apache-maven-3.9.2-bin.zip!/apache-maven-3.9.2/lib/org.eclipse.sisu.inject-0.3.5.jar apache-maven-3.9.2-bin.zip!/apache-maven-3.9.2/lib/org.eclipse.sisu.plexus-0.3.5.jar +Files: apache-maven-3.9.3-bin.zip!/apache-maven-3.9.3/lib/org.eclipse.sisu.inject-0.3.5.jar apache-maven-3.9.3-bin.zip!/apache-maven-3.9.3/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.9.2-slf4j-license.txt b/java/maven.embedder/external/apache-maven-3.9.3-slf4j-license.txt similarity index 94% rename from java/maven.embedder/external/apache-maven-3.9.2-slf4j-license.txt rename to java/maven.embedder/external/apache-maven-3.9.3-slf4j-license.txt index 286c377f76..8d5d6c0388 100644 --- a/java/maven.embedder/external/apache-maven-3.9.2-slf4j-license.txt +++ b/java/maven.embedder/external/apache-maven-3.9.3-slf4j-license.txt @@ -1,9 +1,9 @@ Name: slf4j Description: Part of Apache Maven Distribution -Version: 3.9.2 +Version: 3.9.3 License: MIT-slf4j Origin: Apache Software Foundation -Files: apache-maven-3.9.2-bin.zip!/apache-maven-3.9.2/lib/slf4j-api-1.7.36.jar +Files: apache-maven-3.9.3-bin.zip!/apache-maven-3.9.3/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 ff344e3a27..8e65f59aba 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 -E0FFA838CBB9BDF7DC89CF987A30EE1CAF4B3FB6 org.apache.maven:apache-maven:3.9.2:bin@zip +0A5439DE8AAF8B24161EC77A7C0C2C37340FC6FB org.apache.maven:apache-maven:3.9.3:bin@zip diff --git a/java/maven.embedder/external/binariesembedded-list b/java/maven.embedder/external/binariesembedded-list index 6546f860a9..19af8f0efa 100644 --- a/java/maven.embedder/external/binariesembedded-list +++ b/java/maven.embedder/external/binariesembedded-list @@ -28,29 +28,29 @@ DA25056C694C54BA16E78E4FC35F17FC60F0D1B4;com.google.inject:guice:5.1.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 -46DC61A88743A4B674B20F7F5A5495EE9B48B087;org.apache.maven:maven-artifact:3.9.2 -7D6A3B947F22FB48F07E26ECF6BD17A7A37E3D09;org.apache.maven:maven-builder-support:3.9.2 -3CFF405700C2C9EAAE0ECC7C8E266E23C5866C21;org.apache.maven:maven-compat:3.9.2 -99D78FC569A74CD827B6944022DA2F19C49E7033;org.apache.maven:maven-core:3.9.2 -5C82E29DB722C5F5B14346E69CDD3269DF9691CA;org.apache.maven:maven-embedder:3.9.2 -24ADDA115170FA12710F7A269F85FB93E2BAB024;org.apache.maven:maven-model:3.9.2 -2CB41AE8B5EB2493143695EC3E97801860660BFD;org.apache.maven:maven-model-builder:3.9.2 -C7B62F1C819330288AF8BC8B2ED363D30423E8BE;org.apache.maven:maven-plugin-api:3.9.2 -41920D69D891A0C26FDEEAB910BA04F6E96C8631;org.apache.maven:maven-repository-metadata:3.9.2 -70920A458A3B765B8239726D75A1CEA5E21386A6;org.apache.maven.resolver:maven-resolver-api:1.9.10 -6ADCA3A1AE84F7AA596E867ACE5E372A85CE07CE;org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10 -FF625F066D47769D9F9987243AA487CF48474721;org.apache.maven.resolver:maven-resolver-impl:1.9.10 -56DC105D305725EBFCB496AF92EC50804119E75B;org.apache.maven.resolver:maven-resolver-named-locks:1.9.10 -BA07D5C4593C362735E7D9840B2103CD104D97DA;org.apache.maven:maven-resolver-provider:3.9.2 -BFB8483F801DA24BDC61A31E63D86617BE897644;org.apache.maven.resolver:maven-resolver-spi:1.9.10 -208BF0A27382872E1E629FB1FCAE8B05FF665DDA;org.apache.maven.resolver:maven-resolver-transport-http:1.9.10 -40FF19E21D107D0BA73BC5922CAE07A92FB0F627;org.apache.maven.resolver:maven-resolver-transport-wagon:1.9.10 -A3D11A3A5E885B3F95F899EA77ED1176AF3C483C;org.apache.maven.resolver:maven-resolver-transport-file:1.9.10 -7AA9A7D80728453903601700F60273238073BD84;org.apache.maven.resolver:maven-resolver-util:1.9.10 -1B71B5935C433F61A3482E134682161A544183A6;org.apache.maven:maven-settings:3.9.2 -1C61CB0CF780ACA25E100226C0E76F3D9F4629E0;org.apache.maven:maven-settings-builder:3.9.2 +BDACC5D67014383C80F5561B3996454F5F36D134;org.apache.maven:maven-artifact:3.9.3 +AA3658CFA6AD9923F3A9FA99D8399052FD999567;org.apache.maven:maven-builder-support:3.9.3 +C04D7E7E6926F360B6884501ABCE1A399A5E287A;org.apache.maven:maven-compat:3.9.3 +D625BC169992F4EB807D7E6C03CDBA0FEB8841ED;org.apache.maven:maven-core:3.9.3 +F35B271023E13EE263BBDF8755F4ED57313D5E5F;org.apache.maven:maven-embedder:3.9.3 +1B15EF66255145168949C1BDC20F70B9FFF531AA;org.apache.maven:maven-model:3.9.3 +2EDA197CA81B2F189392F4041DC65ABB46FF070F;org.apache.maven:maven-model-builder:3.9.3 +47C81AD57EFFDE270A18E44EAB72060EA5A9A451;org.apache.maven:maven-plugin-api:3.9.3 +15FF2DB741191064B7B59EF8704DCBF9F3A61DB2;org.apache.maven:maven-repository-metadata:3.9.3 +3F270F7122047E4113CA7D66AD6F86A33C88C9AC;org.apache.maven.resolver:maven-resolver-api:1.9.13 +09AB55B836913B98321101B23B4C61D8485A589D;org.apache.maven.resolver:maven-resolver-connector-basic:1.9.13 +9B1249902065AEA64CBF1C5306DC43E8D7DBAC4E;org.apache.maven.resolver:maven-resolver-impl:1.9.13 +5DE261851D65144303F75AEEEB075F327FBA2952;org.apache.maven.resolver:maven-resolver-named-locks:1.9.13 +9F8941A1A62B3D2F56656E28FC828C00A1324682;org.apache.maven:maven-resolver-provider:3.9.3 +112758C5E9B8EB9002BF129102D22CB887E3025C;org.apache.maven.resolver:maven-resolver-spi:1.9.13 +20A9313DC425956F9F9472C487986652363AC5B5;org.apache.maven.resolver:maven-resolver-transport-http:1.9.13 +D21763DA9046A2378A857CD22C46486F7B1908E5;org.apache.maven.resolver:maven-resolver-transport-wagon:1.9.13 +68DA2730DC3E968ABA581F7E432FB14A4A7C4477;org.apache.maven.resolver:maven-resolver-transport-file:1.9.13 +EDAC336095D491FDD5C7572AEC7F4547DF4A8531;org.apache.maven.resolver:maven-resolver-util:1.9.13 +4E3076219C554203485B7BE51951007611BFE1F5;org.apache.maven:maven-settings:3.9.3 +C2B51853FEAC5E7AA0E4FBFF79C6FA3F0C3197A0;org.apache.maven:maven-settings-builder:3.9.3 F87A61ADB1E12A00DCC6CC6005A51E693AA7C4AC;org.apache.maven.shared:maven-shared-utils:3.3.4 -7D674DDAAEB00BEC8A2B0D0084FD8515571A806E;org.apache.maven:maven-slf4j-provider:3.9.2 +A395D28C4EED821FFACD32CA2441DC8967C2BDDB;org.apache.maven:maven-slf4j-provider:3.9.3 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 diff --git a/java/maven.embedder/nbproject/project.properties b/java/maven.embedder/nbproject/project.properties index b78f2c543c..3181d348f2 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.9.2 +bundled.maven=apache-maven-3.9.3 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 eed908be9d..6003c512ff 100644 --- a/java/maven.embedder/nbproject/project.xml +++ b/java/maven.embedder/nbproject/project.xml @@ -329,73 +329,73 @@ <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.9.2.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-artifact-3.9.3.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-builder-support-3.9.2.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-builder-support-3.9.3.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-compat-3.9.2.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-compat-3.9.3.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-core-3.9.2.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-core-3.9.3.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-embedder-3.9.2.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-embedder-3.9.3.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-model-3.9.2.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-model-3.9.3.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-model-builder-3.9.2.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-model-builder-3.9.3.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-plugin-api-3.9.2.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-plugin-api-3.9.3.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-repository-metadata-3.9.2.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-repository-metadata-3.9.3.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-resolver-api-1.9.10.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-resolver-api-1.9.13.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-resolver-connector-basic-1.9.10.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-resolver-connector-basic-1.9.13.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-resolver-impl-1.9.10.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-resolver-impl-1.9.13.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-resolver-named-locks-1.9.10.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-resolver-named-locks-1.9.13.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-resolver-provider-3.9.2.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-resolver-provider-3.9.3.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-resolver-spi-1.9.10.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-resolver-spi-1.9.13.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-resolver-transport-file-1.9.10.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-resolver-transport-file-1.9.13.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-resolver-transport-http-1.9.10.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-resolver-transport-http-1.9.13.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-resolver-transport-wagon-1.9.10.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-resolver-transport-wagon-1.9.13.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-resolver-util-1.9.10.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-resolver-util-1.9.13.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-settings-3.9.2.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-settings-3.9.3.jar</runtime-relative-path> </class-path-extension> <class-path-extension> - <runtime-relative-path>../maven/lib/maven-settings-builder-3.9.2.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-settings-builder-3.9.3.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.9.2.jar</runtime-relative-path> + <runtime-relative-path>../maven/lib/maven-slf4j-provider-3.9.3.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> diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps index dc8b29749b..dc65dee1d0 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps +++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps @@ -23,8 +23,8 @@ 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.2-bin.zip ide/slf4j.api/external/slf4j-api-1.7.36.jar -java/maven.embedder/external/apache-maven-3.9.2-bin.zip platform/o.apache.commons.lang3/external/commons-lang3-3.12.0.jar +java/maven.embedder/external/apache-maven-3.9.3-bin.zip ide/slf4j.api/external/slf4j-api-1.7.36.jar +java/maven.embedder/external/apache-maven-3.9.3-bin.zip platform/o.apache.commons.lang3/external/commons-lang3-3.12.0.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 @@ -34,9 +34,9 @@ webcommon/javascript2.jade/external/jflex-1.4.3.jar webcommon/javascript2.lexer/ # javax.annotation-api is used by multiple modules. enterprise/javaee.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.3.2.jar java/maven.embedder/external/apache-maven-3.9.2-bin.zip +enterprise/javaee8.api/external/javax.annotation-api-1.3.2.jar java/maven.embedder/external/apache-maven-3.9.3-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.2-bin.zip +enterprise/websvc.restlib/external/javax.annotation-api-1.3.2.jar java/maven.embedder/external/apache-maven-3.9.3-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 @@ -60,7 +60,7 @@ extide/gradle/external/gradle-7.4-bin.zip ide/libs.commons_compress/external/com 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/debugger.jpda.truffle/external/antlr4-runtime-4.7.2.jar -extide/gradle/external/gradle-7.4-bin.zip java/maven.embedder/external/apache-maven-3.9.2-bin.zip +extide/gradle/external/gradle-7.4-bin.zip java/maven.embedder/external/apache-maven-3.9.3-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 --------------------------------------------------------------------- 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