diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-07-06 13:16:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-06 13:16:26 +0200 |
| commit | 67f953e2974e098c05365d4d45dd66d69254508c (patch) | |
| tree | 1e0b4bc7df27425413de7483b7eb3865bba7f21a /controller-server | |
| parent | d8f8be7f46b4faa3339d511bb747e5c44860569e (diff) | |
| parent | 766791025a34e6fad4f692387fd78f038aab0ac2 (diff) | |
Merge pull request #18547 from vespa-engine/bjorncs/apache-http-client-bundle
Bjorncs/apache http client bundle
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/pom.xml | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/controller-server/pom.xml b/controller-server/pom.xml index 0c05f7d70bb..a0d05588a0d 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> @@ -167,6 +164,14 @@ <scope>compile</scope> </dependency> + <dependency> + <!-- required by java-jwt --> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>${commons.codec.version}</version> + <scope>compile</scope> + </dependency> + <!-- test --> <dependency> |