diff options
| author | gjoranv <gv@verizonmedia.com> | 2021-07-19 15:48:28 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2021-07-19 15:48:28 +0200 |
| commit | dd4528e3abd3004105f889284148254a64287b5c (patch) | |
| tree | 84fbf87c319b364fe20237af7b179c640ee96754 | |
| parent | 9c4d4bf8b2854d02bea4208562cdace525e1f1e5 (diff) | |
Remove jersey-media-json-jackson dependency
.. and add back its transitive dep jackson-jaxrs-json-provider,
which is used by hosted vespa framework bundles.
| -rw-r--r-- | vespa_jersey2/pom.xml | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/vespa_jersey2/pom.xml b/vespa_jersey2/pom.xml index e89d8b57283..0aa2b0ad46e 100644 --- a/vespa_jersey2/pom.xml +++ b/vespa_jersey2/pom.xml @@ -21,22 +21,6 @@ </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> @@ -57,6 +41,25 @@ </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> + <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> <!-- Previously pulled in by jersey-container-servlet-core. Contains packages imported by hosted applications, July 2021. --> <groupId>javax.validation</groupId> |