diff options
| author | gjoranv <gv@verizonmedia.com> | 2020-01-25 23:22:17 +0100 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2020-01-28 20:11:18 +0100 |
| commit | 475b3f9d2e05842c359dbee18baee620084d34da (patch) | |
| tree | d53aaadb1b8fffe52bcc04ae939176986adf6949 | |
| parent | 9e7313708c0aac16bda48cced4c4d011a19e3f51 (diff) | |
Exclude httpclient from container-disc (really container-core)
- httpclient has been added in compile scope to container-core
for the metrics/v2 api, and is not provided runtime by jdisc.
- Add htpclient in compile scope in 'application', as it is now
needed on the class path for application based tests.
(Because the MetricsV2Handler is always set up)
| -rw-r--r-- | application/pom.xml | 2 | ||||
| -rw-r--r-- | container-dev/pom.xml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/application/pom.xml b/application/pom.xml index 7bcda0ce386..d173fec19cf 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -119,8 +119,8 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <scope>test</scope> </dependency> + <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>testutil</artifactId> diff --git a/container-dev/pom.xml b/container-dev/pom.xml index a7217d05315..738a4cc8700 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -106,6 +106,10 @@ <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </exclusion> </exclusions> </dependency> <dependency> |