diff options
| -rw-r--r-- | container-dev/pom.xml | 12 | ||||
| -rw-r--r-- | container-test/pom.xml | 12 | ||||
| -rw-r--r-- | vespa_jersey2/pom.xml | 12 |
3 files changed, 18 insertions, 18 deletions
diff --git a/container-dev/pom.xml b/container-dev/pom.xml index 06c68b52e67..cfe9c0a6d8e 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -104,18 +104,6 @@ <artifactId>vespa_jersey2</artifactId> <version>${project.version}</version> <type>pom</type> - <exclusions> - <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> - <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> - </exclusions> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> 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> 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> |