diff options
| author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-01-04 15:26:14 +0100 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@oath.com> | 2018-01-04 15:26:14 +0100 |
| commit | 580914705e9eeb08a1b995267d7e74df56d4b0fd (patch) | |
| tree | e33ebdc667392f8abc080f950c50c61cc80b70b3 /controller-server | |
| parent | 86b5cffd4ce022d42fb65ebf14546e6f1f360f49 (diff) | |
Revert "Use httpclient artifact provided by JDisc"
This reverts commit 7161cf3d9808daeb1531ef12e09c69df0ed80995.
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/pom.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/controller-server/pom.xml b/controller-server/pom.xml index d1535f0ff39..b033286b82a 100644 --- a/controller-server/pom.xml +++ b/controller-server/pom.xml @@ -109,6 +109,11 @@ </dependency> <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </dependency> + + <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>config-model-api</artifactId> <version>${project.version}</version> @@ -186,11 +191,6 @@ <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> </exclusion> - <!--Exclude Apache httpclient --> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </exclusion> </exclusions> </dependency> |