From f625417a582d399f13d8b26b52bb1e4003cac4d1 Mon Sep 17 00:00:00 2001 From: Tim Vernum Date: Wed, 8 Jun 2022 14:13:27 +1000 Subject: [PATCH 1/5] Update http client version Moves a few Apache HTTP client dependencies to their latest version - httpclient -> 4.5.13 - httpasyncclient -> 4.1.5 - httpcore -> 4.4.13 --- build-tools-internal/version.properties | 6 +++--- client/rest/licenses/httpasyncclient-4.1.4.jar.sha1 | 1 - client/rest/licenses/httpasyncclient-4.1.5.jar.sha1 | 1 + client/rest/licenses/httpclient-4.5.10.jar.sha1 | 1 - client/rest/licenses/httpclient-4.5.13.jar.sha1 | 1 + client/rest/licenses/httpcore-4.4.12.jar.sha1 | 1 - client/rest/licenses/httpcore-4.4.13.jar.sha1 | 1 + client/rest/licenses/httpcore-nio-4.4.12.jar.sha1 | 1 - client/rest/licenses/httpcore-nio-4.4.13.jar.sha1 | 1 + client/sniffer/licenses/httpclient-4.5.10.jar.sha1 | 1 - client/sniffer/licenses/httpclient-4.5.13.jar.sha1 | 1 + client/sniffer/licenses/httpcore-4.4.12.jar.sha1 | 1 - client/sniffer/licenses/httpcore-4.4.13.jar.sha1 | 1 + modules/ingest-common/licenses/httpclient-4.5.10.jar.sha1 | 1 - modules/ingest-common/licenses/httpclient-4.5.13.jar.sha1 | 1 + modules/ingest-common/licenses/httpcore-4.4.12.jar.sha1 | 1 - modules/ingest-common/licenses/httpcore-4.4.13.jar.sha1 | 1 + modules/repository-s3/licenses/httpclient-4.5.10.jar.sha1 | 1 - modules/repository-s3/licenses/httpclient-4.5.13.jar.sha1 | 1 + modules/repository-s3/licenses/httpcore-4.4.12.jar.sha1 | 1 - modules/repository-s3/licenses/httpcore-4.4.13.jar.sha1 | 1 + modules/repository-url/licenses/httpclient-4.5.10.jar.sha1 | 1 - modules/repository-url/licenses/httpclient-4.5.13.jar.sha1 | 1 + modules/repository-url/licenses/httpcore-4.4.12.jar.sha1 | 1 - modules/repository-url/licenses/httpcore-4.4.13.jar.sha1 | 1 + .../licenses/httpclient-4.5.10.jar.sha1 | 1 - .../licenses/httpclient-4.5.13.jar.sha1 | 1 + .../licenses/httpcore-4.4.12.jar.sha1 | 1 - .../licenses/httpcore-4.4.13.jar.sha1 | 1 + plugins/discovery-ec2/licenses/httpclient-4.5.10.jar.sha1 | 1 - plugins/discovery-ec2/licenses/httpclient-4.5.13.jar.sha1 | 1 + plugins/discovery-ec2/licenses/httpcore-4.4.12.jar.sha1 | 1 - plugins/discovery-ec2/licenses/httpcore-4.4.13.jar.sha1 | 1 + x-pack/plugin/core/licenses/httpasyncclient-4.1.4.jar.sha1 | 1 - x-pack/plugin/core/licenses/httpasyncclient-4.1.5.jar.sha1 | 1 + x-pack/plugin/core/licenses/httpclient-4.5.10.jar.sha1 | 1 - x-pack/plugin/core/licenses/httpclient-4.5.13.jar.sha1 | 1 + x-pack/plugin/core/licenses/httpcore-4.4.12.jar.sha1 | 1 - x-pack/plugin/core/licenses/httpcore-4.4.13.jar.sha1 | 1 + x-pack/plugin/core/licenses/httpcore-nio-4.4.12.jar.sha1 | 1 - x-pack/plugin/core/licenses/httpcore-nio-4.4.13.jar.sha1 | 1 + .../licenses/httpclient-cache-4.5.10.jar.sha1 | 1 - .../licenses/httpclient-cache-4.5.13.jar.sha1 | 1 + .../security/licenses/httpclient-cache-4.5.10.jar.sha1 | 1 - .../security/licenses/httpclient-cache-4.5.13.jar.sha1 | 1 + 45 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 client/rest/licenses/httpasyncclient-4.1.4.jar.sha1 create mode 100644 client/rest/licenses/httpasyncclient-4.1.5.jar.sha1 delete mode 100644 client/rest/licenses/httpclient-4.5.10.jar.sha1 create mode 100644 client/rest/licenses/httpclient-4.5.13.jar.sha1 delete mode 100644 client/rest/licenses/httpcore-4.4.12.jar.sha1 create mode 100644 client/rest/licenses/httpcore-4.4.13.jar.sha1 delete mode 100644 client/rest/licenses/httpcore-nio-4.4.12.jar.sha1 create mode 100644 client/rest/licenses/httpcore-nio-4.4.13.jar.sha1 delete mode 100644 client/sniffer/licenses/httpclient-4.5.10.jar.sha1 create mode 100644 client/sniffer/licenses/httpclient-4.5.13.jar.sha1 delete mode 100644 client/sniffer/licenses/httpcore-4.4.12.jar.sha1 create mode 100644 client/sniffer/licenses/httpcore-4.4.13.jar.sha1 delete mode 100644 modules/ingest-common/licenses/httpclient-4.5.10.jar.sha1 create mode 100644 modules/ingest-common/licenses/httpclient-4.5.13.jar.sha1 delete mode 100644 modules/ingest-common/licenses/httpcore-4.4.12.jar.sha1 create mode 100644 modules/ingest-common/licenses/httpcore-4.4.13.jar.sha1 delete mode 100644 modules/repository-s3/licenses/httpclient-4.5.10.jar.sha1 create mode 100644 modules/repository-s3/licenses/httpclient-4.5.13.jar.sha1 delete mode 100644 modules/repository-s3/licenses/httpcore-4.4.12.jar.sha1 create mode 100644 modules/repository-s3/licenses/httpcore-4.4.13.jar.sha1 delete mode 100644 modules/repository-url/licenses/httpclient-4.5.10.jar.sha1 create mode 100644 modules/repository-url/licenses/httpclient-4.5.13.jar.sha1 delete mode 100644 modules/repository-url/licenses/httpcore-4.4.12.jar.sha1 create mode 100644 modules/repository-url/licenses/httpcore-4.4.13.jar.sha1 delete mode 100644 plugins/discovery-azure-classic/licenses/httpclient-4.5.10.jar.sha1 create mode 100644 plugins/discovery-azure-classic/licenses/httpclient-4.5.13.jar.sha1 delete mode 100644 plugins/discovery-azure-classic/licenses/httpcore-4.4.12.jar.sha1 create mode 100644 plugins/discovery-azure-classic/licenses/httpcore-4.4.13.jar.sha1 delete mode 100644 plugins/discovery-ec2/licenses/httpclient-4.5.10.jar.sha1 create mode 100644 plugins/discovery-ec2/licenses/httpclient-4.5.13.jar.sha1 delete mode 100644 plugins/discovery-ec2/licenses/httpcore-4.4.12.jar.sha1 create mode 100644 plugins/discovery-ec2/licenses/httpcore-4.4.13.jar.sha1 delete mode 100644 x-pack/plugin/core/licenses/httpasyncclient-4.1.4.jar.sha1 create mode 100644 x-pack/plugin/core/licenses/httpasyncclient-4.1.5.jar.sha1 delete mode 100644 x-pack/plugin/core/licenses/httpclient-4.5.10.jar.sha1 create mode 100644 x-pack/plugin/core/licenses/httpclient-4.5.13.jar.sha1 delete mode 100644 x-pack/plugin/core/licenses/httpcore-4.4.12.jar.sha1 create mode 100644 x-pack/plugin/core/licenses/httpcore-4.4.13.jar.sha1 delete mode 100644 x-pack/plugin/core/licenses/httpcore-nio-4.4.12.jar.sha1 create mode 100644 x-pack/plugin/core/licenses/httpcore-nio-4.4.13.jar.sha1 delete mode 100644 x-pack/plugin/identity-provider/licenses/httpclient-cache-4.5.10.jar.sha1 create mode 100644 x-pack/plugin/identity-provider/licenses/httpclient-cache-4.5.13.jar.sha1 delete mode 100644 x-pack/plugin/security/licenses/httpclient-cache-4.5.10.jar.sha1 create mode 100644 x-pack/plugin/security/licenses/httpclient-cache-4.5.13.jar.sha1 diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties index 2fc146b75d62c..406262d0eb588 100644 --- a/build-tools-internal/version.properties +++ b/build-tools-internal/version.properties @@ -36,9 +36,9 @@ opensaml = 4.0.1 randomizedrunner = 2.7.7 junit = 4.12 junit5 = 5.7.1 -httpclient = 4.5.10 -httpcore = 4.4.12 -httpasyncclient = 4.1.4 +httpclient = 4.5.13 +httpcore = 4.4.13 +httpasyncclient = 4.1.5 commonslogging = 1.1.3 commonscodec = 1.14 hamcrest = 2.1 diff --git a/client/rest/licenses/httpasyncclient-4.1.4.jar.sha1 b/client/rest/licenses/httpasyncclient-4.1.4.jar.sha1 deleted file mode 100644 index 8360ab45c7ab3..0000000000000 --- a/client/rest/licenses/httpasyncclient-4.1.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f3a3240681faae3fa46b573a4c7e50cec9db0d86 \ No newline at end of file diff --git a/client/rest/licenses/httpasyncclient-4.1.5.jar.sha1 b/client/rest/licenses/httpasyncclient-4.1.5.jar.sha1 new file mode 100644 index 0000000000000..366a9e31069a6 --- /dev/null +++ b/client/rest/licenses/httpasyncclient-4.1.5.jar.sha1 @@ -0,0 +1 @@ +cd18227f1eb8e9a263286c1d7362ceb24f6f9b32 \ No newline at end of file diff --git a/client/rest/licenses/httpclient-4.5.10.jar.sha1 b/client/rest/licenses/httpclient-4.5.10.jar.sha1 deleted file mode 100644 index b708efd0dd57f..0000000000000 --- a/client/rest/licenses/httpclient-4.5.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5 \ No newline at end of file diff --git a/client/rest/licenses/httpclient-4.5.13.jar.sha1 b/client/rest/licenses/httpclient-4.5.13.jar.sha1 new file mode 100644 index 0000000000000..3281e21595b39 --- /dev/null +++ b/client/rest/licenses/httpclient-4.5.13.jar.sha1 @@ -0,0 +1 @@ +e5f6cae5ca7ecaac1ec2827a9e2d65ae2869cada \ No newline at end of file diff --git a/client/rest/licenses/httpcore-4.4.12.jar.sha1 b/client/rest/licenses/httpcore-4.4.12.jar.sha1 deleted file mode 100644 index 3c046171b30da..0000000000000 --- a/client/rest/licenses/httpcore-4.4.12.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -21ebaf6d532bc350ba95bd81938fa5f0e511c132 \ No newline at end of file diff --git a/client/rest/licenses/httpcore-4.4.13.jar.sha1 b/client/rest/licenses/httpcore-4.4.13.jar.sha1 new file mode 100644 index 0000000000000..0cb64863b9760 --- /dev/null +++ b/client/rest/licenses/httpcore-4.4.13.jar.sha1 @@ -0,0 +1 @@ +853b96d3afbb7bf8cc303fe27ee96836a10c1834 \ No newline at end of file diff --git a/client/rest/licenses/httpcore-nio-4.4.12.jar.sha1 b/client/rest/licenses/httpcore-nio-4.4.12.jar.sha1 deleted file mode 100644 index 4de932dc5aca0..0000000000000 --- a/client/rest/licenses/httpcore-nio-4.4.12.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -84cd29eca842f31db02987cfedea245af020198b \ No newline at end of file diff --git a/client/rest/licenses/httpcore-nio-4.4.13.jar.sha1 b/client/rest/licenses/httpcore-nio-4.4.13.jar.sha1 new file mode 100644 index 0000000000000..7629b7d5584c8 --- /dev/null +++ b/client/rest/licenses/httpcore-nio-4.4.13.jar.sha1 @@ -0,0 +1 @@ +3f897ace4d7f10f0ea6a58f524a3b105dd483653 \ No newline at end of file diff --git a/client/sniffer/licenses/httpclient-4.5.10.jar.sha1 b/client/sniffer/licenses/httpclient-4.5.10.jar.sha1 deleted file mode 100644 index b708efd0dd57f..0000000000000 --- a/client/sniffer/licenses/httpclient-4.5.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5 \ No newline at end of file diff --git a/client/sniffer/licenses/httpclient-4.5.13.jar.sha1 b/client/sniffer/licenses/httpclient-4.5.13.jar.sha1 new file mode 100644 index 0000000000000..3281e21595b39 --- /dev/null +++ b/client/sniffer/licenses/httpclient-4.5.13.jar.sha1 @@ -0,0 +1 @@ +e5f6cae5ca7ecaac1ec2827a9e2d65ae2869cada \ No newline at end of file diff --git a/client/sniffer/licenses/httpcore-4.4.12.jar.sha1 b/client/sniffer/licenses/httpcore-4.4.12.jar.sha1 deleted file mode 100644 index 3c046171b30da..0000000000000 --- a/client/sniffer/licenses/httpcore-4.4.12.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -21ebaf6d532bc350ba95bd81938fa5f0e511c132 \ No newline at end of file diff --git a/client/sniffer/licenses/httpcore-4.4.13.jar.sha1 b/client/sniffer/licenses/httpcore-4.4.13.jar.sha1 new file mode 100644 index 0000000000000..0cb64863b9760 --- /dev/null +++ b/client/sniffer/licenses/httpcore-4.4.13.jar.sha1 @@ -0,0 +1 @@ +853b96d3afbb7bf8cc303fe27ee96836a10c1834 \ No newline at end of file diff --git a/modules/ingest-common/licenses/httpclient-4.5.10.jar.sha1 b/modules/ingest-common/licenses/httpclient-4.5.10.jar.sha1 deleted file mode 100644 index b708efd0dd57f..0000000000000 --- a/modules/ingest-common/licenses/httpclient-4.5.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5 \ No newline at end of file diff --git a/modules/ingest-common/licenses/httpclient-4.5.13.jar.sha1 b/modules/ingest-common/licenses/httpclient-4.5.13.jar.sha1 new file mode 100644 index 0000000000000..3281e21595b39 --- /dev/null +++ b/modules/ingest-common/licenses/httpclient-4.5.13.jar.sha1 @@ -0,0 +1 @@ +e5f6cae5ca7ecaac1ec2827a9e2d65ae2869cada \ No newline at end of file diff --git a/modules/ingest-common/licenses/httpcore-4.4.12.jar.sha1 b/modules/ingest-common/licenses/httpcore-4.4.12.jar.sha1 deleted file mode 100644 index 3c046171b30da..0000000000000 --- a/modules/ingest-common/licenses/httpcore-4.4.12.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -21ebaf6d532bc350ba95bd81938fa5f0e511c132 \ No newline at end of file diff --git a/modules/ingest-common/licenses/httpcore-4.4.13.jar.sha1 b/modules/ingest-common/licenses/httpcore-4.4.13.jar.sha1 new file mode 100644 index 0000000000000..0cb64863b9760 --- /dev/null +++ b/modules/ingest-common/licenses/httpcore-4.4.13.jar.sha1 @@ -0,0 +1 @@ +853b96d3afbb7bf8cc303fe27ee96836a10c1834 \ No newline at end of file diff --git a/modules/repository-s3/licenses/httpclient-4.5.10.jar.sha1 b/modules/repository-s3/licenses/httpclient-4.5.10.jar.sha1 deleted file mode 100644 index b708efd0dd57f..0000000000000 --- a/modules/repository-s3/licenses/httpclient-4.5.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5 \ No newline at end of file diff --git a/modules/repository-s3/licenses/httpclient-4.5.13.jar.sha1 b/modules/repository-s3/licenses/httpclient-4.5.13.jar.sha1 new file mode 100644 index 0000000000000..3281e21595b39 --- /dev/null +++ b/modules/repository-s3/licenses/httpclient-4.5.13.jar.sha1 @@ -0,0 +1 @@ +e5f6cae5ca7ecaac1ec2827a9e2d65ae2869cada \ No newline at end of file diff --git a/modules/repository-s3/licenses/httpcore-4.4.12.jar.sha1 b/modules/repository-s3/licenses/httpcore-4.4.12.jar.sha1 deleted file mode 100644 index 3c046171b30da..0000000000000 --- a/modules/repository-s3/licenses/httpcore-4.4.12.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -21ebaf6d532bc350ba95bd81938fa5f0e511c132 \ No newline at end of file diff --git a/modules/repository-s3/licenses/httpcore-4.4.13.jar.sha1 b/modules/repository-s3/licenses/httpcore-4.4.13.jar.sha1 new file mode 100644 index 0000000000000..0cb64863b9760 --- /dev/null +++ b/modules/repository-s3/licenses/httpcore-4.4.13.jar.sha1 @@ -0,0 +1 @@ +853b96d3afbb7bf8cc303fe27ee96836a10c1834 \ No newline at end of file diff --git a/modules/repository-url/licenses/httpclient-4.5.10.jar.sha1 b/modules/repository-url/licenses/httpclient-4.5.10.jar.sha1 deleted file mode 100644 index b708efd0dd57f..0000000000000 --- a/modules/repository-url/licenses/httpclient-4.5.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5 \ No newline at end of file diff --git a/modules/repository-url/licenses/httpclient-4.5.13.jar.sha1 b/modules/repository-url/licenses/httpclient-4.5.13.jar.sha1 new file mode 100644 index 0000000000000..3281e21595b39 --- /dev/null +++ b/modules/repository-url/licenses/httpclient-4.5.13.jar.sha1 @@ -0,0 +1 @@ +e5f6cae5ca7ecaac1ec2827a9e2d65ae2869cada \ No newline at end of file diff --git a/modules/repository-url/licenses/httpcore-4.4.12.jar.sha1 b/modules/repository-url/licenses/httpcore-4.4.12.jar.sha1 deleted file mode 100644 index 3c046171b30da..0000000000000 --- a/modules/repository-url/licenses/httpcore-4.4.12.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -21ebaf6d532bc350ba95bd81938fa5f0e511c132 \ No newline at end of file diff --git a/modules/repository-url/licenses/httpcore-4.4.13.jar.sha1 b/modules/repository-url/licenses/httpcore-4.4.13.jar.sha1 new file mode 100644 index 0000000000000..0cb64863b9760 --- /dev/null +++ b/modules/repository-url/licenses/httpcore-4.4.13.jar.sha1 @@ -0,0 +1 @@ +853b96d3afbb7bf8cc303fe27ee96836a10c1834 \ No newline at end of file diff --git a/plugins/discovery-azure-classic/licenses/httpclient-4.5.10.jar.sha1 b/plugins/discovery-azure-classic/licenses/httpclient-4.5.10.jar.sha1 deleted file mode 100644 index b708efd0dd57f..0000000000000 --- a/plugins/discovery-azure-classic/licenses/httpclient-4.5.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5 \ No newline at end of file diff --git a/plugins/discovery-azure-classic/licenses/httpclient-4.5.13.jar.sha1 b/plugins/discovery-azure-classic/licenses/httpclient-4.5.13.jar.sha1 new file mode 100644 index 0000000000000..3281e21595b39 --- /dev/null +++ b/plugins/discovery-azure-classic/licenses/httpclient-4.5.13.jar.sha1 @@ -0,0 +1 @@ +e5f6cae5ca7ecaac1ec2827a9e2d65ae2869cada \ No newline at end of file diff --git a/plugins/discovery-azure-classic/licenses/httpcore-4.4.12.jar.sha1 b/plugins/discovery-azure-classic/licenses/httpcore-4.4.12.jar.sha1 deleted file mode 100644 index 3c046171b30da..0000000000000 --- a/plugins/discovery-azure-classic/licenses/httpcore-4.4.12.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -21ebaf6d532bc350ba95bd81938fa5f0e511c132 \ No newline at end of file diff --git a/plugins/discovery-azure-classic/licenses/httpcore-4.4.13.jar.sha1 b/plugins/discovery-azure-classic/licenses/httpcore-4.4.13.jar.sha1 new file mode 100644 index 0000000000000..0cb64863b9760 --- /dev/null +++ b/plugins/discovery-azure-classic/licenses/httpcore-4.4.13.jar.sha1 @@ -0,0 +1 @@ +853b96d3afbb7bf8cc303fe27ee96836a10c1834 \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/httpclient-4.5.10.jar.sha1 b/plugins/discovery-ec2/licenses/httpclient-4.5.10.jar.sha1 deleted file mode 100644 index b708efd0dd57f..0000000000000 --- a/plugins/discovery-ec2/licenses/httpclient-4.5.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5 \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/httpclient-4.5.13.jar.sha1 b/plugins/discovery-ec2/licenses/httpclient-4.5.13.jar.sha1 new file mode 100644 index 0000000000000..3281e21595b39 --- /dev/null +++ b/plugins/discovery-ec2/licenses/httpclient-4.5.13.jar.sha1 @@ -0,0 +1 @@ +e5f6cae5ca7ecaac1ec2827a9e2d65ae2869cada \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/httpcore-4.4.12.jar.sha1 b/plugins/discovery-ec2/licenses/httpcore-4.4.12.jar.sha1 deleted file mode 100644 index 3c046171b30da..0000000000000 --- a/plugins/discovery-ec2/licenses/httpcore-4.4.12.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -21ebaf6d532bc350ba95bd81938fa5f0e511c132 \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/httpcore-4.4.13.jar.sha1 b/plugins/discovery-ec2/licenses/httpcore-4.4.13.jar.sha1 new file mode 100644 index 0000000000000..0cb64863b9760 --- /dev/null +++ b/plugins/discovery-ec2/licenses/httpcore-4.4.13.jar.sha1 @@ -0,0 +1 @@ +853b96d3afbb7bf8cc303fe27ee96836a10c1834 \ No newline at end of file diff --git a/x-pack/plugin/core/licenses/httpasyncclient-4.1.4.jar.sha1 b/x-pack/plugin/core/licenses/httpasyncclient-4.1.4.jar.sha1 deleted file mode 100644 index 8360ab45c7ab3..0000000000000 --- a/x-pack/plugin/core/licenses/httpasyncclient-4.1.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f3a3240681faae3fa46b573a4c7e50cec9db0d86 \ No newline at end of file diff --git a/x-pack/plugin/core/licenses/httpasyncclient-4.1.5.jar.sha1 b/x-pack/plugin/core/licenses/httpasyncclient-4.1.5.jar.sha1 new file mode 100644 index 0000000000000..366a9e31069a6 --- /dev/null +++ b/x-pack/plugin/core/licenses/httpasyncclient-4.1.5.jar.sha1 @@ -0,0 +1 @@ +cd18227f1eb8e9a263286c1d7362ceb24f6f9b32 \ No newline at end of file diff --git a/x-pack/plugin/core/licenses/httpclient-4.5.10.jar.sha1 b/x-pack/plugin/core/licenses/httpclient-4.5.10.jar.sha1 deleted file mode 100644 index b708efd0dd57f..0000000000000 --- a/x-pack/plugin/core/licenses/httpclient-4.5.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5 \ No newline at end of file diff --git a/x-pack/plugin/core/licenses/httpclient-4.5.13.jar.sha1 b/x-pack/plugin/core/licenses/httpclient-4.5.13.jar.sha1 new file mode 100644 index 0000000000000..3281e21595b39 --- /dev/null +++ b/x-pack/plugin/core/licenses/httpclient-4.5.13.jar.sha1 @@ -0,0 +1 @@ +e5f6cae5ca7ecaac1ec2827a9e2d65ae2869cada \ No newline at end of file diff --git a/x-pack/plugin/core/licenses/httpcore-4.4.12.jar.sha1 b/x-pack/plugin/core/licenses/httpcore-4.4.12.jar.sha1 deleted file mode 100644 index 3c046171b30da..0000000000000 --- a/x-pack/plugin/core/licenses/httpcore-4.4.12.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -21ebaf6d532bc350ba95bd81938fa5f0e511c132 \ No newline at end of file diff --git a/x-pack/plugin/core/licenses/httpcore-4.4.13.jar.sha1 b/x-pack/plugin/core/licenses/httpcore-4.4.13.jar.sha1 new file mode 100644 index 0000000000000..0cb64863b9760 --- /dev/null +++ b/x-pack/plugin/core/licenses/httpcore-4.4.13.jar.sha1 @@ -0,0 +1 @@ +853b96d3afbb7bf8cc303fe27ee96836a10c1834 \ No newline at end of file diff --git a/x-pack/plugin/core/licenses/httpcore-nio-4.4.12.jar.sha1 b/x-pack/plugin/core/licenses/httpcore-nio-4.4.12.jar.sha1 deleted file mode 100644 index 4de932dc5aca0..0000000000000 --- a/x-pack/plugin/core/licenses/httpcore-nio-4.4.12.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -84cd29eca842f31db02987cfedea245af020198b \ No newline at end of file diff --git a/x-pack/plugin/core/licenses/httpcore-nio-4.4.13.jar.sha1 b/x-pack/plugin/core/licenses/httpcore-nio-4.4.13.jar.sha1 new file mode 100644 index 0000000000000..7629b7d5584c8 --- /dev/null +++ b/x-pack/plugin/core/licenses/httpcore-nio-4.4.13.jar.sha1 @@ -0,0 +1 @@ +3f897ace4d7f10f0ea6a58f524a3b105dd483653 \ No newline at end of file diff --git a/x-pack/plugin/identity-provider/licenses/httpclient-cache-4.5.10.jar.sha1 b/x-pack/plugin/identity-provider/licenses/httpclient-cache-4.5.10.jar.sha1 deleted file mode 100644 index 3b1d8db643114..0000000000000 --- a/x-pack/plugin/identity-provider/licenses/httpclient-cache-4.5.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b195778247a21e980cb9f80c41364dc0c38feaef \ No newline at end of file diff --git a/x-pack/plugin/identity-provider/licenses/httpclient-cache-4.5.13.jar.sha1 b/x-pack/plugin/identity-provider/licenses/httpclient-cache-4.5.13.jar.sha1 new file mode 100644 index 0000000000000..08647c1ca2010 --- /dev/null +++ b/x-pack/plugin/identity-provider/licenses/httpclient-cache-4.5.13.jar.sha1 @@ -0,0 +1 @@ +4abee263cbc9edc12393212ca3a7c89af0755b1f \ No newline at end of file diff --git a/x-pack/plugin/security/licenses/httpclient-cache-4.5.10.jar.sha1 b/x-pack/plugin/security/licenses/httpclient-cache-4.5.10.jar.sha1 deleted file mode 100644 index 3b1d8db643114..0000000000000 --- a/x-pack/plugin/security/licenses/httpclient-cache-4.5.10.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b195778247a21e980cb9f80c41364dc0c38feaef \ No newline at end of file diff --git a/x-pack/plugin/security/licenses/httpclient-cache-4.5.13.jar.sha1 b/x-pack/plugin/security/licenses/httpclient-cache-4.5.13.jar.sha1 new file mode 100644 index 0000000000000..08647c1ca2010 --- /dev/null +++ b/x-pack/plugin/security/licenses/httpclient-cache-4.5.13.jar.sha1 @@ -0,0 +1 @@ +4abee263cbc9edc12393212ca3a7c89af0755b1f \ No newline at end of file From 132680ca8eef7f84dea2d598cf22324a37901176 Mon Sep 17 00:00:00 2001 From: Tim Vernum Date: Thu, 16 Jun 2022 12:58:54 +1000 Subject: [PATCH 2/5] Reflect private suffix matching rules in tests Since https://github.com/apache/httpcomponents-client/pull/203 httpclient handles private suffix rules differently. This change updates RegisteredDomainProcessorTests to reflect those new rules --- .../common/RegisteredDomainProcessorTests.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/RegisteredDomainProcessorTests.java b/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/RegisteredDomainProcessorTests.java index f9d35b902c9d8..ebeaf15b692f5 100644 --- a/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/RegisteredDomainProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/RegisteredDomainProcessorTests.java @@ -44,23 +44,22 @@ public void testBasic() throws Exception { // Verify "com" is returned as the eTLD, for that FQDN or subdomain testRegisteredDomainProcessor(buildEvent("com"), "com", null, "com", null); testRegisteredDomainProcessor(buildEvent("example.com"), "example.com", "example.com", "com", null); - // Verify "googleapis.com" is returned as the eTLD, for that FQDN or subdomain - testRegisteredDomainProcessor(buildEvent("googleapis.com"), "googleapis.com", null, "googleapis.com", null); + testRegisteredDomainProcessor(buildEvent("googleapis.com"), "googleapis.com", "googleapis.com", "com", null); testRegisteredDomainProcessor( buildEvent("content-autofill.googleapis.com"), "content-autofill.googleapis.com", - "content-autofill.googleapis.com", "googleapis.com", - null + "com", + "content-autofill" ); - // Verify "global.ssl.fastly.net" is returned as the eTLD, for that FQDN or subdomain - testRegisteredDomainProcessor(buildEvent("global.ssl.fastly.net"), "global.ssl.fastly.net", null, "global.ssl.fastly.net", null); + // Verify "ssl.fastly.net" is returned as the eTLD, for that FQDN or subdomain + testRegisteredDomainProcessor(buildEvent("global.ssl.fastly.net"), "global.ssl.fastly.net", "global.ssl.fastly.net", "ssl.fastly.net", null); testRegisteredDomainProcessor( buildEvent("1.www.global.ssl.fastly.net"), "1.www.global.ssl.fastly.net", - "www.global.ssl.fastly.net", "global.ssl.fastly.net", - "1" + "ssl.fastly.net", + "1.www" ); } From 465ef0f316e0b58c5f4b54c40a6c5e1fe8395903 Mon Sep 17 00:00:00 2001 From: Tim Vernum Date: Thu, 16 Jun 2022 13:47:15 +1000 Subject: [PATCH 3/5] Spotless --- .../ingest/common/RegisteredDomainProcessorTests.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/RegisteredDomainProcessorTests.java b/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/RegisteredDomainProcessorTests.java index ebeaf15b692f5..4a70309421420 100644 --- a/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/RegisteredDomainProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/RegisteredDomainProcessorTests.java @@ -53,7 +53,13 @@ public void testBasic() throws Exception { "content-autofill" ); // Verify "ssl.fastly.net" is returned as the eTLD, for that FQDN or subdomain - testRegisteredDomainProcessor(buildEvent("global.ssl.fastly.net"), "global.ssl.fastly.net", "global.ssl.fastly.net", "ssl.fastly.net", null); + testRegisteredDomainProcessor( + buildEvent("global.ssl.fastly.net"), + "global.ssl.fastly.net", + "global.ssl.fastly.net", + "ssl.fastly.net", + null + ); testRegisteredDomainProcessor( buildEvent("1.www.global.ssl.fastly.net"), "1.www.global.ssl.fastly.net", From 50e6091a7fbfae643db4bca473188432353d1b9b Mon Sep 17 00:00:00 2001 From: Tim Vernum Date: Tue, 28 Jun 2022 11:57:11 +1000 Subject: [PATCH 4/5] Update docs/changelog/87491.yaml --- docs/changelog/87491.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 docs/changelog/87491.yaml diff --git a/docs/changelog/87491.yaml b/docs/changelog/87491.yaml new file mode 100644 index 0000000000000..8266560df5453 --- /dev/null +++ b/docs/changelog/87491.yaml @@ -0,0 +1,5 @@ +pr: 87491 +summary: Update http client version +area: "Infra/Core, Other" +type: enhancement +issues: [] From 647e11094fdff0385ae0f5ff28559a69375fecd1 Mon Sep 17 00:00:00 2001 From: Tim Vernum Date: Tue, 28 Jun 2022 16:21:32 +1000 Subject: [PATCH 5/5] Update changelog --- docs/changelog/87491.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/changelog/87491.yaml b/docs/changelog/87491.yaml index 8266560df5453..c018d4eed3c16 100644 --- a/docs/changelog/87491.yaml +++ b/docs/changelog/87491.yaml @@ -1,5 +1,5 @@ pr: 87491 -summary: Update http client version -area: "Infra/Core, Other" +summary: Update version of internal http client +area: "Infra/Core" type: enhancement issues: []