Skip to content

Commit 826c708

Browse files
aurelien-baudetaurelien-baudet
committed
misc(deps) Fix dependency convergence + test dependency convergence
1 parent c9da7d6 commit 826c708

File tree

6 files changed

+341
-34
lines changed

6 files changed

+341
-34
lines changed

‎ogham-core/pom.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,17 @@
7070
<artifactId>logback-classic</artifactId>
7171
</dependency>
7272

73+
<!-- Dependency convergence -->
74+
<!-- This is needed to enforce right versions in projects that use ogham -->
75+
<dependency>
76+
<groupId>org.javassist</groupId>
77+
<artifactId>javassist</artifactId>
78+
</dependency>
79+
<dependency>
80+
<groupId>com.google.guava</groupId>
81+
<artifactId>guava</artifactId>
82+
</dependency>
83+
7384
<!-- Tests -->
7485
<dependency>
7586
<groupId>fr.sii.ogham</groupId>

‎ogham-email-sendgrid-common/pom.xml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,10 @@
2525
<dependency>
2626
<groupId>com.sendgrid</groupId>
2727
<artifactId>sendgrid-java</artifactId>
28-
<exclusions>
29-
<!-- http-client imports mockito-core with compile scope... -->
30-
<exclusion>
31-
<groupId>org.mockito</groupId>
32-
<artifactId>mockito-core</artifactId>
33-
</exclusion>
34-
</exclusions>
3528
</dependency>
3629

37-
<!-- This is needed to force Jackson version in projects that uses ogham-test-utils -->
30+
<!-- Dependency convergence -->
31+
<!-- This is needed to enforce right versions in projects that use ogham -->
3832
<dependency>
3933
<groupId>com.fasterxml.jackson.core</groupId>
4034
<artifactId>jackson-core</artifactId>
@@ -47,6 +41,10 @@
4741
<groupId>com.fasterxml.jackson.core</groupId>
4842
<artifactId>jackson-databind</artifactId>
4943
</dependency>
44+
<dependency>
45+
<groupId>org.apache.httpcomponents</groupId>
46+
<artifactId>httpclient</artifactId>
47+
</dependency>
5048

5149
<!-- Tests -->
5250
<dependency>

‎ogham-template-thymeleaf-common/pom.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@
2727
<artifactId>thymeleaf</artifactId>
2828
</dependency>
2929

30+
<!-- Dependency convergence -->
31+
<!-- This is needed to enforce right versions in projects that use ogham -->
32+
<dependency>
33+
<groupId>org.javassist</groupId>
34+
<artifactId>javassist</artifactId>
35+
</dependency>
36+
3037
<!-- Tests -->
3138
<dependency>
3239
<groupId>fr.sii.ogham</groupId>

‎ogham-test-classpath/src/main/resources/standalone/maven/pom.xml.ftl‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,25 @@
7777
</execution>
7878
</executions>
7979
</plugin>
80+
<plugin>
81+
<groupId>org.apache.maven.plugins</groupId>
82+
<artifactId>maven-enforcer-plugin</artifactId>
83+
<version>3.0.0-M3</version>
84+
<executions>
85+
<execution>
86+
<id>enforce</id>
87+
<configuration>
88+
<rules>
89+
<dependencyConvergence />
90+
</rules>
91+
</configuration>
92+
<phase>validate</phase>
93+
<goals>
94+
<goal>enforce</goal>
95+
</goals>
96+
</execution>
97+
</executions>
98+
</plugin>
8099
</plugins>
81100
</build>
82101
</project>

‎ogham-test-utils/pom.xml‎

