diff options
author | gjoranv <gv@verizonmedia.com> | 2021-05-07 17:46:15 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2021-05-07 17:46:15 +0200 |
commit | e32879d98197e1707fd4c952b8a30eac2ce47b45 (patch) | |
tree | 77d32cd84df5a0d1c9f61646985311ea614562ea /container-test | |
parent | a598403c2ed15b68c6f7dc63882fa03bdf44b60f (diff) |
Move exclusion of jakarta from container-dev to vespa_jersey2
Diffstat (limited to 'container-test')
-rw-r--r-- | container-test/pom.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/container-test/pom.xml b/container-test/pom.xml index ee39fa7db3f..efc2c273a02 100644 --- a/container-test/pom.xml +++ b/container-test/pom.xml @@ -41,15 +41,15 @@ <artifactId>jackson-dataformat-xml</artifactId> <exclusions> <exclusion> - <!-- See comment in container-dev pom --> - <groupId>jakarta.xml.bind</groupId> - <artifactId>jakarta.xml.bind-api</artifactId> - </exclusion> - <exclusion> - <!-- See comment in container-dev pom --> + <!-- 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> |