diff options
| author | gjoranv <gv@verizonmedia.com> | 2021-07-21 14:38:23 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2021-07-21 14:38:23 +0200 |
| commit | 4266f3f5095ad6c2671708b693e9de217ee61850 (patch) | |
| tree | 24aa84bb5465dc1a3913de12b5e0389ac66081a7 | |
| parent | 6a1fc15cbb6ed6ff8c63fc8d1043bf97a3d48ea6 (diff) | |
Do not install jersey-container-servlet and media-jaxb bundles.
| -rw-r--r-- | container-disc/pom.xml | 5 | ||||
| -rw-r--r-- | vespa_jersey2/pom.xml | 29 |
2 files changed, 22 insertions, 12 deletions
diff --git a/container-disc/pom.xml b/container-disc/pom.xml index b255b6af02a..d3beb67c2de 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -229,11 +229,8 @@ javax.ws.rs-api-${javax.ws.rs-api.version}.jar, jersey-client-${jersey2.version}.jar, jersey-common-${jersey2.version}.jar, - jersey-container-servlet-${jersey2.version}.jar, - jersey-container-servlet-core-${jersey2.version}.jar, - jersey-entity-filtering-${jersey2.version}.jar, <!-- new feature from 2.16, provided for convenience --> + jersey-entity-filtering-${jersey2.version}.jar, <!-- needed by 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 c39b92cd371..9d3c00aebd5 100644 --- a/vespa_jersey2/pom.xml +++ b/vespa_jersey2/pom.xml @@ -20,14 +20,6 @@ <artifactId>javax.ws.rs-api</artifactId> </dependency> <dependency> - <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-servlet-core</artifactId> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-servlet</artifactId> - </dependency> - <dependency> <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-json-jackson</artifactId> <exclusions> @@ -63,6 +55,27 @@ <groupId>com.fasterxml.jackson.datatype</groupId> <artifactId>jackson-datatype-jsr310</artifactId> </dependency> + + <dependency> + <!-- Previously pulled in by jersey-container-servlet-core. Contains packages imported by + jersey-entity-filtering, which is used by jersey-media-json-jackson, which is again useed by hosted Vespa + 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> + <!-- Previously pulled in by jersey-container-servlet-core. + Contains packages imported by hosted user applications, July 2021. --> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + </dependency> </dependencies> <build> |