Lines changed: 49 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222
<groupId>commons-io</groupId>
2323
<artifactId>commons-io</artifactId>
2424
</dependency>
25-
<dependency>
26-
<groupId>junit</groupId>
27-
<artifactId>junit</artifactId>
28-
</dependency>
2925
<dependency>
3026
<groupId>org.junit.jupiter</groupId>
3127
<artifactId>junit-jupiter</artifactId>
@@ -54,11 +50,11 @@
5450
</dependency>
5551
<dependency>
5652
<groupId>com.icegreen</groupId>
57-
<artifactId>greenmail</artifactId>
53+
<artifactId>greenmail-junit4</artifactId>
5854
</dependency>
5955
<dependency>
6056
<groupId>com.icegreen</groupId>
61-
<artifactId>greenmail-junit4</artifactId>
57+
<artifactId>greenmail</artifactId>
6258
</dependency>
6359
<dependency>
6460
<groupId>com.icegreen</groupId>
@@ -80,6 +76,10 @@
8076
<groupId>com.fizzed</groupId>
8177
<artifactId>ch-smpp</artifactId>
8278
</dependency>
79+
<dependency>
80+
<groupId>com.github.tomakehurst</groupId>
81+
<artifactId>wiremock-jre8</artifactId>
82+
</dependency>
8383
<dependency>
8484
<groupId>org.xmlunit</groupId>
8585
<artifactId>xmlunit-core</artifactId>
@@ -88,10 +88,6 @@
8888
<groupId>uk.com.robust-it</groupId>
8989
<artifactId>cloning</artifactId>
9090
</dependency>
91-
<dependency>
92-
<groupId>com.github.tomakehurst</groupId>
93-
<artifactId>wiremock-jre8</artifactId>
94-
</dependency>
9591
<dependency>
9692
<groupId>org.spockframework</groupId>
9793
<artifactId>spock-core</artifactId>
@@ -101,16 +97,25 @@
10197
<artifactId>spring-boot-starter-test</artifactId>
10298
<scope>provided</scope>
10399
</dependency>
104-
<!-- This is needed to force guava version in projects that uses ogham-test-utils -->
105-
<dependency>
106-
<groupId>com.google.guava</groupId>
107-
<artifactId>guava</artifactId>
108-
</dependency>
109100
<dependency>
110101
<groupId>org.awaitility</groupId>
111102
<artifactId>awaitility</artifactId>
112103
</dependency>
113-
<!-- This is needed to force Jackson version in projects that uses ogham-test-utils -->
104+
105+
<!-- Dependency convergence -->
106+
<!-- This is needed to enforce right versions in projects that use ogham -->
107+
<dependency>
108+
<groupId>org.hamcrest</groupId>
109+
<artifactId>hamcrest-core</artifactId>
110+
</dependency>
111+
<dependency>
112+
<groupId>junit</groupId>
113+
<artifactId>junit</artifactId>
114+
</dependency>
115+
<dependency>
116+
<groupId>com.google.guava</groupId>
117+
<artifactId>guava</artifactId>
118+
</dependency>
114119
<dependency>
115120
<groupId>com.fasterxml.jackson.core</groupId>
116121
<artifactId>jackson-core</artifactId>
@@ -123,17 +128,40 @@
123128
<groupId>com.fasterxml.jackson.core</groupId>
124129
<artifactId>jackson-databind</artifactId>
125130
</dependency>
131+
<dependency>
132+
<groupId>org.slf4j</groupId>
133+
<artifactId>slf4j-api</artifactId>
134+
</dependency>
135+
<dependency>
136+
<groupId>org.objenesis</groupId>
137+
<artifactId>objenesis</artifactId>
138+
</dependency>
139+
<dependency>
140+
<groupId>org.conscrypt</groupId>
141+
<artifactId>conscrypt-openjdk-uber</artifactId>
142+
</dependency>
143+
<dependency>
144+
<groupId>org.apache.commons</groupId>
145+
<artifactId>commons-lang3</artifactId>
146+
</dependency>
147+
<dependency>
148+
<groupId>org.opentest4j</groupId>
149+
<artifactId>opentest4j</artifactId>
150+
</dependency>
151+
<dependency>
152+
<groupId>org.apache.httpcomponents</groupId>
153+
<artifactId>httpclient</artifactId>
154+
</dependency>
155+
<dependency>
156+
<groupId>com.sun.activation</groupId>
157+
<artifactId>jakarta.activation</artifactId>
158+
</dependency>
126159

127160
<!-- dependencies for testing -->
128161
<dependency>
129162
<groupId>org.junit.platform</groupId>
130163
<artifactId>junit-platform-testkit</artifactId>
131164
<scope>test</scope>
132165
</dependency>
133-
<dependency>
134-
<groupId>ch.qos.logback</groupId>
135-
<artifactId>logback-classic</artifactId>
136-
<scope>test</scope>
137-
</dependency>
138166
</dependencies>
139167
</project>

0 commit comments

Comments
 (0)