Skip to content

Commit 0070c02

Browse files
committed
Align guice with Maven
Also aling some other (transitive) dependencies that are enlisted.
1 parent 145588b commit 0070c02

File tree

4 files changed

+15
-7
lines changed

4 files changed

+15
-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
@@ -108,6 +108,7 @@
108108
<dependency>
109109
<groupId>com.google.inject</groupId>
110110
<artifactId>guice</artifactId>
111+
<classifier>classes</classifier>
111112
<optional>true</optional>
112113
</dependency>
113114
<dependency>

maven-resolver-impl/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
<dependency>
6464
<groupId>com.google.inject</groupId>
6565
<artifactId>guice</artifactId>
66+
<classifier>classes</classifier>
6667
<scope>provided</scope>
6768
<optional>true</optional>
6869
</dependency>

pom.xml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
<maven.site.path>resolver-archives/resolver-LATEST</maven.site.path>
105105
<checkstyle.violation.ignore>None</checkstyle.violation.ignore>
106106
<sisuVersion>0.9.0.M4</sisuVersion>
107-
<guiceVersion>6.0.0</guiceVersion>
107+
<guiceVersion>5.1.0</guiceVersion>
108108
<slf4jVersion>2.0.17</slf4jVersion>
109109
<testcontainersVersion>1.21.1</testcontainersVersion>
110110
<bouncycastleVersion>1.81</bouncycastleVersion>
@@ -272,17 +272,17 @@
272272
<groupId>org.eclipse.sisu</groupId>
273273
<artifactId>org.eclipse.sisu.plexus</artifactId>
274274
<version>${sisuVersion}</version>
275-
<exclusions>
276-
<exclusion>
277-
<groupId>javax.enterprise</groupId>
278-
<artifactId>cdi-api</artifactId>
279-
</exclusion>
280-
</exclusions>
281275
</dependency>
282276
<dependency>
283277
<groupId>com.google.inject</groupId>
284278
<artifactId>guice</artifactId>
285279
<version>${guiceVersion}</version>
280+
<classifier>classes</classifier>
281+
</dependency>
282+
<dependency>
283+
<groupId>com.google.guava</groupId>
284+
<artifactId>guava</artifactId>
285+
<version>33.4.8-jre</version>
286286
</dependency>
287287

288288
<dependency>
@@ -314,6 +314,11 @@
314314
<artifactId>bcpg-jdk18on</artifactId>
315315
<version>${bouncycastleVersion}</version>
316316
</dependency>
317+
<dependency>
318+
<groupId>org.bouncycastle</groupId>
319+
<artifactId>bcpkix-jdk18on</artifactId>
320+
<version>${bouncycastleVersion}</version>
321+
</dependency>
317322
<dependency>
318323
<groupId>org.bouncycastle</groupId>
319324
<artifactId>bcprov-jdk18on</artifactId>

0 commit comments

Comments
 (0)