Skip to content

Commit d2380a1

Browse files
committed
fix(deps): force mailapi v2 in citrus-openapi
detected incompatibility in `citrus-mail` dependency, whenever `citrus-openapi` is also available on the classpath. with this commits, citrusframework/citrus-simulator#315 is finally mergeable.
1 parent 253adbf commit d2380a1

File tree

3 files changed

+57
-14
lines changed

3 files changed

+57
-14
lines changed

connectors/citrus-openapi/pom.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,32 @@
4848
<dependency>
4949
<groupId>com.atlassian.oai</groupId>
5050
<artifactId>swagger-request-validator-core</artifactId>
51+
<exclusions>
52+
<exclusion>
53+
<groupId>com.sun.mail</groupId>
54+
<artifactId>mailapi</artifactId>
55+
</exclusion>
56+
</exclusions>
5157
</dependency>
58+
59+
<!--
60+
force com.sun.mail:mailapi to v2 major.
61+
citrusframework/citrus-simulator won't build otherwise.
62+
-->
63+
<dependency>
64+
<groupId>com.sun.mail</groupId>
65+
<artifactId>mailapi</artifactId>
66+
<version>2.0.2</version>
67+
</dependency>
68+
<!--
69+
on the other hand, include mail API (and API only!) so om.atlassian.oai:swagger-request-validator-core builds correctly.
70+
-->
71+
<dependency>
72+
<groupId>javax.mail</groupId>
73+
<artifactId>javax.mail-api</artifactId>
74+
<version>1.6.2</version>
75+
</dependency>
76+
5277
<dependency>
5378
<groupId>com.fasterxml.jackson.datatype</groupId>
5479
<artifactId>jackson-datatype-jsr310</artifactId>

endpoints/citrus-mail/pom.xml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<dependency>
4444
<groupId>org.citrusframework</groupId>
4545
<artifactId>citrus-base</artifactId>
46-
<version>${project.version}</version>
46+
<version>${project.version}</version>
4747
</dependency>
4848
<dependency>
4949
<groupId>org.citrusframework</groupId>
@@ -83,9 +83,21 @@
8383
<groupId>com.icegreen</groupId>
8484
<artifactId>greenmail</artifactId>
8585
</dependency>
86+
<dependency>
87+
<groupId>jakarta.activation</groupId>
88+
<artifactId>jakarta.activation-api</artifactId>
89+
</dependency>
90+
<dependency>
91+
<groupId>org.eclipse.angus</groupId>
92+
<artifactId>angus-activation</artifactId>
93+
</dependency>
94+
<dependency>
95+
<groupId>jakarta.mail</groupId>
96+
<artifactId>jakarta.mail-api</artifactId>
97+
</dependency>
8698
<dependency>
8799
<groupId>org.eclipse.angus</groupId>
88-
<artifactId>jakarta.mail</artifactId>
100+
<artifactId>angus-mail</artifactId>
89101
</dependency>
90102

91103
<!-- Test scoped dependencies -->

