Merge pull request #5170 from mbien/maven-387

upgrade bundled maven to 3.8.7
apache · Jan 4, 2023 · 3bf285b · 3bf285b
2 parents 316a3da + 25041e6
commit 3bf285b
Show file tree

Hide file tree

Showing 13 changed files with 99 additions and 53 deletions.
diff --git a/...ternal/apache-maven-3.8.6-bin-license.txt → ...ternal/apache-maven-3.8.7-bin-license.txt b/...ternal/apache-maven-3.8.6-bin-license.txt → ...ternal/apache-maven-3.8.7-bin-license.txt
@@ -1,6 +1,6 @@
 Name: Apache Maven Distribution
 Description: Apache Maven Distribution
-Version: 3.8.6
+Version: 3.8.7
 License: Apache-2.0
 Origin: Apache Software Foundation
 URL: https://maven.apache.org/

diff --git a/...xternal/apache-maven-3.8.6-bin-notice.txt → ...xternal/apache-maven-3.8.7-bin-notice.txt b/...xternal/apache-maven-3.8.6-bin-notice.txt → ...xternal/apache-maven-3.8.7-bin-notice.txt
diff --git a/...ternal/apache-maven-3.8.6-epl-license.txt → ...ternal/apache-maven-3.8.7-epl-license.txt b/...ternal/apache-maven-3.8.6-epl-license.txt → ...ternal/apache-maven-3.8.7-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.6
+Version: 3.8.7
 License: Maven-EPL-v10
 Origin: Apache Software Foundation
-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
+Files: apache-maven-3.8.7-bin.zip!/apache-maven-3.8.7/lib/org.eclipse.sisu.inject-0.3.5.jar apache-maven-3.8.7-bin.zip!/apache-maven-3.8.7/lib/org.eclipse.sisu.plexus-0.3.5.jar
 
 Eclipse Public License - v 1.0
 

diff --git a/...rnal/apache-maven-3.8.6-slf4j-license.txt → ...rnal/apache-maven-3.8.7-slf4j-license.txt b/...rnal/apache-maven-3.8.6-slf4j-license.txt → ...rnal/apache-maven-3.8.7-slf4j-license.txt
@@ -1,9 +1,9 @@
 Name: slf4j
 Description: Part of Apache Maven Distribution
-Version: 3.8.6
+Version: 3.8.7
 License: MIT-slf4j
 Origin: Apache Software Foundation
-Files: apache-maven-3.8.6-bin.zip!/apache-maven-3.8.6/lib/slf4j-api-1.7.36.jar
+Files: apache-maven-3.8.7-bin.zip!/apache-maven-3.8.7/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
@@ -16,4 +16,4 @@
 # under the License.
 A2AC1CD690AB4C80DEFE7F9BCE14D35934C35CEC jdom:jdom:1.0
 5D9CE6ADD7B714B8095F0E3E396C5E9F8C5DCFEF org.apache.maven.shared:maven-dependency-tree:2.2
-3ABB90E23BE975D397BBAA43773DD0861DAE26C6 org.apache.maven:apache-maven:3.8.6:bin@zip
+4CAAED06DFADFE54EA5C0DD8806EFC0B65812081 org.apache.maven:apache-maven:3.8.7:bin@zip
diff --git a/java/maven.embedder/external/binariesembedded-list b/java/maven.embedder/external/binariesembedded-list
@@ -16,34 +16,33 @@
 # under the License.
 
 C51C00206BB913CD8612B24ABD9FA98AE89719B1;commons-cli:commons-cli:1.4
-815893DF5F31DA2ECE4040FE0A12FD44B577AFAF;commons-io:commons-io:2.6
 6505A72A097D9270F7A9E7BF42C4238283247755;org.apache.commons:commons-lang3:3.8.1
 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
 D877E195A05ACA4A2F1AD2FF14BFEC1393AF4B5E;org.slf4j:jcl-over-slf4j:1.7.36
 479C1E06DB31C432330183F5CAE684163F186146;javax.annotation:javax.annotation.api:1.2
