summaryrefslogtreecommitdiffstats
path: root/vespa_jersey2
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2022-05-30 16:09:18 +0200
committergjoranv <gv@verizonmedia.com>2022-05-30 16:09:18 +0200
commit5e5f13b710f16f77bc19bf2bc5372b60183b5ede (patch)
treec2eab7a64f4e4010911e33fb8d6b9db46c893ec3 /vespa_jersey2
parent55f9ac982da6f5c7b3a9dda3a5dcaadd2a05f122 (diff)
Add explicit jackson-module-jaxb-annotations to exclude jakarta.
- Necessary since jackson was upgraded from 2.12 to 2.13. - This will be removed for Vespa 8
Diffstat (limited to 'vespa_jersey2')
-rw-r--r--vespa_jersey2/pom.xml20
1 files changed, 19 insertions, 1 deletions
diff --git a/vespa_jersey2/pom.xml b/vespa_jersey2/pom.xml
index 23b3b1e6cd6..41a079e4ae3 100644
--- a/vespa_jersey2/pom.xml
+++ b/vespa_jersey2/pom.xml
@@ -52,7 +52,7 @@
</dependency>
<dependency>
- <!-- TODO: try to remove! Previously pulled in by jersey-media-json-jackson. -->
+ <!-- TODO Vespa 8: remove! Previously pulled in by jersey-media-json-jackson. -->
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<exclusions>
@@ -68,6 +68,24 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <!-- TODO Vespa 8: remove! Previously pulled in by jersey-media-json-jackson. -->
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jaxb-annotations</artifactId>
+ <exclusions>
+ <exclusion>
+ <!-- Conflicts with javax.activation:javax.activation-api:1.2.0, which is "exported" via jdisc_core. -->
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <!-- Conflicts with javax.xml.bind:jaxb-api:2.3, which is "exported" via jdisc_core.-->
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
</dependencies>
<build>