pom.xml

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
<ascii-table-version>1.8.0</ascii-table-version>
198198
<assertj.version>3.27.3</assertj.version>
199199
<awaitility.version>4.3.0</awaitility.version>
200-
<aws-java-sdk2.version>2.34.0</aws-java-sdk2.version>
200+
<aws-java-sdk2.version>2.34.2</aws-java-sdk2.version>
201201
<bouncycastle.version>1.82</bouncycastle.version>
202202
<byte.buddy.version>1.17.7</byte.buddy.version>
203203
<commons.dbcp2.version>2.13.0</commons.dbcp2.version>
@@ -220,19 +220,20 @@
220220
<jackson.version>2.20.0</jackson.version>
221221
<jackson.version.short>2.20</jackson.version.short>
222222
<jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
223-
<jakarta.activation.api.version>2.1.3</jakarta.activation.api.version>
224-
<jakarta.activation.version>2.0.1</jakarta.activation.version>
223+
<angus-activation.version>2.0.3</angus-activation.version>
224+
<jakarta-activation.version>2.0.1</jakarta-activation.version>
225+
<jakarta-activation-api.version>2.1.3</jakarta-activation-api.version>
225226
<jakarta.annotation-api.version>3.0.0</jakarta.annotation-api.version>
226227
<jakarta.jms-api.version>3.1.0</jakarta.jms-api.version>
227-
<jakarta.mail.version>2.0.4</jakarta.mail.version>
228+
<jakarta-mail.version>2.1.5</jakarta-mail.version>
228229
<jakarta.servlet-api.version>6.1.0</jakarta.servlet-api.version>
229230
<jakarta.validation.version>3.1.1</jakarta.validation.version>
230231
<jakarta.websocket-api.version>2.2.0</jakarta.websocket-api.version>
231232
<jakarta.xml.bind-api.version>4.0.4</jakarta.xml.bind-api.version>
232233
<jakarta.xml.soap-api.version>3.0.2</jakarta.xml.soap-api.version>
233234
<jansi.version>2.4.2</jansi.version>
234235
<javapoet.version>1.13.0</javapoet.version>
235-
<jaxb.version>4.0.5</jaxb.version>
236+
<jaxb.version>4.0.6</jaxb.version>
236237
<jetty.version>12.0.27</jetty.version>
237238
<jetty.websocket-api.version>2.0.0</jetty.websocket-api.version>
238239
<jsch.version>0.1.55</jsch.version>
@@ -270,7 +271,7 @@
270271
<sshd.version>2.15.0</sshd.version>
271272
<swagger.version>2.2.37</swagger.version>
272273
<swagger.parser.version>2.1.22</swagger.parser.version>
273-
<swagger-request-validator.version>2.45.1</swagger-request-validator.version>
274+
<swagger-request-validator.version>2.46.0</swagger-request-validator.version>
274275
<testcontainers.version>1.21.3</testcontainers.version>
275276
<testng.version>7.11.0</testng.version>
276277
<!-- bound to https://mvnrepository.com/artifact/io.fabric8/kubernetes-httpclient-vertx/${k8s.client.version} -->
@@ -306,12 +307,12 @@
306307
<dependency>
307308
<groupId>jakarta.activation</groupId>
308309
<artifactId>jakarta.activation-api</artifactId>
309-
<version>${jakarta.activation.api.version}</version>
310+
<version>${jakarta-activation-api.version}</version>
310311
</dependency>
311312
<dependency>
312313
<groupId>com.sun.activation</groupId>
313314
<artifactId>jakarta.activation</artifactId>
314-
<version>${jakarta.activation.version}</version>
315+
<version>${jakarta-activation.version}</version>
315316
</dependency>
316317

317318
<dependency>
@@ -861,13 +862,18 @@
861862
<version>${greenmail.version}</version>
862863
</dependency>
863864
<dependency>
864-
<groupId>org.eclipse.angus</groupId>
865-
<artifactId>jakarta.mail</artifactId>
866-
<version>${jakarta.mail.version}</version>
865+
<groupId>jakarta.mail</groupId>
866+
<artifactId>jakarta.mail-api</artifactId>
867+
<version>${jakarta-mail.version}</version>
867868
</dependency>
868869
<dependency>
869870
<groupId>org.eclipse.angus</groupId>
870871
<artifactId>angus-activation</artifactId>
872+
<version>${angus-activation.version}</version>
873+
</dependency>
874+
<dependency>
875+
<groupId>org.eclipse.angus</groupId>
876+
<artifactId>angus-mail</artifactId>
871877
<version>${angus-mail.version}</version>
872878
</dependency>
873879

@@ -1649,7 +1655,7 @@
16491655
<dependency>
16501656
<groupId>jakarta.activation</groupId>
16511657
<artifactId>jakarta.activation-api</artifactId>
1652-
<version>${jakarta.activation.api.version}</version>
1658+
<version>${jakarta-activation-api.version}</version>
16531659
</dependency>
16541660
<dependency>
16551661
<groupId>jakarta.xml.bind</groupId>

0 commit comments

Comments
 (0)