-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
+4B820734B856682F99F6AD2DE4F1F7DD4B82335F;org.apache.maven:maven-artifact:3.8.7
+D98AC7F943FE6E18205E15B92F86D1FEF753F933;org.apache.maven:maven-builder-support:3.8.7
+A68781144147DCA0ADC17FCFF63A680E310B35E6;org.apache.maven:maven-compat:3.8.7
+7AE5D5EF206ED50B18B01BA405B5AD47387EF195;org.apache.maven:maven-core:3.8.7
+48543C6C3DD1872614B07CEBC2DF85CDE1CC4738;org.apache.maven:maven-embedder:3.8.7
+A6A1F77AA36D158C8EC7917112192083B9467CD4;org.apache.maven:maven-model:3.8.7
+D2FD892B20BD945B441607A7D49ADFD1FC133E31;org.apache.maven:maven-model-builder:3.8.7
+80C6BA199912C82627C11BC65BA81A6D21BD172F;org.apache.maven:maven-plugin-api:3.8.7
+42F7CC6120C8A755ED8C3C3BB5DCD5366D2E11EE;org.apache.maven:maven-repository-metadata:3.8.7
 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
-C6DADEDC9F6B5C1C02D0A93AFD1857460B0F501D;org.apache.maven:maven-resolver-provider:3.8.6
+6DE6CE43DDD256A9EDD02B5F74961181A961816A;org.apache.maven:maven-resolver-provider:3.8.7
 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
-9BA5114C6C61C66FBC6B93C73085DC5B15585524;org.apache.maven:maven-settings:3.8.6
-E5C92138DFFD1F9E5454CD8224CF8E18253B1803;org.apache.maven:maven-settings-builder:3.8.6
+2FB7EB81EA304E0B7DC0DA3CC986EE6887915644;org.apache.maven:maven-settings:3.8.7
+DB330482100FD0CD27F113FB55A8F67794E9E0EE;org.apache.maven:maven-settings-builder:3.8.7
 F87A61ADB1E12A00DCC6CC6005A51E693AA7C4AC;org.apache.maven.shared:maven-shared-utils:3.3.4
-F68CB36830CD5B163BAD35F065A77E1248332983;org.apache.maven:maven-slf4j-provider:3.8.6
+A203B0E1A4FD692612FD2251F007EF174F86B145;org.apache.maven:maven-slf4j-provider:3.8.7
 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
@@ -53,6 +52,6 @@ D71996BB2E536F966B3B70E647067FFF3B73D32F;org.eclipse.sisu:org.eclipse.sisu.plexu
 F89C5080614FFD0764E49861895DBEDDE1B47237;org.codehaus.plexus:plexus-sec-dispatcher:2.0
 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
-C7504D054C4D909D0C1C8CE8883B70DD337971FE;org.apache.maven.wagon:wagon-http:3.5.1:shaded
-118E63F22D05B14535451933AE207BE47EC45D91;org.apache.maven.wagon:wagon-provider-api:3.5.1
+A09F59BE3767DBFF0401828463D1752A9CB0C551;org.apache.maven.wagon:wagon-file:3.5.3
+56C28B4EB4A8065D17700BDD0A815026889A6A92;org.apache.maven.wagon:wagon-http:3.5.3:shaded
+39C44EBB3945DEE359665272D8ACB83F9460491B;org.apache.maven.wagon:wagon-provider-api:3.5.3
diff --git 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.6
+bundled.maven=apache-maven-3.8.7
 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
@@ -292,9 +292,6 @@
             <class-path-extension>
                 <runtime-relative-path>../maven/lib/commons-cli-1.4.jar</runtime-relative-path>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>../maven/lib/commons-io-2.6.jar</runtime-relative-path>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>../maven/lib/commons-lang3-3.8.1.jar</runtime-relative-path>
             </class-path-extension>
@@ -317,31 +314,31 @@
                 <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.6.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/maven-artifact-3.8.7.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>../maven/lib/maven-builder-support-3.8.6.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/maven-builder-support-3.8.7.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>../maven/lib/maven-compat-3.8.6.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/maven-compat-3.8.7.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>../maven/lib/maven-core-3.8.6.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/maven-core-3.8.7.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>../maven/lib/maven-embedder-3.8.6.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/maven-embedder-3.8.7.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>../maven/lib/maven-model-3.8.6.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/maven-model-3.8.7.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>../maven/lib/maven-model-builder-3.8.6.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/maven-model-builder-3.8.7.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>../maven/lib/maven-plugin-api-3.8.6.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/maven-plugin-api-3.8.7.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>../maven/lib/maven-repository-metadata-3.8.6.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/maven-repository-metadata-3.8.7.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>
