Skip to content

Commit

Permalink
Merge pull request #3328 from ebarboni/maven384
Browse files Browse the repository at this point in the history 
Upgrade to Apache Maven 3.8.4
  • Loading branch information
@matthiasblaesing
matthiasblaesing committed Dec 17, 2021
2 parents 72fc8f3 + d4b4f5f commit 6432134
Show file tree
Hide file tree
Showing 14 changed files with 158 additions and 566 deletions.
28 changes: 0 additions & 28 deletions java/maven.embedder/external/apache-maven-3.6.3-jsoup-license.txt
View file

This file was deleted.

390 changes: 0 additions & 390 deletions java/maven.embedder/external/apache-maven-3.6.3-jsr-250-license.txt
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ...ternal/apache-maven-3.6.3-bin-license.txt → ...ternal/apache-maven-3.8.4-bin-license.txt
View file
@@ -1,6 +1,6 @@
Name: Apache Maven Distribution
Description: Apache Maven Distribution
Version: 3.6.3
Version: 3.8.4
License: Apache-2.0
Origin: Apache Software Foundation
URL: http://maven.apache.org/
Expand Down
4 changes: 2 additions & 2 deletions ...xternal/apache-maven-3.6.3-bin-notice.txt → ...xternal/apache-maven-3.8.4-bin-notice.txt
View file
@@ -1,6 +1,6 @@

Apache Maven Distribution
Copyright 2001-2019 The Apache Software Foundation
Copyright 2001-2021 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Expand All @@ -26,7 +26,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.3.4.jar
about.html in archive lib/org.eclipse.sisu.inject-0.3.5.jar

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
Expand Down
6 changes: 3 additions & 3 deletions ...ternal/apache-maven-3.6.3-epl-license.txt → ...ternal/apache-maven-3.8.4-epl-license.txt
View file
@@ -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.4.jar org.eclipse.sisu.plexus-0.3.4.jar
Version: 3.6.3
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.4
License: Maven-EPL-v10
Origin: Apache Software Foundation
Files: apache-maven-3.6.3-bin.zip!/apache-maven-3.6.3/lib/org.eclipse.sisu.inject-0.3.4.jar apache-maven-3.6.3-bin.zip!/apache-maven-3.6.3/lib/org.eclipse.sisu.plexus-0.3.4.jar
Files: apache-maven-3.8.4-bin.zip!/apache-maven-3.8.4/lib/org.eclipse.sisu.inject-0.3.5.jar apache-maven-3.8.4-bin.zip!/apache-maven-3.8.4/lib/org.eclipse.sisu.plexus-0.3.5.jar

Eclipse Public License - v 1.0

Expand Down
4 changes: 2 additions & 2 deletions ...rnal/apache-maven-3.6.3-slf4j-license.txt → ...rnal/apache-maven-3.8.4-slf4j-license.txt
View file
@@ -1,9 +1,9 @@
Name: slf4j
Description: Part of Apache Maven Distribution
Version: 3.6.3
Version: 3.8.4
License: MIT-slf4j
Origin: Apache Software Foundation
Files: apache-maven-3.6.3-bin.zip!/apache-maven-3.6.3/lib/slf4j-api-1.7.29.jar
Files: apache-maven-3.8.4-bin.zip!/apache-maven-3.8.4/lib/slf4j-api-1.7.32.jar

Copyright (c) 2004-2017 QOS.ch
All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion java/maven.embedder/external/binaries-list
View file
Expand Up @@ -16,4 +16,4 @@
# under the License.
A2AC1CD690AB4C80DEFE7F9BCE14D35934C35CEC jdom:jdom:1.0
5D9CE6ADD7B714B8095F0E3E396C5E9F8C5DCFEF org.apache.maven.shared:maven-dependency-tree:2.2
B36434A3A5C7A6B75AC955DF152E4325765D0804 org.apache.maven:apache-maven:3.6.3:bin@zip
765515B57D2F525BCB682DE9EC702F1D8703E9B9 org.apache.maven:apache-maven:3.8.4:bin@zip
72 changes: 35 additions & 37 deletions java/maven.embedder/external/binariesembedded-list
View file
Expand Up @@ -15,46 +15,44 @@
# specific language governing permissions and limitations
# under the License.

