diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-05-02 13:55:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-02 13:55:49 +0200 |
| commit | ee785354b65e1599d1e547eeaaaad91f93e733bc (patch) | |
| tree | 1ee692b21e4c037673f508c7d62b3c099f793943 /configserver | |
| parent | 61daf5796ba727fb229f33fa8509d8529dcfbc7c (diff) | |
| parent | 94589122f8da483788d1a69d3f0e2f919fb226ee (diff) | |
Merge pull request #22374 from vespa-engine/jonmv/remove-last-controller-jersey-client
Jonmv/remove last controller jersey client [run-systemtest]
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/pom.xml | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/configserver/pom.xml b/configserver/pom.xml index 131e4503f6d..99307d1b2b8 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -189,39 +189,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> @@ -241,52 +213,6 @@ <version>${project.version}</version> </dependency> - <!-- Jersey, needed by orchestrator --> - <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - <scope>provided</scope> <!-- TODO: Vespa 8: Set to compile if we get rid of the javax.ws.rs-api bundle --> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-client</artifactId> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-server</artifactId> - <exclusions> - <exclusion> - <groupId>org.glassfish.jersey.media</groupId> - <artifactId>jersey-media-jaxb</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.ext</groupId> - <artifactId>jersey-proxy-client</artifactId> - </dependency> - <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. --> - <groupId>org.glassfish.jersey.media</groupId> - <artifactId>jersey-media-multipart</artifactId> - </dependency> - <!-- Jersey END --> - </dependencies> <build> <plugins> |