diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-06-22 15:21:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-22 15:21:24 +0200 |
| commit | e10441d52730b44ecd747ebef6465f98204966ad (patch) | |
| tree | bcc24c00897fc04264e3b0ad0fc3905df2805c14 /controller-server | |
| parent | 56d1fc206d10622094223a73a11909e2daef18eb (diff) | |
| parent | 2ea63e3c9f91411d5155d9403423eff79bef5d5f (diff) | |
Merge pull request #18366 from vespa-engine/bjorncs/reapply
Reapply "Use provided apache http client bundle from container" [run-systemtest]
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/pom.xml | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/controller-server/pom.xml b/controller-server/pom.xml index 0c05f7d70bb..3673e3cb9f9 100644 --- a/controller-server/pom.xml +++ b/controller-server/pom.xml @@ -20,6 +20,13 @@ <!-- 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> @@ -128,16 +135,6 @@ </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> |