Skip to content

Commit 7094bf8

Browse files
Align guice version with Maven
- downgrade to Guice 5.1.0 with classifier "classes" - add enforcer with banned guice without classes classifier
1 parent b758518 commit 7094bf8

File tree

8 files changed

+36
-7
lines changed

8 files changed

+36
-7
lines changed

maven-resolver-connector-basic/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
<dependency>
6363
<groupId>com.google.inject</groupId>
6464
<artifactId>guice</artifactId>
65+
<classifier>classes</classifier>
6566
<scope>test</scope>
6667
</dependency>
6768
<dependency>

maven-resolver-demos/maven-resolver-demo-snippets/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@
8686
<dependency>
8787
<groupId>com.google.inject</groupId>
8888
<artifactId>guice</artifactId>
89+
<classifier>classes</classifier>
8990
<optional>true</optional>
9091
</dependency>
9192
<dependency>

maven-resolver-impl/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
<dependency>
7777
<groupId>com.google.inject</groupId>
7878
<artifactId>guice</artifactId>
79+
<classifier>classes</classifier>
7980
<scope>provided</scope>
8081
<optional>true</optional>
8182
</dependency>

maven-resolver-transport-classpath/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
<dependency>
5454
<groupId>com.google.inject</groupId>
5555
<artifactId>guice</artifactId>
56+
<classifier>classes</classifier>
5657
<scope>test</scope>
5758
</dependency>
5859
<dependency>

maven-resolver-transport-file/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
<dependency>
5050
<groupId>com.google.inject</groupId>
5151
<artifactId>guice</artifactId>
52+
<classifier>classes</classifier>
5253
<scope>test</scope>
5354
</dependency>
5455
<dependency>

maven-resolver-transport-http/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
<dependency>
9797
<groupId>com.google.inject</groupId>
9898
<artifactId>guice</artifactId>
99+
<classifier>classes</classifier>
99100
<scope>test</scope>
100101
</dependency>
101102
<dependency>

maven-resolver-transport-wagon/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
<dependency>
8080
<groupId>com.google.inject</groupId>
8181
<artifactId>guice</artifactId>
82+
<classifier>classes</classifier>
8283
<scope>test</scope>
8384
</dependency>
8485
<dependency>

pom.xml

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@
9090
<maven.site.path>resolver-archives/resolver-LATEST-1.x</maven.site.path>
9191
<checkstyle.violation.ignore>None</checkstyle.violation.ignore>
9292
<sisuVersion>0.9.0.M4</sisuVersion>
93-
<guiceVersion>6.0.0</guiceVersion>
93+
<!-- the same version as in Maven 3.9.x -->
94+
<guiceVersion>5.1.0</guiceVersion>
9495
<slf4jVersion>1.7.36</slf4jVersion>
9596
<!-- used by supplier and demo only -->
9697
<mavenVersion>3.9.10</mavenVersion>
@@ -216,17 +217,12 @@
216217
<groupId>org.eclipse.sisu</groupId>
217218
<artifactId>org.eclipse.sisu.plexus</artifactId>
218219
<version>${sisuVersion}</version>
219-
<exclusions>
220-
<exclusion>
221-
<groupId>javax.enterprise</groupId>
222-
<artifactId>cdi-api</artifactId>
223-
</exclusion>
224-
</exclusions>
225220
</dependency>
226221
<dependency>
227222
<groupId>com.google.inject</groupId>
228223
<artifactId>guice</artifactId>
229224
<version>${guiceVersion}</version>
225+
<classifier>classes</classifier>
230226
</dependency>
231227
<dependency>
232228
<groupId>com.google.guava</groupId>
@@ -508,6 +504,32 @@
508504
</plugins>
509505
</pluginManagement>
510506
<plugins>
507+
<plugin>
508+
<groupId>org.apache.maven.plugins</groupId>
509+
<artifactId>maven-enforcer-plugin</artifactId>
510+
<executions>
511+
<execution>
512+
<id>ensure-no-guice-with-asm</id>
513+
<goals>
514+
<goal>enforce</goal>
515+
</goals>
516+
<configuration>
517+
<rules>
518+
<bannedDependencies>
519+
<excludes>
520+
<!-- we use com.google.inject:classes:guice -->
521+
<exclude>com.google.inject:guice:*</exclude>
522+
</excludes>
523+
<includes>
524+
<include>com.google.inject:guice:*:jar:*:classes</include>
525+
</includes>
526+
<message>use guice without asm shaded in.</message>
527+
</bannedDependencies>
528+
</rules>
529+
</configuration>
530+
</execution>
531+
</executions>
532+
</plugin>
511533
<plugin>
512534
<groupId>biz.aQute.bnd</groupId>
513535
<artifactId>bnd-maven-plugin</artifactId>

0 commit comments

Comments
 (0)