diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index 1be6a0f29351..c7a1844b842d 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -96,6 +96,10 @@ under the License. org.fusesource.jansi jansi + + org.ow2.asm + asm + 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 000000000000..631ee53c53d4 --- /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 992e7825d7df..a8bb08eb5857 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -106,10 +106,12 @@ under the License. org.eclipse.sisu org.eclipse.sisu.inject + no_asm com.google.inject guice + classes com.google.guava diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 7541fc0fdba8..7d4f4668a979 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -79,6 +79,7 @@ under the License. com.google.inject guice + classes diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml index 638565ccfadf..d64e65cfa803 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -69,6 +69,7 @@ under the License. org.eclipse.sisu org.eclipse.sisu.inject + no_asm org.eclipse.sisu @@ -78,6 +79,7 @@ under the License. com.google.inject guice + classes test diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml index b192187a5877..c15c8e582fbd 100644 --- a/maven-resolver-provider/pom.xml +++ b/maven-resolver-provider/pom.xml @@ -79,6 +79,7 @@ under the License. com.google.inject guice + classes true @@ -91,6 +92,10 @@ under the License. + + org.ow2.asm + asm + com.google.guava guava diff --git a/pom.xml b/pom.xml index e1858fb50364..7d16f9fb5e78 100644 --- a/pom.xml +++ b/pom.xml @@ -166,6 +166,7 @@ under the License. 1.3 1.9.14 0.9.0.M2 + 9.5 1.7.36 2.6.4 true @@ -217,6 +218,7 @@ under the License. com.google.inject guice ${guiceVersion} + classes com.google.guava @@ -272,12 +274,23 @@ under the License. javax.enterprise cdi-api + + + org.eclipse.sisu + org.eclipse.sisu.inject + org.eclipse.sisu org.eclipse.sisu.inject ${sisuVersion} + no_asm + + + org.ow2.asm + asm + ${asmVersion} javax.inject