diff options
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 1 | ||||
| -rw-r--r-- | container-dependencies-enforcer/pom.xml | 1 | ||||
| -rw-r--r-- | container-dependency-versions/pom.xml | 5 | ||||
| -rw-r--r-- | container-disc/pom.xml | 1 | ||||
| -rw-r--r-- | vespa_jersey2/pom.xml | 6 |
5 files changed, 6 insertions, 8 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 11da20ad635..ab8c9b7d136 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -125,7 +125,6 @@ <include>org.glassfish.jersey.core:jersey-server:[${jersey2.version}]:jar:provided</include> <include>org.glassfish.jersey.ext:jersey-entity-filtering:[${jersey2.version}]:jar:provided</include> <include>org.glassfish.jersey.ext:jersey-proxy-client:[${jersey2.version}]:jar:provided</include> - <include>org.glassfish.jersey.media:jersey-media-jaxb:[${jersey2.version}]:jar:provided</include> <include>org.glassfish.jersey.media:jersey-media-json-jackson:[${jersey2.version}]:jar:provided</include> <include>org.glassfish.jersey.media:jersey-media-multipart:[${jersey2.version}]:jar:provided</include> <include>org.javassist:javassist:[${javassist.version}]:jar:provided</include> diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index ee0db90a49e..762318c8306 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -118,7 +118,6 @@ <include>org.glassfish.jersey.core:jersey-server:[${jersey2.version}]:jar:provided</include> <include>org.glassfish.jersey.ext:jersey-entity-filtering:[${jersey2.version}]:jar:provided</include> <include>org.glassfish.jersey.ext:jersey-proxy-client:[${jersey2.version}]:jar:provided</include> - <include>org.glassfish.jersey.media:jersey-media-jaxb:[${jersey2.version}]:jar:provided</include> <include>org.glassfish.jersey.media:jersey-media-json-jackson:[${jersey2.version}]:jar:provided</include> <include>org.glassfish.jersey.media:jersey-media-multipart:[${jersey2.version}]:jar:provided</include> <include>org.javassist:javassist:[${javassist.version}]:jar:provided</include> diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index b66def32df8..30af057b119 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -279,11 +279,6 @@ </dependency> <dependency> <groupId>org.glassfish.jersey.media</groupId> - <artifactId>jersey-media-jaxb</artifactId> - <version>${jersey2.version}</version> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-json-jackson</artifactId> <version>${jersey2.version}</version> </dependency> diff --git a/container-disc/pom.xml b/container-disc/pom.xml index f437f513276..5debf6c9c02 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -231,7 +231,6 @@ jersey-common-${jersey2.version}.jar, jersey-entity-filtering-${jersey2.version}.jar, <!-- needed by jersey-media-json-jackson --> jersey-guava-${jersey2.version}.jar, - jersey-media-jaxb-${jersey2.version}.jar, jersey-media-json-jackson-${jersey2.version}.jar, jersey-media-multipart-${jersey2.version}.jar, mimepull-${mimepull.version}.jar, <!-- needed by media-multipart --> diff --git a/vespa_jersey2/pom.xml b/vespa_jersey2/pom.xml index 5524323244e..5e869e7e769 100644 --- a/vespa_jersey2/pom.xml +++ b/vespa_jersey2/pom.xml @@ -62,6 +62,12 @@ framework bundles, July 2021. --> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-server</artifactId> + <exclusions> + <exclusion> + <groupId>org.glassfish.jersey.media</groupId> + <artifactId>jersey-media-jaxb</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> |