diff options
| author | Håkon Hallingstad <hakon@verizonmedia.com> | 2021-06-22 13:01:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-22 13:01:17 +0200 |
| commit | d0adc4b2bcaaefb063b83e441376ef0c07f57a84 (patch) | |
| tree | dbb500fef8c9403dcfedf43f00132ec76f4c8baa /controller-server/pom.xml | |
| parent | 120d872163ddaedb7ea0b0c8a335e7c784c86ff7 (diff) | |
| parent | 89c9ae74e5aa065981ea55fe326369df64219c6b (diff) | |
Merge pull request #18362 from vespa-engine/bjorncs/revert
Revert "Use provided apache http client bundle from container" [run-systemtest] MERGEOK
Diffstat (limited to 'controller-server/pom.xml')
| -rw-r--r-- | controller-server/pom.xml | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/controller-server/pom.xml b/controller-server/pom.xml index 3673e3cb9f9..0c05f7d70bb 100644 --- a/controller-server/pom.xml +++ b/controller-server/pom.xml @@ -20,13 +20,6 @@ <!-- provided --> <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>container-apache-http-client-bundle</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>controller-api</artifactId> <version>${project.version}</version> @@ -135,6 +128,16 @@ </dependency> <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </dependency> + + <dependency> <groupId>com.auth0</groupId> <artifactId>java-jwt</artifactId> <exclusions> |