This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new 06938249a7 [MNG-7792] Use a standalone asm version (#1126)
06938249a7 is described below
commit 06938249a77f9158bb661452fde87322bf4045a6
Author: Guillaume Nodet <[email protected]>
AuthorDate: Tue Sep 5 23:09:03 2023 +0200
[MNG-7792] Use a standalone asm version (#1126)
---
apache-maven/pom.xml | 4 ++++
.../licenses/unrecognized-asm-9.5.txt | 27 ++++++++++++++++++++++
maven-core/pom.xml | 2 ++
maven-embedder/pom.xml | 1 +
maven-model-builder/pom.xml | 2 ++
maven-resolver-provider/pom.xml | 5 ++++
pom.xml | 13 +++++++++++
7 files changed, 54 insertions(+)
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 1be6a0f293..c7a1844b84 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -96,6 +96,10 @@ under the License.
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ </dependency>
</dependencies>
<pluginRepositories>
diff --git
a/apache-maven/src/main/appended-resources/licenses/unrecognized-asm-9.5.txt
b/apache-maven/src/main/appended-resources/licenses/unrecognized-asm-9.5.txt
new file mode 100644
index 0000000000..631ee53c53
--- /dev/null
+++ b/apache-maven/src/main/appended-resources/licenses/unrecognized-asm-9.5.txt
@@ -0,0 +1,27 @@
+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.
\ No newline at end of file
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 992e7825d7..a8bb08eb58 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -106,10 +106,12 @@ under the License.
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.inject</artifactId>
+ <classifier>no_asm</classifier>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
+ <classifier>classes</classifier>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 7541fc0fdb..7d4f4668a9 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -79,6 +79,7 @@ under the License.
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
+ <classifier>classes</classifier>
<exclusions>
<!-- MNG-7068 Active dependency management for Google Guice / Google
Guava. Excludes of Guava are managed in parent POM -->
<exclusion>
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index 638565ccfa..d64e65cfa8 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -69,6 +69,7 @@ under the License.
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.inject</artifactId>
+ <classifier>no_asm</classifier>
</dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>
@@ -78,6 +79,7 @@ under the License.
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
+ <classifier>classes</classifier>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml
index b192187a58..c15c8e582f 100644
--- a/maven-resolver-provider/pom.xml
+++ b/maven-resolver-provider/pom.xml
@@ -79,6 +79,7 @@ under the License.
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
+ <classifier>classes</classifier>
<optional>true</optional>
<exclusions>
<exclusion>
@@ -91,6 +92,10 @@ under the License.
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
diff --git a/pom.xml b/pom.xml
index e1858fb503..7d16f9fb5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -166,6 +166,7 @@ under the License.
<jxpathVersion>1.3</jxpathVersion>
<resolverVersion>1.9.14</resolverVersion>
<sisuVersion>0.9.0.M2</sisuVersion>
+ <asmVersion>9.5</asmVersion>
<slf4jVersion>1.7.36</slf4jVersion>
<xmlunitVersion>2.6.4</xmlunitVersion>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
@@ -217,6 +218,7 @@ under the License.
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>${guiceVersion}</version>
+ <classifier>classes</classifier>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
@@ -272,12 +274,23 @@ under the License.
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
</exclusion>
+ <!-- we use the no_asm classifier for sisu.inject -->
+ <exclusion>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.inject</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.inject</artifactId>
<version>${sisuVersion}</version>
+ <classifier>no_asm</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>${asmVersion}</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
