summaryrefslogtreecommitdiffstats
path: root/controller-server/pom.xml
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@oath.com>2018-01-04 12:29:30 +0100
committerBjørn Christian Seime <bjorncs@oath.com>2018-01-04 12:29:30 +0100
commit7161cf3d9808daeb1531ef12e09c69df0ed80995 (patch)
tree6c100e57ebe68c43339d05585282a1b134e88bf9 /controller-server/pom.xml
parent8651b066e8ca6bf49c39d7761f938b6de8639c66 (diff)
Use httpclient artifact provided by JDisc
Diffstat (limited to 'controller-server/pom.xml')
-rw-r--r--controller-server/pom.xml10
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>