aboutsummaryrefslogtreecommitdiffstats
path: root/vespa_jersey2
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2021-05-07 17:46:15 +0200
committergjoranv <gv@verizonmedia.com>2021-05-07 17:46:15 +0200
commite32879d98197e1707fd4c952b8a30eac2ce47b45 (patch)
tree77d32cd84df5a0d1c9f61646985311ea614562ea /vespa_jersey2
parenta598403c2ed15b68c6f7dc63882fa03bdf44b60f (diff)
Move exclusion of jakarta from container-dev to vespa_jersey2
Diffstat (limited to 'vespa_jersey2')
-rw-r--r--vespa_jersey2/pom.xml12
1 files changed, 12 insertions, 0 deletions
diff --git a/vespa_jersey2/pom.xml b/vespa_jersey2/pom.xml
index 61777d745f1..c39b92cd371 100644
--- a/vespa_jersey2/pom.xml
+++ b/vespa_jersey2/pom.xml
@@ -30,6 +30,18 @@
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</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>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>