diff options
| author | Harald Musum <musum@yahoo-inc.com> | 2018-01-04 12:31:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-04 12:31:43 +0100 |
| commit | 15b47111e575f4cfa97309a8a12e6406b3428fee (patch) | |
| tree | 6c100e57ebe68c43339d05585282a1b134e88bf9 | |
| parent | 8651b066e8ca6bf49c39d7761f938b6de8639c66 (diff) | |
| parent | 7161cf3d9808daeb1531ef12e09c69df0ed80995 (diff) | |
Merge pull request #4550 from vespa-engine/bjorncs/dont-bundle-httpclient
Use httpclient artifact provided by JDisc
| -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 b033286b82a..d1535f0ff39 100644 --- a/controller-server/pom.xml +++ b/controller-server/pom.xml @@ -109,11 +109,6 @@ </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> @@ -191,6 +186,11 @@ <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> |