Skip to content

Commit 35755ee

Browse files
[MNG-8722] Use a single standalone version of asm
1 parent b094195 commit 35755ee

File tree

6 files changed

+63
-2
lines changed

6 files changed

+63
-2
lines changed
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
ASM is released under the following 3-Clause BSD License:
2+
3+
ASM: a very small and fast Java bytecode manipulation framework
4+
Copyright (c) 2000-2011 INRIA, France Telecom
5+
All rights reserved.
6+
7+
Redistribution and use in source and binary forms, with or without
8+
modification, are permitted provided that the following conditions
9+
are met:
10+
1. Redistributions of source code must retain the above copyright
11+
notice, this list of conditions and the following disclaimer.
12+
2. Redistributions in binary form must reproduce the above copyright
13+
notice, this list of conditions and the following disclaimer in the
14+
documentation and/or other materials provided with the distribution.
15+
3. Neither the name of the copyright holders nor the names of its
16+
contributors may be used to endorse or promote products derived from
17+
this software without specific prior written permission.
18+
19+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22+
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
23+
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25+
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26+
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
29+
THE POSSIBILITY OF SUCH DAMAGE.

maven-core/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,16 @@ under the License.
9797
<dependency>
9898
<groupId>org.eclipse.sisu</groupId>
9999
<artifactId>org.eclipse.sisu.inject</artifactId>
100+
<classifier>no_asm</classifier>
101+
</dependency>
102+
<dependency>
103+
<groupId>org.ow2.asm</groupId>
104+
<artifactId>asm</artifactId>
100105
</dependency>
101106
<dependency>
102107
<groupId>com.google.inject</groupId>
103108
<artifactId>guice</artifactId>
109+
<classifier>classes</classifier>
104110
</dependency>
105111
<dependency>
106112
<groupId>com.google.guava</groupId>

maven-embedder/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ under the License.
7575
<dependency>
7676
<groupId>com.google.inject</groupId>
7777
<artifactId>guice</artifactId>
78+
<classifier>classes</classifier>
7879
<exclusions>
7980
<!-- MNG-7068 Active dependency management for Google Guice / Google Guava. Excludes of Guava are managed in parent POM -->
8081
<exclusion>

maven-model-builder/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ under the License.
5555
<dependency>
5656
<groupId>org.eclipse.sisu</groupId>
5757
<artifactId>org.eclipse.sisu.inject</artifactId>
58+
<classifier>no_asm</classifier>
59+
</dependency>
60+
<dependency>
61+
<groupId>org.ow2.asm</groupId>
62+
<artifactId>asm</artifactId>
5863
</dependency>
5964
<dependency>
6065
<groupId>org.eclipse.sisu</groupId>
@@ -65,6 +70,7 @@ under the License.
6570
<dependency>
6671
<groupId>com.google.inject</groupId>
6772
<artifactId>guice</artifactId>
73+
<classifier>classes</classifier>
6874
<scope>test</scope>
6975
</dependency>
7076
<dependency>

maven-resolver-provider/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ under the License.
7171
<dependency>
7272
<groupId>com.google.inject</groupId>
7373
<artifactId>guice</artifactId>
74+
<classifier>classes</classifier>
7475
<optional>true</optional>
7576
<exclusions>
7677
<exclusion>

pom.xml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ under the License.
126126
<properties>
127127
<javaVersion>8</javaVersion>
128128
<version.sisu-maven-plugin>0.9.0.M3</version.sisu-maven-plugin>
129+
<asmVersion>9.8</asmVersion>
129130
<classWorldsVersion>2.9.0</classWorldsVersion>
130131
<commonsCliVersion>1.9.0</commonsCliVersion>
131132
<commonsIoVersion>2.19.0</commonsIoVersion>
@@ -240,6 +241,7 @@ under the License.
240241
<groupId>com.google.inject</groupId>
241242
<artifactId>guice</artifactId>
242243
<version>${guiceVersion}</version>
244+
<classifier>classes</classifier>
243245
<exclusions>
244246
<exclusion>
245247
<groupId>com.google.guava</groupId>
@@ -295,12 +297,23 @@ under the License.
295297
<groupId>javax.enterprise</groupId>
296298
<artifactId>cdi-api</artifactId>
297299
</exclusion>
300+
<exclusion>
301+
<groupId>org.eclipse.sisu</groupId>
302+
<artifactId>org.eclipse.sisu.inject</artifactId>
303+
</exclusion>
298304
</exclusions>
299305
</dependency>
300306
<dependency>
301307
<groupId>org.eclipse.sisu</groupId>
302308
<artifactId>org.eclipse.sisu.inject</artifactId>
303309
<version>${version.sisu-maven-plugin}</version>
310+
<classifier>no_asm</classifier>
311+
</dependency>
312+
<dependency>
313+
<groupId>org.ow2.asm</groupId>
314+
<artifactId>asm</artifactId>
315+
<version>${asmVersion}</version>
316+
<scope>runtime</scope>
304317
</dependency>
305318
<dependency>
306319
<groupId>javax.inject</groupId>
@@ -691,7 +704,7 @@ under the License.
691704
<artifactId>maven-enforcer-plugin</artifactId>
692705
<executions>
693706
<execution>
694-
<id>ensure-no-sonatype-cipher-and-sec-dispatcher</id>
707+
<id>ensure-no-banned-dependencies</id>
695708
<goals>
696709
<goal>enforce</goal>
697710
</goals>
@@ -702,8 +715,13 @@ under the License.
702715
<excludes>
703716
<exclude>org.sonatype.plexus:plexus-sec-dispatcher</exclude>
704717
<exclude>org.sonatype.plexus:plexus-cipher</exclude>
718+
<exclude>org.eclipse.sisu:org.eclipse.sisu.inject</exclude>
719+
<exclude>com.google.inject:guice</exclude>
705720
</excludes>
706-
<message>ensure no more org.sonatype.plexus:plexus-cipher and org.sonatype.plexus:plexus-sec-dispatcher.</message>
721+
<includes>
722+
<include>org.eclipse.sisu:org.eclipse.sisu.inject:*:*:*:no_asm</include>
723+
<include>com.google.inject:guice:*:*:*:classes</include>
724+
</includes>
707725
</bannedDependencies>
708726
</rules>
709727
<fail>true</fail>

0 commit comments

Comments
 (0)