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 /filedistribution | |
| 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 'filedistribution')
| -rw-r--r-- | filedistribution/pom.xml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/filedistribution/pom.xml b/filedistribution/pom.xml index 8bfa85d8b16..e922d878dd7 100644 --- a/filedistribution/pom.xml +++ b/filedistribution/pom.xml @@ -20,6 +20,12 @@ <dependencies> <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>vespajlib</artifactId> <version>${project.version}</version> </dependency> @@ -58,10 +64,6 @@ <artifactId>airline</artifactId> </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </dependency> - <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </dependency> |