diff options
| author | Harald Musum <musum@verizonmedia.com> | 2022-03-27 19:26:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-27 19:26:24 +0200 |
| commit | 9b450373f8161019f21472056cbfb6020f101439 (patch) | |
| tree | 4eb616899a9ceb2f6a1c616a04cb5b5bd8429353 /configserver/pom.xml | |
| parent | d2446288b218367203a0114031f9310b9efc862e (diff) | |
| parent | 0ea0944f519e5db8683436296af6478841991e08 (diff) | |
Merge pull request #21840 from vespa-engine/revert-21835-remove-jersey-media-bundles_2v7.565.113
Revert "Remove jersey media bundles 2 [run-systemtest]"
Diffstat (limited to 'configserver/pom.xml')
| -rw-r--r-- | configserver/pom.xml | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/configserver/pom.xml b/configserver/pom.xml index c4e643a90cd..8e604b930f6 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -194,39 +194,11 @@ <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> @@ -273,17 +245,6 @@ <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. --> |