diff options
author | gjoranv <gv@verizonmedia.com> | 2022-03-29 13:30:58 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-29 13:30:58 +0200 |
commit | 84ba77ae7d59a04d6aa33cd1270af35cd1398e2d (patch) | |
tree | 1990ea50eab6f3f6dd28d0b8d382b3db977de976 /configserver/pom.xml | |
parent | 322e58f2f45288bb9522aff6ef434a24fee255f2 (diff) | |
parent | 81758a3041005db5be1eaebe9ed171177b08f39c (diff) |
Merge pull request #21859 from vespa-engine/remove-jersey-media-bundles_3
Remove jersey media bundles 3 [run-systemtest]
Diffstat (limited to 'configserver/pom.xml')
-rw-r--r-- | configserver/pom.xml | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/configserver/pom.xml b/configserver/pom.xml index 8e604b930f6..110099421d1 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -194,11 +194,39 @@ <scope>provided</scope> </dependency> <dependency> + <!-- Do not remove, as long as this is provided by jdisc and configserver uses jersey-client --> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <!-- Do not remove, as long as this is provided by jdisc and configserver uses jersey-client --> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> <scope>provided</scope> </dependency> <dependency> + <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> <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> </dependency> @@ -245,6 +273,17 @@ <dependency> <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-json-jackson</artifactId> + <exclusions> + <!-- Prevent embedding deps provided by jdisc --> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <!-- Not needed by configserver, but by controller. Also pulls in mimepull. --> @@ -260,6 +299,11 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>bundle-plugin</artifactId> <extensions>true</extensions> + <configuration> + <!-- TODO Vespa 8: remove importPackage when the jackson-jaxrs-json-provider bundle is no longer installed in jdisc --> + <!-- added to ensure using the same class as orchestrator, core-dump-reporter, provision-controller and controller-clients --> + <importPackage>com.fasterxml.jackson.jaxrs.json;version="[2.12.6,3)"</importPackage> + </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> |