Skip to content

Commit 80cb4e9

Browse files
committed
fix(deps): force mailapi v2 in citrus-openapi
detected incompatibility in `citrus-openapi` dependency, whenever `citrus-mail` is also available on the classpath. the source of the problem is the transitive dependency `com.sun.mail:mailapi`, which was present in two versions. with this commits, citrusframework/citrus-simulator#315 is finally mergeable.
1 parent 253adbf commit 80cb4e9

File tree

76 files changed

+58
-2504
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+58
-2504
lines changed

connectors/citrus-jbang-connector/src/test/resources/log4j2-test.xml

Lines changed: 0 additions & 55 deletions
This file was deleted.

connectors/citrus-jbang-connector/src/test/resources/org/citrusframework/context/citrus-unit-context.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.

connectors/citrus-jbang-connector/src/test/resources/org/citrusframework/jbang/xml/jbang-test.xml

Lines changed: 0 additions & 36 deletions
This file was deleted.

connectors/citrus-jbang-connector/src/test/resources/org/citrusframework/jbang/yaml/jbang-test.yaml

Lines changed: 0 additions & 25 deletions
This file was deleted.

connectors/citrus-openapi/pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,17 @@
4949
<groupId>com.atlassian.oai</groupId>
5050
<artifactId>swagger-request-validator-core</artifactId>
5151
</dependency>
52+
53+
<!--
54+
Include mail API (and API only!) so com.atlassian.oai:swagger-request-validator-core builds correctly.
55+
Note that this is a legacy dependency and should not be managed globally.
56+
-->
57+
<dependency>
58+
<groupId>javax.mail</groupId>
59+
<artifactId>javax.mail-api</artifactId>
60+
<version>1.6.2</version>
61+
</dependency>
62+
5263
<dependency>
5364
<groupId>com.fasterxml.jackson.datatype</groupId>
5465
<artifactId>jackson-datatype-jsr310</artifactId>

connectors/citrus-testcontainers/src/test/resources/log4j2-test.xml

Lines changed: 0 additions & 55 deletions
This file was deleted.

connectors/citrus-testcontainers/src/test/resources/org/citrusframework/context/citrus-unit-context.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.

connectors/citrus-testcontainers/src/test/resources/org/citrusframework/testcontainers/integration/compose/compose.yaml

Lines changed: 0 additions & 7 deletions
This file was deleted.

connectors/citrus-testcontainers/src/test/resources/org/citrusframework/testcontainers/integration/compose/html/index.html

Lines changed: 0 additions & 21 deletions
This file was deleted.

connectors/citrus-testcontainers/src/test/resources/org/citrusframework/testcontainers/xml/compose-test.xml

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)