diff options
| author | Morten Tokle <morten.tokle@gmail.com> | 2018-01-04 15:40:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-04 15:40:11 +0100 |
| commit | f5f5222460ff5a65ecd7c2da81fecc049a0faecc (patch) | |
| tree | e9e79aedf053ed6bf1b5ee201ad2fbde83506d67 /controller-server/pom.xml | |
| parent | 15b47111e575f4cfa97309a8a12e6406b3428fee (diff) | |
| parent | 85a21591c08c719f628276c87c8ced385b078228 (diff) | |
Merge pull request #4551 from vespa-engine/bjorncs/osgi-painkiller
Bjorncs/osgi painkiller
Diffstat (limited to 'controller-server/pom.xml')
| -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> |