@@ -353,7 +350,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.6.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/maven-resolver-provider-3.8.7.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>
@@ -365,16 +362,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.6.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/maven-settings-3.8.7.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>../maven/lib/maven-settings-builder-3.8.6.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/maven-settings-builder-3.8.7.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.6.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/maven-slf4j-provider-3.8.7.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>
@@ -401,13 +398,13 @@
                 <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>
+                <runtime-relative-path>../maven/lib/wagon-file-3.5.3.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>../maven/lib/wagon-http-3.5.1-shaded.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/wagon-http-3.5.3-shaded.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>../maven/lib/wagon-provider-api-3.5.1.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/wagon-provider-api-3.5.3.jar</runtime-relative-path>
             </class-path-extension>
         </data>
     </configuration>

diff --git a/java/maven/build.xml b/java/maven/build.xml
@@ -54,7 +54,13 @@
         </jar>
         <copy overwrite="true" tofile="build/mavenclasses/META-INF/plexus/components.xml" file="mavensrc/org/netbeans/modules/maven/event/components.xml"/>
         <!-- we use jarjar to repackage simple json, to avoid clashes with 3rd party maven plugins possibly including it in their dependencies -->
-        <taskdef name="jarjar" classpath="./external/jarjar-1.5.jar" classname="org.pantsbuild.jarjar.JarJarTask" loaderref="lib.path.loader"/>
+        <taskdef name="jarjar" classname="org.pantsbuild.jarjar.JarJarTask" loaderref="lib.path.loader">
+            <classpath>
+                <pathelement location="./external/asm-7.0.jar"/>
+                <pathelement location="./external/asm-commons-7.0.jar"/>
+                <pathelement location="./external/jarjar-1.7.2.jar"/>
+            </classpath>
+        </taskdef>
         <jarjar jarfile="${cluster}/maven-nblib/netbeans-eventspy.jar" compress="false">
             <fileset dir="build/mavenclasses" >
                 <include name="org/netbeans/modules/maven/event/**"/>

diff --git a/java/maven/external/asm-7.0-license.txt b/java/maven/external/asm-7.0-license.txt
@@ -0,0 +1,42 @@
+Name: ASM
+Description: ASM is an all purpose Java bytecode manipulation and analysis framework
+Origin: https://asm.ow2.io/
+Version: 7.0
+License: ASM
+URL: https://asm.ow2.io/
+Files: asm-7.0.jar, asm-commons-7.0.jar
+Type: compile-time
+Comment: Used to build ueber-jar bundling for simple json library into NbEventSpy
+
+ASM License
+
+ASM: a very small and fast Java bytecode manipulation framework
+Copyright (c) 2000-2011 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/java/maven/external/binaries-list b/java/maven/external/binaries-list
@@ -14,5 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-E7A996E498FCE8543B5635E83C4EF803CE5C9FEF org.pantsbuild.jarjar:jarjar:1.5
+8E258F158B4572D40598D7F4793CFBFE84A7CC70 org.pantsbuild:jarjar:1.7.2
+D74D4BA0DEE443F68FB2DCB7FCDB945A2CD89912 org.ow2.asm:asm:7.0
+478006D07B7C561AE3A92DDC1829BCA81AE0CDD1 org.ow2.asm:asm-commons:7.0
 E48292EAE5E14EC44978AA53DEBB1AF7DDD6DF93 org.sonatype.aether:aether-api:1.13.1
diff --git a/java/maven/external/jarjar-1.5-license.txt → java/maven/external/jarjar-1.7.2-license.txt b/java/maven/external/jarjar-1.5-license.txt → java/maven/external/jarjar-1.7.2-license.txt
@@ -1,9 +1,11 @@
 Name: Jar Jar Links
 Description: Jar Jar Links is a utility that makes it easy to repackage Java libraries and embed them into your own distribution.
 Origin: pantsbuild
-Version: 1.5
+Version: 1.7.2
 License: Apache-2.0
 URL: https://github.com/pantsbuild/jarjar
+Type: compile-time
+Comment: Used to build ueber-jar bundling for simple json library into NbEventSpy
 
                                  Apache License
                            Version 2.0, January 2004