diff options
| author | gjoranv <gjoranv@gmail.com> | 2021-07-20 15:26:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-20 15:26:57 +0200 |
| commit | dca0a41ddb378d46515ecedb5b0ab5a1f66ffddf (patch) | |
| tree | 53a5e753ec09da4aadaa3ee4be0fa99eaedceca1 /vespa_jersey2 | |
| parent | d7eae574bb87ecf8c350819d3bec46baa5ee6e2b (diff) | |
Revert "Remove the jersey-server bundle and dependent bundles [run-systemtest]"
Diffstat (limited to 'vespa_jersey2')
| -rw-r--r-- | vespa_jersey2/pom.xml | 50 |
1 files changed, 24 insertions, 26 deletions
diff --git a/vespa_jersey2/pom.xml b/vespa_jersey2/pom.xml index 0aa2b0ad46e..c39b92cd371 100644 --- a/vespa_jersey2/pom.xml +++ b/vespa_jersey2/pom.xml @@ -20,31 +20,16 @@ <artifactId>javax.ws.rs-api</artifactId> </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> + <groupId>org.glassfish.jersey.containers</groupId> + <artifactId>jersey-container-servlet-core</artifactId> </dependency> <dependency> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-client</artifactId> + <groupId>org.glassfish.jersey.containers</groupId> + <artifactId>jersey-container-servlet</artifactId> </dependency> <dependency> - <groupId>com.fasterxml.jackson.datatype</groupId> - <artifactId>jackson-datatype-jdk8</artifactId> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.datatype</groupId> - <artifactId>jackson-datatype-jsr310</artifactId> - </dependency> - - <dependency> - <!-- Previously pulled in by jersey-media-json-jackson. Contains 'jackson.jaxrs' package imported - by routing-generator, controller-clients, provision-controller and core-dump-reporter, July 2021 --> - <groupId>com.fasterxml.jackson.jaxrs</groupId> - <artifactId>jackson-jaxrs-json-provider</artifactId> + <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. --> @@ -58,12 +43,25 @@ </exclusion> </exclusions> </dependency> - <dependency> - <!-- Previously pulled in by jersey-container-servlet-core. - Contains packages imported by hosted applications, July 2021. --> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> + <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> + <dependency> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-client</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.datatype</groupId> + <artifactId>jackson-datatype-jdk8</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.datatype</groupId> + <artifactId>jackson-datatype-jsr310</artifactId> </dependency> </dependencies> |