diff options
| author | gjoranv <gv@verizonmedia.com> | 2022-03-27 17:56:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-27 17:56:35 +0200 |
| commit | d2446288b218367203a0114031f9310b9efc862e (patch) | |
| tree | 0e8c55967f1c9dde1b086c19c2a8d1dd1b80a6ba /configserver/pom.xml | |
| parent | 622f4a6dd7efb68395bea524bcb846700defe346 (diff) | |
| parent | 1bdf88fa7b5d7d24ffeb11ee2c71f81ffc41d91b (diff) | |
Merge pull request #21835 from vespa-engine/remove-jersey-media-bundles_2
Remove jersey media bundles 2 [run-systemtest]
Diffstat (limited to 'configserver/pom.xml')
| -rw-r--r-- | configserver/pom.xml | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/configserver/pom.xml b/configserver/pom.xml index 8e604b930f6..c4e643a90cd 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. --> |