diff options
| author | gjoranv <gv@verizonmedia.com> | 2022-03-28 02:15:35 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2022-03-28 21:55:44 +0200 |
| commit | 6b142d105fff21bdd9b5f5a116d9a7f9d9aa697f (patch) | |
| tree | aaea790343e7f84844e15a0dba9f9cc9f8ddc625 /orchestrator | |
| parent | ca814dad4b4435a636fad5fbd6aef73bb1ed1c22 (diff) | |
Add explicit dep to jackson-jaxrs-json-provider
- This bundle will be removed from vespa_jersey2 soon
Diffstat (limited to 'orchestrator')
| -rw-r--r-- | orchestrator/pom.xml | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/orchestrator/pom.xml b/orchestrator/pom.xml index 5dd35467739..839342574d5 100644 --- a/orchestrator/pom.xml +++ b/orchestrator/pom.xml @@ -17,6 +17,24 @@ <name>${project.artifactId}</name> <dependencies> <dependency> + <!-- Provided by the configserver bundle --> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + <scope>provided</scope> + <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>com.yahoo.vespa</groupId> <artifactId>container-dev</artifactId> <version>${project.version}</version> @@ -93,6 +111,7 @@ <scope>provided</scope> </dependency> <dependency> + <!-- Provided by the configserver bundle --> <groupId>org.glassfish.jersey.ext</groupId> <artifactId>jersey-proxy-client</artifactId> <scope>provided</scope> |