diff options
| author | gjoranv <gv@verizonmedia.com> | 2021-05-01 17:47:56 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2021-05-01 23:46:23 +0200 |
| commit | 97801ce0bf8921478d65e389b75adb245af63f7d (patch) | |
| tree | 3077ba0e1d28ff32e0b9d0ef8b63456a6959bf9a | |
| parent | e3ba7773401be957ea99f65d5108608e61a34763 (diff) | |
Exclude jakarta artifacts that conflict or overlap
.. with jaxb/javax artifacts. The jakarta bind-api artifact makes
user projects that include vespa-http-client-extensions import
its version of javax.xml.bind (2.3.2), rather than the version
exported from jdisc (2.3).
- Note that, contrary to logic, we must also exclude it from
container-test to avoid user projects from getting it in scope
provided instead of (the correct) test scope.
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 2 | ||||
| -rw-r--r-- | container-dependencies-enforcer/pom.xml | 2 | ||||
| -rw-r--r-- | container-dev/pom.xml | 12 | ||||
| -rw-r--r-- | container-test/pom.xml | 12 |
4 files changed, 24 insertions, 4 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 8d1f257fca8..5065a7f1d52 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -96,8 +96,6 @@ <include>com.sun.xml.bind:jaxb-core:[${jaxb.version}]:jar:provided</include> <include>com.sun.xml.bind:jaxb-impl:[${jaxb.version}]:jar:provided</include> <include>commons-logging:commons-logging:[1.2]:jar:provided</include> - <include>jakarta.activation:jakarta.activation-api:[1.2.1]:jar:provided</include> - <include>jakarta.xml.bind:jakarta.xml.bind-api:[2.3.2]:jar:provided</include> <include>javax.annotation:javax.annotation-api:[${javax.annotation-api.version}]:jar:provided</include> <include>javax.inject:javax.inject:[${javax.inject.version}]:jar:provided</include> <include>javax.servlet:javax.servlet-api:[${javax.servlet-api.version}]:jar:provided</include> diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index ab2cfdda1a1..d692adac3c3 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -90,8 +90,6 @@ <include>com.sun.xml.bind:jaxb-core:[${jaxb.version}]:jar:provided</include> <include>com.sun.xml.bind:jaxb-impl:[${jaxb.version}]:jar:provided</include> <include>commons-logging:commons-logging:[1.2]:jar:provided</include> - <include>jakarta.activation:jakarta.activation-api:[1.2.1]:jar:provided</include> - <include>jakarta.xml.bind:jakarta.xml.bind-api:[2.3.2]:jar:provided</include> <include>javax.annotation:javax.annotation-api:[${javax.annotation-api.version}]:jar:provided</include> <include>javax.inject:javax.inject:[${javax.inject.version}]:jar:provided</include> <include>javax.servlet:javax.servlet-api:[${javax.servlet-api.version}]:jar:provided</include> diff --git a/container-dev/pom.xml b/container-dev/pom.xml index cfe9c0a6d8e..06c68b52e67 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -104,6 +104,18 @@ <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 3eebd64cc82..ee39fa7db3f 100644 --- a/container-test/pom.xml +++ b/container-test/pom.xml @@ -39,6 +39,18 @@ <dependency> <groupId>com.fasterxml.jackson.dataformat</groupId> <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 --> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>io.airlift</groupId> |