Skip to content

Commit f792fc4

Browse files
mbienmbien
authored
Merge pull request #8534 from mbien/maven-3910
Update bundled maven to 3.9.10
2 parents a2953e8 + ef57e37 commit f792fc4

12 files changed

+103
-95
lines changed

‎java/maven.embedder/external/apache-maven-3.9.9-bin-license.txt‎ renamed to ‎java/maven.embedder/external/apache-maven-3.9.10-bin-license.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Name: Apache Maven Distribution
22
Description: Apache Maven Distribution
3-
Version: 3.9.9
3+
Version: 3.9.10
44
License: Apache-2.0
55
Origin: Apache Software Foundation
66
URL: https://maven.apache.org/

‎java/maven.embedder/external/apache-maven-3.9.9-bin-notice.txt‎ renamed to ‎java/maven.embedder/external/apache-maven-3.9.10-bin-notice.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ This product includes software developed at
66
The Apache Software Foundation (http://www.apache.org/).
77
This software bundles the following NOTICE files from third party library providers:
88

9-
META-INF/NOTICE in archive lib/guice-5.1.0.jar
9+
META-INF/NOTICE in archive lib/guice-5.1.0-classes.jar
1010
Google Guice - Core Library
1111
Copyright 2006-2022 Google, Inc.
1212
This product includes software developed at
1313
The Apache Software Foundation (http://www.apache.org/).
1414

15-
META-INF/NOTICE in archive lib/plexus-utils-3.5.1.jar and lib/plexus-xml-3.0.0.jar
15+
META-INF/NOTICE in archive lib/plexus-utils-3.6.0.jar
1616
This product includes software developed by the Indiana University
1717
Extreme! Lab (http://www.extreme.indiana.edu/).
1818
This product includes software developed by
@@ -24,7 +24,7 @@ javolution (http://javolution.org/).
2424
This product includes software developed by
2525
Rome (https://rome.dev.java.net/).
2626

27-
about.html in archive lib/org.eclipse.sisu.inject-0.9.0.M3.jar
27+
about.html in archive lib/org.eclipse.sisu.inject-0.9.0.M4.jar
2828

2929
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
3030
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

‎java/maven.embedder/external/apache-maven-3.9.9-epl-license.txt‎ renamed to ‎java/maven.embedder/external/apache-maven-3.9.10-epl-license.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
Name: Apache Maven components under EPL v1.0
2-
Description: These Apache Maven components are under EPL v1.0: org.eclipse.sisu.inject-0.9.0.M3.jar org.eclipse.sisu.plexus-0.9.0.M3.jar
3-
Version: 3.9.9
2+
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
3+
Version: 3.9.10
44
License: Maven-EPL-v10
55
Origin: Apache Software Foundation
6-
Files: apache-maven-3.9.9-bin.zip!/apache-maven-3.9.9/lib/org.eclipse.sisu.inject-0.9.0.M3.jar apache-maven-3.9.9-bin.zip!/apache-maven-3.9.9/lib/org.eclipse.sisu.plexus-0.9.0.M3.jar
6+
Files: apache-maven-3.9.10-bin.zip!/apache-maven-3.9.10/lib/org.eclipse.sisu.inject-0.9.0.M4.jar apache-maven-3.9.10-bin.zip!/apache-maven-3.9.10/lib/org.eclipse.sisu.plexus-0.9.0.M4.jar
77

88
Eclipse Public License - v 1.0
99

‎java/maven.embedder/external/apache-maven-3.9.9-failureaccess-1.0.2-license.txt‎ renamed to ‎java/maven.embedder/external/apache-maven-3.9.10-failureaccess-1.0.3-license.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
Name: Guava - Failure Access Library
2-
Version: 1.0.2
2+
Version: 1.0.3
33
License: Apache-2.0
44
Origin: https://github.com/google/guava
55
Description: A Guava subproject
6-
Files: apache-maven-3.9.9-bin.zip!/apache-maven-3.9.9/lib/failureaccess-1.0.2.jar
6+
Files: apache-maven-3.9.10-bin.zip!/apache-maven-3.9.10/lib/failureaccess-1.0.3.jar
77

88
Apache License
99
Version 2.0, January 2004

‎java/maven.embedder/external/apache-maven-3.9.9-guava-33.2.1-jre-license.txt‎ renamed to ‎java/maven.embedder/external/apache-maven-3.9.10-guava-33.4.8-jre-license.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
Name: Guava
2-
Version: 33.2.1
2+
Version: 33.4.8
33
License: Apache-2.0
44
Origin: https://github.com/google/guava
55
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.
6-
Files: apache-maven-3.9.9-bin.zip!/apache-maven-3.9.9/lib/guava-33.2.1-jre.jar
6+
Files: apache-maven-3.9.10-bin.zip!/apache-maven-3.9.10/lib/guava-33.4.8-jre.jar
77

88
Apache License
99
Version 2.0, January 2004

‎java/maven.embedder/external/apache-maven-3.9.9-javax.annotation-api-1.3.2-license.txt‎ renamed to ‎java/maven.embedder/external/apache-maven-3.9.10-javax.annotation-api-1.3.2-license.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Version: 1.3.2
33
Description: Part of Apache Maven Distribution
44
License: CDDL-1.1
55
Origin: Apache Maven
6-
Files: apache-maven-3.9.9-bin.zip!/apache-maven-3.9.9/lib/javax.annotation-api-1.3.2.jar
6+
Files: apache-maven-3.9.10-bin.zip!/apache-maven-3.9.10/lib/javax.annotation-api-1.3.2.jar
77

88
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
99

‎java/maven.embedder/external/apache-maven-3.9.9-slf4j-1.7.36-license.txt‎ renamed to ‎java/maven.embedder/external/apache-maven-3.9.10-slf4j-1.7.36-license.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Description: Part of Apache Maven Distribution
33
Version: 1.7.36
44
License: MIT-slf4j-22
55
Origin: Apache Software Foundation
6-
Files: apache-maven-3.9.9-bin.zip!/apache-maven-3.9.9/lib/slf4j-api-1.7.36.jar
6+
Files: apache-maven-3.9.10-bin.zip!/apache-maven-3.9.10/lib/slf4j-api-1.7.36.jar
77

88
Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland)
99
All rights reserved.

‎java/maven.embedder/external/binaries-list‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
# under the License.
1717
DC15DFF8F701B227EE523EEB7A17F77C10EAFE2F org.jdom:jdom2:2.0.6.1
1818
5D9CE6ADD7B714B8095F0E3E396C5E9F8C5DCFEF org.apache.maven.shared:maven-dependency-tree:2.2
19-
3A9F28ED5232FE3009D63D84A69FC4211AC086B5 org.apache.maven:apache-maven:3.9.9:bin@zip
19+
050975C66E6D451E20737E98725AED22DF18D4B9 org.apache.maven:apache-maven:3.9.10:bin@zip

‎java/maven.embedder/external/binariesembedded-list‎

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -15,50 +15,51 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18+
DC19ECB3F7889B7860697215CAE99C0F9B6F6B4B;aopalliance:asm:9.8
1819
0235BA8B489512805AC13A8F9EA77A1CA5EBE3E8;aopalliance:aopalliance:1.0
1920
1194890E6F56EC29177673F2F12D0B8E627DEC98;org.apache.httpcomponents:httpclient:4.5.14
2021
51CF043C87253C9F58B539C9F7E44C8894223850;org.apache.httpcomponents:httpcore:4.4.16
21-
C4A06A64E650562F30B7BF9AAEC1BFED43ACA12B;com.google.guava:failureaccess:1.0.2
22-
41A4BFF12057EECB6DAAF9C7F36C237815BE3DA1;commons-cli:commons-cli:1.8.0
23-
973638B7149D333563584137EBF13A691BB60579;commons-codec:commons-codec:1.17.1
24-
818E780DA2C66C63BBB6480FEF1F3855EEAFA3E4;com.google.guava:guava:33.2.1-jre
25-
DA25056C694C54BA16E78E4FC35F17FC60F0D1B4;com.google.inject:guice:5.1.0
26-
D5774F204D990C9F5DA2809B88F928515577BEB4;org.fusesource.jansi:jansi:2.4.1
22+
AEAFFD00D57023A2C947393ED251F0354F0985FC;com.google.guava:failureaccess:1.0.3
23+
E1CDFA8BF40CCBB7440B2D1232F9F45BB20A1844;commons-cli:commons-cli:1.9.0
24+
EE45D1CF6EC2CC2B809FF04B4DC7AEC858E0DF8F;commons-codec:commons-codec:1.18.0
25+
E70A3268E6CD3E7D458AA15787CE6811C34E96AE;com.google.guava:guava:33.4.8-jre
26+
E7BA4C25BEC3761840F67C73F166C0D509D01D1D;com.google.inject:guice:5.1.0-classes
27+
BA7387C31622C6650B83EDBA1BBB115F1FE462BA;org.fusesource.jansi:jansi:2.4.2
28+
7425A601C1C7EC76645A78D22B8C6A627EDEE507;org.jspecify.jspecify:jspecify:1.0.0
2729
6975DA39A7040257BD51D21A231B76C915872D38;javax.inject:javax.inject:1
2830
D877E195A05ACA4A2F1AD2FF14BFEC1393AF4B5E;org.slf4j:jcl-over-slf4j:1.7.36
2931
934C04D3CFEF185A8008E7BF34331B79730A9D43;javax.annotation:javax.annotation-api:1.3.2
30-
A130EC431EF32E12A4424F9B074735BB58E15D2D;org.apache.maven:maven-artifact:3.9.9
31-
812C13C808E42C54D3F4ABDAAB603E5262BF8AB8;org.apache.maven:maven-builder-support:3.9.9
32-
95CE2FE8BEA6341C36A1FF01DC80E1CBDFEEFFC7;org.apache.maven:maven-compat:3.9.9
33-
B58645E3F14348024B05735C171425E19D30C02E;org.apache.maven:maven-core:3.9.9
34-
FB988B4E85CEC2686E56DA94769CBF73298EF3EE;org.apache.maven:maven-embedder:3.9.9
35-
585BFF8F220DDC1C08C5263B7DEE26C49FC7DF94;org.apache.maven:maven-model:3.9.9
36-
6DCD87768EB615301AEF0C2221DD168A2D36BC7B;org.apache.maven:maven-model-builder:3.9.9
37-
7E06AEF37B14F8452928E5EFAA88BCF2EE8AED02;org.apache.maven:maven-plugin-api:3.9.9
38-
33A43F0AF3371225D1DCAAA20A824DF59C692172;org.apache.maven:maven-repository-metadata:3.9.9
39-
756660687EA077B85BE02B019D593EF2758E7DB6;org.apache.maven.resolver:maven-resolver-api:1.9.22
40-
0574B1F6D76C2C1F7FF66CCC17FF2C94E0A53545;org.apache.maven.resolver:maven-resolver-connector-basic:1.9.22
41-
19B7A728C9000F8DB615F64552D95FE74B413617;org.apache.maven.resolver:maven-resolver-impl:1.9.22
42-
121433B079AAD9BE7ED266B19F2122EEB0E2D111;org.apache.maven.resolver:maven-resolver-named-locks:1.9.22
43-
EA361822CD25AE6C9153C594AEF805E853031224;org.apache.maven:maven-resolver-provider:3.9.9
44-
C3101ACAA4EC053557028CF1917F1D22112B100D;org.apache.maven.resolver:maven-resolver-spi:1.9.22
45-
17FF0D97F8970124C97A9621524FB08A0503E90F;org.apache.maven.resolver:maven-resolver-transport-http:1.9.22
46-
721D6A8E3ED937461CD673134F83AEAC5A79E715;org.apache.maven.resolver:maven-resolver-transport-wagon:1.9.22
47-
929BC40B340290A7A94306EE0591D106D9261B28;org.apache.maven.resolver:maven-resolver-transport-file:1.9.22
48-
D5FEBED69CA2FE0DACFFEC95B6CB0760B0270FD1;org.apache.maven.resolver:maven-resolver-util:1.9.22
49-
A82024D87A107965AE274D944C844C9186FF410D;org.apache.maven:maven-settings:3.9.9
50-
71A9BEE9618839FFAF7C0DE3B53AC1C408B57AE0;org.apache.maven:maven-settings-builder:3.9.9
32+
CDF10197D944731DD2E19AA171B09550269E4414;org.apache.maven:maven-artifact:3.9.10
33+
56EF0175FF20FA59761BECDF7536863A0EEFD550;org.apache.maven:maven-builder-support:3.9.10
34+
4680BB13FB68254D6F49381BD225E7EB7459209F;org.apache.maven:maven-compat:3.9.10
35+
D2E5EB93E9AFD69091DC38FE60246CD997AED5EA;org.apache.maven:maven-core:3.9.10
36+
9F35934DB25DDECB65FD1933F9103679CA0F22F9;org.apache.maven:maven-embedder:3.9.10
37+
E9CF4CDA5A52C4B11290DC5B2305F3769FE35B1D;org.apache.maven:maven-model:3.9.10
38+
9739C202A5381F30E160989119EDBA0CE053D446;org.apache.maven:maven-model-builder:3.9.10
39+
657C2D49C0AA34B1D187ABE1D3CB817B9C82517B;org.apache.maven:maven-plugin-api:3.9.10
40+
AFB88B856E7E5A8950FB03A7CE2CBAA3A66C21C9;org.apache.maven:maven-repository-metadata:3.9.10
41+
A3A93E5924B8A53391B73E3E5038C25D4FADB7DF;org.apache.maven.resolver:maven-resolver-api:1.9.23
42+
E6057629B09E16E5979DB7D5BB0E9AD71137A043;org.apache.maven.resolver:maven-resolver-connector-basic:1.9.23
43+
2F86656BC45ABDE5A47F69B04C9DAB86C4B9D7EA;org.apache.maven.resolver:maven-resolver-impl:1.9.23
44+
8394515982AEC314D0F15B9ABECBF49DA1160EFA;org.apache.maven.resolver:maven-resolver-named-locks:1.9.23
45+
B1D114550B39033B7B95461DDFC473AAFC830D0D;org.apache.maven:maven-resolver-provider:3.9.10
46+
C1BD6D68EFA5D6743E7F307CE1F79DB63B8E1D33;org.apache.maven.resolver:maven-resolver-spi:1.9.23
47+
38ED4A6A80408E6E186CFC5D94D080B5B5148099;org.apache.maven.resolver:maven-resolver-transport-http:1.9.23
48+
2087AC6EE83EA860F2EB05710B3DC87C15B71CE1;org.apache.maven.resolver:maven-resolver-transport-wagon:1.9.23
49+
C48A31C9BF9427E4F9B76FDAF0ABAF5181C6E03A;org.apache.maven.resolver:maven-resolver-transport-file:1.9.23
50+
1F5A34B81BDDFC5D1200610819CE569C84591318;org.apache.maven.resolver:maven-resolver-util:1.9.23
51+
B59333096DE9D50E5AF3411924DA8D205A00FB23;org.apache.maven:maven-settings:3.9.10
52+
FD861B747D20E1EFC969D2304EABFDC198FF3361;org.apache.maven:maven-settings-builder:3.9.10
5153
BFA28296272A5915B08DE9F11F34A94B0A818FD0;org.apache.maven.shared:maven-shared-utils:3.4.2
52-
E6F78082194D5FC759A84C1BBDFBFB9AB11DEAE8;org.apache.maven:maven-slf4j-provider:3.9.9
53-
3665002BA4D16DFA779EF658A63D0608C4BD898B;org.eclipse.sisu:org.eclipse.sisu.inject:0.9.0.M3
54-
B493C7ABCC6E04FA0A6A20D489A3DB0395C76F70;org.eclipse.sisu:org.eclipse.sisu.plexus:0.9.0.M3
54+
326533B617A8CBB6D27232DEB2611E3C65703200;org.apache.maven:maven-slf4j-provider:3.9.10
55+
A062D8E12DC62E698C9F943A3FCE94E366B4E220;org.eclipse.sisu:org.eclipse.sisu.inject:0.9.0.M4
56+
478F7935E88CD9DA7EF01F509E4853E80EDE9034;org.eclipse.sisu:org.eclipse.sisu.plexus:0.9.0.M4
5557
425EA8E534716B4BFF1EA90F39BD76BE951D651B;org.codehaus.plexus:plexus-cipher:2.0
56-
5D0D8C71B61B38CE127A46702A453F9AA09A4EE2;org.codehaus.plexus:plexus-classworlds:2.8.0
57-
2F2147A6CC6A119A1B51A96F31D45C557F6244B9;org.codehaus.plexus:plexus-component-annotations:2.1.0
58-
8DC73F4FF5EAFCBB7EC035BA54736E828B272533;org.codehaus.plexus:plexus-interpolation:1.27
58+
ACE0820F34DE49F69511F5263BCEBB09FAC9731A;org.codehaus.plexus:plexus-classworlds:2.9.0
59+
A506F84636EA7AE370D04167DD155C103E616F68;org.codehaus.plexus:plexus-component-annotations:2.2.0
60+
90D3608CD99F21717A581F036A1C69FF762F5ED6;org.codehaus.plexus:plexus-interpolation:1.28
5961
F89C5080614FFD0764E49861895DBEDDE1B47237;org.codehaus.plexus:plexus-sec-dispatcher:2.0
60-
C6BFB17C97ECC8863E88778EA301BE742C62B06D;org.codehaus.plexus:plexus-utils:3.5.1
61-
B0E73C21402F03C2765674B8DEDE21673B3288CF;org.codehaus.plexus:plexus-xml:3.0.1
62+
E8BC129728F22671A36FFF3B604EDCD39073A7B1;org.codehaus.plexus:plexus-utils:3.6.0
6263
6C62681A2F655B49963A5983B8B0950A6120AE14;org.slf4j:slf4j-api:1.7.36
6364
A09F59BE3767DBFF0401828463D1752A9CB0C551;org.apache.maven.wagon:wagon-file:3.5.3
6465
673D54E78F83C4700C8250A48C61F4C70EEF9BC3;org.apache.maven.wagon:wagon-http:3.5.3

‎java/maven.embedder/nbproject/project.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ javac.release=17
2020
javac.compilerargs=-Xlint -Xlint:-serial
2121
release.external/jdom2-2.0.6.1.jar=modules/ext/maven/jdom2-2.0.6.1.jar
2222
release.external/maven-dependency-tree-2.2.jar=modules/ext/maven/maven-dependency-tree-2.2.jar
23-
bundled.maven=apache-maven-3.9.9
23+
bundled.maven=apache-maven-3.9.10
2424
extra.module.files=maven/
2525
nbm.executable.files=maven/bin/mvn,maven/bin/mvnDebug,maven/bin/mvnyjp
2626
extra.license.files=${cluster}/maven/LICENSE.txt,${cluster}/maven/NOTICE.txt

0 commit comments

Comments
 (0)