44C453F60909DFC223552ACE63E05C694215156B;javax.enterprise:cdi-api:1.0
C51C00206BB913CD8612B24ABD9FA98AE89719B1;commons-cli:commons-cli:1.4
2852E6E05FBB95076FC091F6D1780F1F8FE35E0F;commons-io:commons-io:2.5
815893DF5F31DA2ECE4040FE0A12FD44B577AFAF;commons-io:commons-io:2.6
6505A72A097D9270F7A9E7BF42C4238283247755;org.apache.commons:commons-lang3:3.8.1
BDAAB946CA5AD20253502D873BA0C3313D141036;com.google.guava:guava:25.1-android
41E5AB52EC65E60B6C0CED947BECF7BA96402645;com.google.inject:guice:4.2.1:no_aop
E90CAA31C9B8D748359450D7487F76B05549AE65;org.fusesource.jansi:jansi:1.17.1
FA13659F9128F4C011C8E1D06F137083B4876377;com.google.inject:guice:4.2.2:no_aop
321C614F85F1DEA6BB08C1817C60D53B7F3552FD;org.fusesource.jansi:jansi:2.4.0
6975DA39A7040257BD51D21A231B76C915872D38;javax.inject:javax.inject:1
D6DCA1EC36F28ECF286241DEADC790C2D4C8EAA0;org.slf4j:jcl-over-slf4j:1.7.29
55819A28FC834C2F2BCF4DCDB278524DC3CF088F;org.jsoup:jsoup:1.12.1
5025422767732A1AB45D93ABFEA846513D742DCF;javax.annotation:jsr250-api:1.0
F8FF8032903882376E8D000C51E3E16D20FC7DF7;org.apache.maven:maven-artifact:3.6.3
E9A37AF390009A525D8FAA6B18BD682123F85F9E;org.apache.maven:maven-builder-support:3.6.3
2A8242398EFBFD533FFE36147864C34A326666DA;org.apache.maven:maven-compat:3.6.3
ECA800AA73E750EC9A880EB224F0BB68F5B7873B;org.apache.maven:maven-core:3.6.3
CC8DF86676BCB37F68D2CEAF05DF8EF6FB11D873;org.apache.maven:maven-embedder:3.6.3
61C7848DCE2FBF7F7AB0FDC8E8A7CC9DA5DD7827;org.apache.maven:maven-model:3.6.3
4EF1D56F53D3E0A9003B7CC82C89AF9878321E82;org.apache.maven:maven-model-builder:3.6.3
063FE5967B9C4C1B6FA6004BE76E1C939E8BD1D6;org.apache.maven:maven-plugin-api:3.6.3
14D28071C85E76B656C46C465DB91D394D6F48F0;org.apache.maven:maven-repository-metadata:3.6.3
CEEE6B7EA1BC252AFA585FA32F76C2CDA206BDCD;org.apache.maven.resolver:maven-resolver-api:1.4.1
C213352D609D576641AED35172157D46CD2003D4;org.apache.maven.resolver:maven-resolver-connector-basic:1.4.1
1658CFA27978C5949C3A92086514A22CA85394E4;org.apache.maven.resolver:maven-resolver-impl:1.4.1
115240B65C1D0E9745CB2012B977AFC3D1795F94;org.apache.maven:maven-resolver-provider:3.6.3
905A024FF050E804A8A4DF53EEEE63CC7D153438;org.apache.maven.resolver:maven-resolver-spi:1.4.1
F3268F4EE92227AB98B7BE0AC5122DAA2ED97E35;org.apache.maven.resolver:maven-resolver-transport-wagon:1.4.1
3F6D4F4BC3E24B46A776B47CCFEAED9D2ED01549;org.apache.maven.resolver:maven-resolver-util:1.4.1
BBF4E06DCDB0BB33D1546C080DF5C8D92B535D30;org.apache.maven:maven-settings:3.6.3
756D46810B8CC7B2B98585CCC787854CDFDE7FD9;org.apache.maven:maven-settings-builder:3.6.3
08DD4DFB1D2D8B6969F6462790F82670BCD35CE2;org.apache.maven.shared:maven-shared-utils:3.2.1
DE3B6CF15C2974250AE88820AB6C210FD8F38ED3;org.apache.maven:maven-slf4j-provider:3.6.3
FC3BE144183F54DC6F5C55E34462C1C2D89D7D96;org.eclipse.sisu:org.eclipse.sisu.inject:0.3.4
F1335A3B7BC3FD23F67DA88BD60CD5D4C3304EF3;org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.4
51460409B6CDC2B828540C19C05691F89141EDC2;org.sonatype.plexus:plexus-cipher:1.7
32C060250BCC5282CDBC1FD7008C12EB4EBAD00E;org.slf4j:jcl-over-slf4j:1.7.32
479C1E06DB31C432330183F5CAE684163F186146;javax.annotation:javax.annotation.api:1.2
6DBA6D03AC7ABD8B895595B0EE7000CE35C3D421;org.apache.maven:maven-artifact:3.8.4
19E7C1DD9AB8C3266DB19E067E2B7B8764F0FA6A;org.apache.maven:maven-builder-support:3.8.4
B084A01A5E6D92AC83E64C1FEA25FC019E9EE125;org.apache.maven:maven-compat:3.8.4
CB11BAC5ED848B900C2533D42AE8F23A73E6A015;org.apache.maven:maven-core:3.8.4
5159D6F217F646FEF15648EAD95B536337F04CDB;org.apache.maven:maven-embedder:3.8.4
71057054EA1E5E341B2196804A426E3243F6CB2E;org.apache.maven:maven-model:3.8.4
8E039DB854CEE3DDBCA932B90C0C06CDCB9DC640;org.apache.maven:maven-model-builder:3.8.4
699BF28A990398CAA3C7DC860476C409FE538036;org.apache.maven:maven-plugin-api:3.8.4
C62113372F740797767D520F604D0543DCDFC92F;org.apache.maven:maven-repository-metadata:3.8.4
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
2CCBD1E2C713922353CCD779E56AEEFC7A9FA56F;org.apache.maven:maven-resolver-provider:3.8.4
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
ECE24EC40B7D73E755F2EBD22BF8471B6C0B8FBD;org.apache.maven:maven-settings:3.8.4
50BF143B0E338A26651970860E3067DD94CF31AA;org.apache.maven:maven-settings-builder:3.8.4
F87A61ADB1E12A00DCC6CC6005A51E693AA7C4AC;org.apache.maven.shared:maven-shared-utils:3.3.4
5B4DBD3CF0B14038766A6E915D75646C6D396E5B;org.apache.maven:maven-slf4j-provider:3.8.4
D4265DD4F0F1D7A06D80DF5A5F475D5FF9C17140;org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5
D71996BB2E536F966B3B70E647067FFF3B73D32F;org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.5
425EA8E534716B4BFF1EA90F39BD76BE951D651B;org.sonatype.plexus:plexus-cipher:2.0
8587E80FCB38E70B70FAE8D5914B6376BFAD6259;org.codehaus.plexus:plexus-classworlds:2.6.0
2F2147A6CC6A119A1B51A96F31D45C557F6244B9;org.codehaus.plexus:plexus-component-annotations:2.1.0
3B37B3335E6A97E11E690BBDC22ADE1A5DEB74D6;org.codehaus.plexus:plexus-interpolation:1.25
43FDE524E9B94C883727A9FDDB8669181B890EA7;org.sonatype.plexus:plexus-sec-dispatcher:1.4
13B015768E0D04849D2794E4C47EB02D01A0DE32;org.codehaus.plexus:plexus-utils:3.2.1
E56BF4473A4C6B71C7DD397A833DCE86D1993D9D;org.slf4j:slf4j-api:1.7.29
9F4E71EFC815C087E32C2C80341C1ED5D9CBEDD6;org.apache.maven.wagon:wagon-file:3.3.4
8152D42E1C416AF9B4B146FB1AA082BBCC55C557;org.apache.maven.wagon:wagon-http:3.3.4:shaded
7A99FDAA534AA8C01F01A447FE1C7AF5CFC7B0D5;org.apache.maven.wagon:wagon-provider-api:3.3.4
25B919C664B79795CCDE0EDE5CEE0FD68B544197;org.codehaus.plexus:plexus-interpolation:1.26
F89C5080614FFD0764E49861895DBEDDE1B47237;org.sonatype.plexus:plexus-sec-dispatcher:2.0
CF43B5391DE623B36FE066A21127BAEF82C64022;org.codehaus.plexus:plexus-utils:3.3.0
CDCFF33940D9F2DE763BC41EA05A0BE5941176C3;org.slf4j:slf4j-api:1.7.32
85876A5672B78AA2E817EEE495239CDDD7B598E7;org.apache.maven.wagon:wagon-file:3.4.3
FAF4DE1C28C670B22F25705A20DB3E8EE323FB04;org.apache.maven.wagon:wagon-http:3.4.3:shaded
35AEA87712379DB1844B2001AA644D709EA46877;org.apache.maven.wagon:wagon-provider-api:3.4.3
2 changes: 1 addition & 1 deletion java/maven.embedder/nbproject/project.properties
View file
Expand Up @@ -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.6.3
bundled.maven=apache-maven-3.8.4
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
Expand Down

0 comments on commit 6432134

Please sign in to comment.