diff options
Diffstat (limited to 'vespa_jersey2/pom.xml')
| -rw-r--r-- | vespa_jersey2/pom.xml | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/vespa_jersey2/pom.xml b/vespa_jersey2/pom.xml index f8904378901..c27555ab3d6 100644 --- a/vespa_jersey2/pom.xml +++ b/vespa_jersey2/pom.xml @@ -20,6 +20,26 @@ <artifactId>javax.ws.rs-api</artifactId> </dependency> <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> + <artifactId>jersey-media-multipart</artifactId> + </dependency> + <dependency> <groupId>org.glassfish.jersey.ext</groupId> <artifactId>jersey-proxy-client</artifactId> </dependency> @@ -37,7 +57,9 @@ </dependency> <dependency> - <!-- TODO Vespa 8: Remove, contains packages imported by only one user app (March 2022) --> + <!-- 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 used by hosted Vespa + framework bundles, July 2021. --> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-server</artifactId> <exclusions> @@ -54,24 +76,6 @@ <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> </dependency> - - <dependency> - <!-- TODO: try to remove! Previously pulled in by jersey-media-json-jackson. --> - <groupId>com.fasterxml.jackson.jaxrs</groupId> - <artifactId>jackson-jaxrs-json-provider</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> </dependencies> <build> |