diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-01-03 18:00:56 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-01-03 18:00:56 +0100 |
commit | 84cc4552d15659f40e6c0e506f439f3b5db1e283 (patch) | |
tree | 085be03846ed3ea188eb0c75c6433f28ab3b722e | |
parent | 45eeeea9e72e5422c281092802e43b2ef4e10a31 (diff) |
Bump to latest stable apache http stack.
-rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 11 | ||||
-rw-r--r-- | parent/pom.xml | 9 | ||||
-rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 12 |
3 files changed, 17 insertions, 15 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 74339e33467..e6445943107 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -24,9 +24,10 @@ <bouncycastle.version>1.72</bouncycastle.version> <commons-codec.version>1.15</commons-codec.version> <felix.version>7.0.1</felix.version> - <httpclient5.version>5.1.3</httpclient5.version> - <httpclient.version>4.5.13</httpclient.version> - <httpcore.version>4.4.13</httpcore.version> + <httpclient5.version>5.1.4</httpclient5.version> + <httpcore5.version>5.1.5</httpcore5.version> + <httpclient.version>4.5.14</httpclient.version> + <httpcore.version>4.4.16</httpcore.version> <junit5.version>5.8.1</junit5.version> <!-- TODO: in parent this is named 'junit.version' --> <onnxruntime.version>1.12.1</onnxruntime.version> <!-- END parent/pom.xml --> @@ -192,8 +193,8 @@ <include>org.apache.felix:org.apache.felix.framework:${felix.version}:test</include> <include>org.apache.felix:org.apache.felix.log:1.0.1:test</include> <include>org.apache.httpcomponents.client5:httpclient5:${httpclient5.version}:test</include> - <include>org.apache.httpcomponents.core5:httpcore5:${httpclient5.version}:test</include> - <include>org.apache.httpcomponents.core5:httpcore5-h2:${httpclient5.version}:test</include> + <include>org.apache.httpcomponents.core5:httpcore5:${httpcore5.version}:test</include> + <include>org.apache.httpcomponents.core5:httpcore5-h2:${httpcore5.version}:test</include> <include>org.apache.httpcomponents:httpclient:${httpclient.version}:test</include> <include>org.apache.httpcomponents:httpcore:${httpcore.version}:test</include> <include>org.apache.httpcomponents:httpmime:${httpclient.version}:test</include> diff --git a/parent/pom.xml b/parent/pom.xml index 0bbcd332f1e..d1fc3e4f76a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -770,7 +770,7 @@ <dependency> <groupId>org.apache.httpcomponents.core5</groupId> <artifactId>httpcore5</artifactId> - <version>${apache.httpclient5.version}</version> + <version>${apache.httpcore5.version}</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -1090,9 +1090,10 @@ <airline.version>0.9</airline.version> <antlr.version>3.5.2</antlr.version> <antlr4.version>4.9.3</antlr4.version> - <apache.httpclient.version>4.5.13</apache.httpclient.version> - <apache.httpcore.version>4.4.13</apache.httpcore.version> - <apache.httpclient5.version>5.1.3</apache.httpclient5.version> <!-- WARNING: sync cloud-tenant-base-dependencies-enforcer/pom.xml --> + <apache.httpclient.version>4.5.14</apache.httpclient.version> + <apache.httpcore.version>4.4.16</apache.httpcore.version> + <apache.httpclient5.version>5.1.4</apache.httpclient5.version> <!-- WARNING: sync cloud-tenant-base-dependencies-enforcer/pom.xml --> + <apache.httpcore5.version>5.1.5</apache.httpcore5.version> <!-- WARNING: sync cloud-tenant-base-dependencies-enforcer/pom.xml --> <asm.version>9.3</asm.version> <!-- Athenz dependencies. Make sure these dependencies match those in Vespa's internal repositories --> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 3cbac91207e..abf1029d51c 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -92,12 +92,12 @@ org.apache.curator:curator-framework:5.3.0 org.apache.curator:curator-recipes:5.3.0 org.apache.felix:org.apache.felix.framework:7.0.1 org.apache.felix:org.apache.felix.log:1.0.1 -org.apache.httpcomponents:httpclient:4.5.13 -org.apache.httpcomponents:httpcore:4.4.13 -org.apache.httpcomponents:httpmime:4.5.13 -org.apache.httpcomponents.client5:httpclient5:5.1.3 -org.apache.httpcomponents.core5:httpcore5:5.1.3 -org.apache.httpcomponents.core5:httpcore5-h2:5.1.3 +org.apache.httpcomponents:httpclient:4.5.14 +org.apache.httpcomponents:httpcore:4.4.16 +org.apache.httpcomponents:httpmime:4.5.14 +org.apache.httpcomponents.client5:httpclient5:5.1.4 +org.apache.httpcomponents.core5:httpcore5:5.1.5 +org.apache.httpcomponents.core5:httpcore5-h2:5.1.5 org.apache.maven:maven-archiver:3.6.0 org.apache.maven:maven-artifact:3.8.6 org.apache.maven:maven-artifact-manager:2.2.1 |