aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2023-01-04 17:00:35 +0100
committerGitHub <noreply@github.com>2023-01-04 17:00:35 +0100
commitbb6638634f5bec608f62d710c97b0b97f79fc07f (patch)
treee36494facf72b3dc445d32c61fb44497e33de060
parent91255325ec7029f4a7adfb9491500a2b1c6ec03a (diff)
parent25803af1bdd1a04a1ad4457b4d8d7702386ea058 (diff)
Merge pull request #25385 from vespa-engine/balder/controll-commons-codec
Enforce that we also get correct commons-codec in tentant-base and ot…
-rw-r--r--container-apache-http-client-bundle/pom.xml8
1 files changed, 5 insertions, 3 deletions
diff --git a/container-apache-http-client-bundle/pom.xml b/container-apache-http-client-bundle/pom.xml
index d2f70b91bb3..fa29043bf5f 100644
--- a/container-apache-http-client-bundle/pom.xml
+++ b/container-apache-http-client-bundle/pom.xml
@@ -43,17 +43,19 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
- <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <!-- Workaround for maven issue preventing correct version resolving for transitive dependencies in some cases -->
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
- <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>