diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-11-26 11:43:38 +0100 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-11-26 11:43:38 +0100 |
commit | 3838f731e99e2a24871b3a90eb40d18579a56e40 (patch) | |
tree | 7e07cd3a87782c3f1a025e25127c8cdf5e2039d7 /parent | |
parent | c2895954f3465b6cdda26c84ecb6a9d1fb8e4a0d (diff) | |
parent | 693277054fd2f122ae40aa011e848526fad8a64e (diff) |
Merge branch 'master' into revert-14062-revert-14057-hmusum/upgrade-to-curator-4
Diffstat (limited to 'parent')
-rw-r--r-- | parent/pom.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/parent/pom.xml b/parent/pom.xml index b3648ea52df..486f659e529 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -575,6 +575,11 @@ <version>${apache.httpcore.version}</version> </dependency> <dependency> + <groupId>org.apache.httpcomponents.client5</groupId> + <artifactId>httpclient5</artifactId> + <version>${apache.httpclient5.version}</version> + </dependency> + <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpmime</artifactId> <version>4.3.6</version> @@ -749,6 +754,7 @@ <antlr4.version>4.5</antlr4.version> <apache.httpclient.version>4.5.12</apache.httpclient.version> <apache.httpcore.version>4.4.13</apache.httpcore.version> + <apache.httpclient5.version>5.0.3</apache.httpclient5.version> <asm.version>7.0</asm.version> <!-- Athenz dependencies. Make sure these dependencies match those in Vespa's internal repositories --> <athenz.version>1.8.49</athenz.version> |