From 09af5184cc097d36d10ea2b418b17d4d252cb5de Mon Sep 17 00:00:00 2001
From: Peter Zhu <zhujiaxi@amazon.com>
Date: Tue, 4 Mar 2025 19:19:37 -0500
Subject: [PATCH] Bump software.amazon.awssdk from 2.20.86 to 2.30.31 (#17396)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: Andrew Ross <andrross@amazon.com>
---
 CHANGELOG.md                                  |   1 +
 gradle/libs.versions.toml                     |   3 +-
 plugins/crypto-kms/build.gradle               |   3 +
 .../licenses/annotations-2.20.86.jar.sha1     |   1 -
 .../licenses/annotations-2.30.31.jar.sha1     |   1 +
 .../licenses/apache-client-2.20.86.jar.sha1   |   1 -
 .../licenses/apache-client-2.30.31.jar.sha1   |   1 +
 .../crypto-kms/licenses/auth-2.20.86.jar.sha1 |   1 -
 .../crypto-kms/licenses/auth-2.30.31.jar.sha1 |   1 +
 .../licenses/aws-core-2.20.86.jar.sha1        |   1 -
 .../licenses/aws-core-2.30.31.jar.sha1        |   1 +
 .../aws-json-protocol-2.20.86.jar.sha1        |   1 -
 .../aws-json-protocol-2.30.31.jar.sha1        |   1 +
 .../aws-query-protocol-2.20.86.jar.sha1       |   1 -
 .../aws-query-protocol-2.30.31.jar.sha1       |   1 +
 .../licenses/endpoints-spi-2.20.86.jar.sha1   |   1 -
 .../licenses/endpoints-spi-2.30.31.jar.sha1   |   1 +
 .../licenses/http-auth-spi-2.30.31.jar.sha1   |   1 +
 .../licenses/http-auth-spi-LICENSE.txt        | 202 ++++++++++++++++++
 .../licenses/http-auth-spi-NOTICE.txt         |  14 ++
 .../licenses/http-client-spi-2.20.86.jar.sha1 |   1 -
 .../licenses/http-client-spi-2.30.31.jar.sha1 |   1 +
 .../licenses/identity-spi-2.30.31.jar.sha1    |   1 +
 .../licenses/identity-spi-LICENSE.txt         | 202 ++++++++++++++++++
 .../licenses/identity-spi-NOTICE.txt          |  14 ++
 .../licenses/json-utils-2.20.86.jar.sha1      |   1 -
 .../licenses/json-utils-2.30.31.jar.sha1      |   1 +
 .../crypto-kms/licenses/kms-2.20.86.jar.sha1  |   1 -
 .../crypto-kms/licenses/kms-2.30.31.jar.sha1  |   1 +
 .../licenses/metrics-spi-2.20.86.jar.sha1     |   1 -
 .../licenses/metrics-spi-2.30.31.jar.sha1     |   1 +
 .../licenses/profiles-2.20.86.jar.sha1        |   1 -
 .../licenses/profiles-2.30.31.jar.sha1        |   1 +
 .../licenses/protocol-core-2.20.86.jar.sha1   |   1 -
 .../licenses/protocol-core-2.30.31.jar.sha1   |   1 +
 .../licenses/regions-2.20.86.jar.sha1         |   1 -
 .../licenses/regions-2.30.31.jar.sha1         |   1 +
 .../licenses/retries-spi-2.30.31.jar.sha1     |   1 +
 .../licenses/retries-spi-LICENSE.txt          | 202 ++++++++++++++++++
 .../licenses/retries-spi-NOTICE.txt           |  14 ++
 .../licenses/sdk-core-2.20.86.jar.sha1        |   1 -
 .../licenses/sdk-core-2.30.31.jar.sha1        |   1 +
 .../third-party-jackson-core-2.20.86.jar.sha1 |   1 -
 .../third-party-jackson-core-2.30.31.jar.sha1 |   1 +
 .../licenses/utils-2.20.86.jar.sha1           |   1 -
 .../licenses/utils-2.30.31.jar.sha1           |   1 +
 .../crypto/kms/KmsServiceTests.java           |  17 +-
 plugins/discovery-ec2/build.gradle            |  13 +-
 .../licenses/annotations-2.20.86.jar.sha1     |   1 -
 .../licenses/annotations-2.30.31.jar.sha1     |   1 +
 .../licenses/apache-client-2.20.86.jar.sha1   |   1 -
 .../licenses/apache-client-2.30.31.jar.sha1   |   1 +
 .../licenses/auth-2.20.86.jar.sha1            |   1 -
 .../licenses/auth-2.30.31.jar.sha1            |   1 +
 .../licenses/aws-core-2.20.86.jar.sha1        |   1 -
 .../licenses/aws-core-2.30.31.jar.sha1        |   1 +
 .../licenses/aws-crt-0.35.0.jar.sha1          |   1 +
 .../licenses/aws-crt-LICENSE.txt              | 202 ++++++++++++++++++
 .../discovery-ec2/licenses/aws-crt-NOTICE.txt |  14 ++
 .../aws-json-protocol-2.20.86.jar.sha1        |   1 -
 .../aws-json-protocol-2.30.31.jar.sha1        |   1 +
 .../aws-query-protocol-2.20.86.jar.sha1       |   1 -
 .../aws-query-protocol-2.30.31.jar.sha1       |   1 +
 .../licenses/checksums-2.30.31.jar.sha1       |   1 +
 .../licenses/checksums-LICENSE.txt            | 202 ++++++++++++++++++
 .../licenses/checksums-NOTICE.txt             |  14 ++
 .../licenses/checksums-spi-2.30.31.jar.sha1   |   1 +
 .../licenses/checksums-spi-LICENSE.txt        | 202 ++++++++++++++++++
 .../licenses/checksums-spi-NOTICE.txt         |  14 ++
 .../licenses/ec2-2.20.86.jar.sha1             |   1 -
 .../licenses/ec2-2.30.31.jar.sha1             |   1 +
 .../licenses/endpoints-spi-2.20.86.jar.sha1   |   1 -
 .../licenses/endpoints-spi-2.30.31.jar.sha1   |   1 +
 .../licenses/http-auth-2.30.31.jar.sha1       |   1 +
 .../licenses/http-auth-LICENSE.txt            | 202 ++++++++++++++++++
 .../licenses/http-auth-NOTICE.txt             |  14 ++
 .../licenses/http-auth-aws-2.30.31.jar.sha1   |   1 +
 .../licenses/http-auth-aws-LICENSE.txt        | 202 ++++++++++++++++++
 .../licenses/http-auth-aws-NOTICE.txt         |  14 ++
 .../licenses/http-auth-spi-2.30.31.jar.sha1   |   1 +
 .../licenses/http-auth-spi-LICENSE.txt        | 202 ++++++++++++++++++
 .../licenses/http-auth-spi-NOTICE.txt         |  14 ++
 .../licenses/http-client-spi-2.20.86.jar.sha1 |   1 -
 .../licenses/http-client-spi-2.30.31.jar.sha1 |   1 +
 .../licenses/identity-spi-2.30.31.jar.sha1    |   1 +
 .../licenses/identity-spi-LICENSE.txt         | 202 ++++++++++++++++++
 .../licenses/identity-spi-NOTICE.txt          |  14 ++
 .../licenses/json-utils-2.20.86.jar.sha1      |   1 -
 .../licenses/json-utils-2.30.31.jar.sha1      |   1 +
 .../licenses/metrics-spi-2.20.86.jar.sha1     |   1 -
 .../licenses/metrics-spi-2.30.31.jar.sha1     |   1 +
 .../licenses/profiles-2.20.86.jar.sha1        |   1 -
 .../licenses/profiles-2.30.31.jar.sha1        |   1 +
 .../licenses/protocol-core-2.20.86.jar.sha1   |   1 -
 .../licenses/protocol-core-2.30.31.jar.sha1   |   1 +
 .../licenses/regions-2.20.86.jar.sha1         |   1 -
 .../licenses/regions-2.30.31.jar.sha1         |   1 +
 .../licenses/retries-2.30.31.jar.sha1         |   1 +
 .../licenses/retries-LICENSE.txt              | 202 ++++++++++++++++++
 .../discovery-ec2/licenses/retries-NOTICE.txt |  14 ++
 .../licenses/retries-spi-2.30.31.jar.sha1     |   1 +
 .../licenses/retries-spi-LICENSE.txt          | 202 ++++++++++++++++++
 .../licenses/retries-spi-NOTICE.txt           |  14 ++
 .../licenses/sdk-core-2.20.86.jar.sha1        |   1 -
 .../licenses/sdk-core-2.30.31.jar.sha1        |   1 +
 .../third-party-jackson-core-2.20.86.jar.sha1 |   1 -
 .../third-party-jackson-core-2.30.31.jar.sha1 |   1 +
 .../licenses/utils-2.20.86.jar.sha1           |   1 -
 .../licenses/utils-2.30.31.jar.sha1           |   1 +
 .../discovery/ec2/AwsEc2ServiceImplTests.java |   2 +-
 .../ec2/Ec2DiscoveryPluginTests.java          |  15 +-
 plugins/repository-s3/build.gradle            |  38 ++--
 .../licenses/annotations-2.20.86.jar.sha1     |   1 -
 .../licenses/annotations-2.30.31.jar.sha1     |   1 +
 .../licenses/apache-client-2.20.86.jar.sha1   |   1 -
 .../licenses/apache-client-2.30.31.jar.sha1   |   1 +
 .../licenses/auth-2.20.86.jar.sha1            |   1 -
 .../licenses/auth-2.30.31.jar.sha1            |   1 +
 .../licenses/aws-core-2.20.86.jar.sha1        |   1 -
 .../licenses/aws-core-2.30.31.jar.sha1        |   1 +
 .../licenses/aws-crt-0.35.0.jar.sha1          |   1 +
 .../licenses/aws-crt-LICENSE.txt              | 202 ++++++++++++++++++
 .../repository-s3/licenses/aws-crt-NOTICE.txt |  14 ++
 .../aws-json-protocol-2.20.86.jar.sha1        |   1 -
 .../aws-json-protocol-2.30.31.jar.sha1        |   1 +
 .../aws-query-protocol-2.20.86.jar.sha1       |   1 -
 .../aws-query-protocol-2.30.31.jar.sha1       |   1 +
 .../aws-xml-protocol-2.20.86.jar.sha1         |   1 -
 .../aws-xml-protocol-2.30.31.jar.sha1         |   1 +
 .../licenses/checksums-2.30.31.jar.sha1       |   1 +
 .../licenses/checksums-LICENSE.txt            | 202 ++++++++++++++++++
 .../licenses/checksums-NOTICE.txt             |  14 ++
 .../licenses/checksums-spi-2.30.31.jar.sha1   |   1 +
 .../licenses/checksums-spi-LICENSE.txt        | 202 ++++++++++++++++++
 .../licenses/checksums-spi-NOTICE.txt         |  14 ++
 .../licenses/endpoints-spi-2.20.86.jar.sha1   |   1 -
 .../licenses/endpoints-spi-2.30.31.jar.sha1   |   1 +
 .../licenses/http-auth-2.30.31.jar.sha1       |   1 +
 .../licenses/http-auth-LICENSE.txt            | 202 ++++++++++++++++++
 .../licenses/http-auth-NOTICE.txt             |  14 ++
 .../licenses/http-auth-aws-2.30.31.jar.sha1   |   1 +
 .../licenses/http-auth-aws-LICENSE.txt        | 202 ++++++++++++++++++
 .../licenses/http-auth-aws-NOTICE.txt         |  14 ++
 .../licenses/http-auth-spi-2.30.31.jar.sha1   |   1 +
 .../licenses/http-auth-spi-LICENSE.txt        | 202 ++++++++++++++++++
 .../licenses/http-auth-spi-NOTICE.txt         |  14 ++
 .../licenses/http-client-spi-2.20.86.jar.sha1 |   1 -
 .../licenses/http-client-spi-2.30.31.jar.sha1 |   1 +
 .../licenses/identity-spi-2.30.31.jar.sha1    |   1 +
 .../licenses/identity-spi-LICENSE.txt         | 202 ++++++++++++++++++
 .../licenses/identity-spi-NOTICE.txt          |  14 ++
 .../licenses/json-utils-2.20.86.jar.sha1      |   1 -
 .../licenses/json-utils-2.30.31.jar.sha1      |   1 +
 .../licenses/metrics-spi-2.20.86.jar.sha1     |   1 -
 .../licenses/metrics-spi-2.30.31.jar.sha1     |   1 +
 .../netty-nio-client-2.20.86.jar.sha1         |   1 -
 .../netty-nio-client-2.30.31.jar.sha1         |   1 +
 .../licenses/profiles-2.20.86.jar.sha1        |   1 -
 .../licenses/profiles-2.30.31.jar.sha1        |   1 +
 .../licenses/protocol-core-2.20.86.jar.sha1   |   1 -
 .../licenses/protocol-core-2.30.31.jar.sha1   |   1 +
 .../licenses/regions-2.20.86.jar.sha1         |   1 -
 .../licenses/regions-2.30.31.jar.sha1         |   1 +
 .../licenses/retries-2.30.31.jar.sha1         |   1 +
 .../licenses/retries-LICENSE.txt              | 202 ++++++++++++++++++
 .../repository-s3/licenses/retries-NOTICE.txt |  14 ++
 .../licenses/retries-spi-2.30.31.jar.sha1     |   1 +
 .../licenses/retries-spi-LICENSE.txt          | 202 ++++++++++++++++++
 .../licenses/retries-spi-NOTICE.txt           |  14 ++
 .../licenses/s3-2.20.86.jar.sha1              |   1 -
 .../licenses/s3-2.30.31.jar.sha1              |   1 +
 .../licenses/sdk-core-2.20.86.jar.sha1        |   1 -
 .../licenses/sdk-core-2.30.31.jar.sha1        |   1 +
 .../licenses/signer-2.20.86.jar.sha1          |   1 -
 .../licenses/signer-2.30.31.jar.sha1          |   1 +
 .../licenses/sts-2.20.86.jar.sha1             |   1 -
 .../licenses/sts-2.30.31.jar.sha1             |   1 +
 .../third-party-jackson-core-2.20.86.jar.sha1 |   1 -
 .../third-party-jackson-core-2.30.31.jar.sha1 |   1 +
 .../licenses/utils-2.20.86.jar.sha1           |   1 -
 .../licenses/utils-2.30.31.jar.sha1           |   1 +
 181 files changed, 4650 insertions(+), 109 deletions(-)
 delete mode 100644 plugins/crypto-kms/licenses/annotations-2.20.86.jar.sha1
 create mode 100644 plugins/crypto-kms/licenses/annotations-2.30.31.jar.sha1
 delete mode 100644 plugins/crypto-kms/licenses/apache-client-2.20.86.jar.sha1
 create mode 100644 plugins/crypto-kms/licenses/apache-client-2.30.31.jar.sha1
 delete mode 100644 plugins/crypto-kms/licenses/auth-2.20.86.jar.sha1
 create mode 100644 plugins/crypto-kms/licenses/auth-2.30.31.jar.sha1
 delete mode 100644 plugins/crypto-kms/licenses/aws-core-2.20.86.jar.sha1
 create mode 100644 plugins/crypto-kms/licenses/aws-core-2.30.31.jar.sha1
 delete mode 100644 plugins/crypto-kms/licenses/aws-json-protocol-2.20.86.jar.sha1
 create mode 100644 plugins/crypto-kms/licenses/aws-json-protocol-2.30.31.jar.sha1
 delete mode 100644 plugins/crypto-kms/licenses/aws-query-protocol-2.20.86.jar.sha1
 create mode 100644 plugins/crypto-kms/licenses/aws-query-protocol-2.30.31.jar.sha1
 delete mode 100644 plugins/crypto-kms/licenses/endpoints-spi-2.20.86.jar.sha1
 create mode 100644 plugins/crypto-kms/licenses/endpoints-spi-2.30.31.jar.sha1
 create mode 100644 plugins/crypto-kms/licenses/http-auth-spi-2.30.31.jar.sha1
 create mode 100644 plugins/crypto-kms/licenses/http-auth-spi-LICENSE.txt
 create mode 100644 plugins/crypto-kms/licenses/http-auth-spi-NOTICE.txt
 delete mode 100644 plugins/crypto-kms/licenses/http-client-spi-2.20.86.jar.sha1
 create mode 100644 plugins/crypto-kms/licenses/http-client-spi-2.30.31.jar.sha1
 create mode 100644 plugins/crypto-kms/licenses/identity-spi-2.30.31.jar.sha1
 create mode 100644 plugins/crypto-kms/licenses/identity-spi-LICENSE.txt
 create mode 100644 plugins/crypto-kms/licenses/identity-spi-NOTICE.txt
 delete mode 100644 plugins/crypto-kms/licenses/json-utils-2.20.86.jar.sha1
 create mode 100644 plugins/crypto-kms/licenses/json-utils-2.30.31.jar.sha1
 delete mode 100644 plugins/crypto-kms/licenses/kms-2.20.86.jar.sha1
 create mode 100644 plugins/crypto-kms/licenses/kms-2.30.31.jar.sha1
 delete mode 100644 plugins/crypto-kms/licenses/metrics-spi-2.20.86.jar.sha1
 create mode 100644 plugins/crypto-kms/licenses/metrics-spi-2.30.31.jar.sha1
 delete mode 100644 plugins/crypto-kms/licenses/profiles-2.20.86.jar.sha1
 create mode 100644 plugins/crypto-kms/licenses/profiles-2.30.31.jar.sha1
 delete mode 100644 plugins/crypto-kms/licenses/protocol-core-2.20.86.jar.sha1
 create mode 100644 plugins/crypto-kms/licenses/protocol-core-2.30.31.jar.sha1
 delete mode 100644 plugins/crypto-kms/licenses/regions-2.20.86.jar.sha1
 create mode 100644 plugins/crypto-kms/licenses/regions-2.30.31.jar.sha1
 create mode 100644 plugins/crypto-kms/licenses/retries-spi-2.30.31.jar.sha1
 create mode 100644 plugins/crypto-kms/licenses/retries-spi-LICENSE.txt
 create mode 100644 plugins/crypto-kms/licenses/retries-spi-NOTICE.txt
 delete mode 100644 plugins/crypto-kms/licenses/sdk-core-2.20.86.jar.sha1
 create mode 100644 plugins/crypto-kms/licenses/sdk-core-2.30.31.jar.sha1
 delete mode 100644 plugins/crypto-kms/licenses/third-party-jackson-core-2.20.86.jar.sha1
 create mode 100644 plugins/crypto-kms/licenses/third-party-jackson-core-2.30.31.jar.sha1
 delete mode 100644 plugins/crypto-kms/licenses/utils-2.20.86.jar.sha1
 create mode 100644 plugins/crypto-kms/licenses/utils-2.30.31.jar.sha1
 delete mode 100644 plugins/discovery-ec2/licenses/annotations-2.20.86.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/annotations-2.30.31.jar.sha1
 delete mode 100644 plugins/discovery-ec2/licenses/apache-client-2.20.86.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/apache-client-2.30.31.jar.sha1
 delete mode 100644 plugins/discovery-ec2/licenses/auth-2.20.86.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/auth-2.30.31.jar.sha1
 delete mode 100644 plugins/discovery-ec2/licenses/aws-core-2.20.86.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/aws-core-2.30.31.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/aws-crt-0.35.0.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/aws-crt-LICENSE.txt
 create mode 100644 plugins/discovery-ec2/licenses/aws-crt-NOTICE.txt
 delete mode 100644 plugins/discovery-ec2/licenses/aws-json-protocol-2.20.86.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/aws-json-protocol-2.30.31.jar.sha1
 delete mode 100644 plugins/discovery-ec2/licenses/aws-query-protocol-2.20.86.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/aws-query-protocol-2.30.31.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/checksums-2.30.31.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/checksums-LICENSE.txt
 create mode 100644 plugins/discovery-ec2/licenses/checksums-NOTICE.txt
 create mode 100644 plugins/discovery-ec2/licenses/checksums-spi-2.30.31.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/checksums-spi-LICENSE.txt
 create mode 100644 plugins/discovery-ec2/licenses/checksums-spi-NOTICE.txt
 delete mode 100644 plugins/discovery-ec2/licenses/ec2-2.20.86.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/ec2-2.30.31.jar.sha1
 delete mode 100644 plugins/discovery-ec2/licenses/endpoints-spi-2.20.86.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/endpoints-spi-2.30.31.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/http-auth-2.30.31.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/http-auth-LICENSE.txt
 create mode 100644 plugins/discovery-ec2/licenses/http-auth-NOTICE.txt
 create mode 100644 plugins/discovery-ec2/licenses/http-auth-aws-2.30.31.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/http-auth-aws-LICENSE.txt
 create mode 100644 plugins/discovery-ec2/licenses/http-auth-aws-NOTICE.txt
 create mode 100644 plugins/discovery-ec2/licenses/http-auth-spi-2.30.31.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/http-auth-spi-LICENSE.txt
 create mode 100644 plugins/discovery-ec2/licenses/http-auth-spi-NOTICE.txt
 delete mode 100644 plugins/discovery-ec2/licenses/http-client-spi-2.20.86.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/http-client-spi-2.30.31.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/identity-spi-2.30.31.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/identity-spi-LICENSE.txt
 create mode 100644 plugins/discovery-ec2/licenses/identity-spi-NOTICE.txt
 delete mode 100644 plugins/discovery-ec2/licenses/json-utils-2.20.86.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/json-utils-2.30.31.jar.sha1
 delete mode 100644 plugins/discovery-ec2/licenses/metrics-spi-2.20.86.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/metrics-spi-2.30.31.jar.sha1
 delete mode 100644 plugins/discovery-ec2/licenses/profiles-2.20.86.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/profiles-2.30.31.jar.sha1
 delete mode 100644 plugins/discovery-ec2/licenses/protocol-core-2.20.86.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/protocol-core-2.30.31.jar.sha1
 delete mode 100644 plugins/discovery-ec2/licenses/regions-2.20.86.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/regions-2.30.31.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/retries-2.30.31.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/retries-LICENSE.txt
 create mode 100644 plugins/discovery-ec2/licenses/retries-NOTICE.txt
 create mode 100644 plugins/discovery-ec2/licenses/retries-spi-2.30.31.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/retries-spi-LICENSE.txt
 create mode 100644 plugins/discovery-ec2/licenses/retries-spi-NOTICE.txt
 delete mode 100644 plugins/discovery-ec2/licenses/sdk-core-2.20.86.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/sdk-core-2.30.31.jar.sha1
 delete mode 100644 plugins/discovery-ec2/licenses/third-party-jackson-core-2.20.86.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/third-party-jackson-core-2.30.31.jar.sha1
 delete mode 100644 plugins/discovery-ec2/licenses/utils-2.20.86.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/utils-2.30.31.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/annotations-2.20.86.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/annotations-2.30.31.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/apache-client-2.20.86.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/apache-client-2.30.31.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/auth-2.20.86.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/auth-2.30.31.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/aws-core-2.20.86.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/aws-core-2.30.31.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/aws-crt-0.35.0.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/aws-crt-LICENSE.txt
 create mode 100644 plugins/repository-s3/licenses/aws-crt-NOTICE.txt
 delete mode 100644 plugins/repository-s3/licenses/aws-json-protocol-2.20.86.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/aws-json-protocol-2.30.31.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/aws-query-protocol-2.20.86.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/aws-query-protocol-2.30.31.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/aws-xml-protocol-2.20.86.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/aws-xml-protocol-2.30.31.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/checksums-2.30.31.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/checksums-LICENSE.txt
 create mode 100644 plugins/repository-s3/licenses/checksums-NOTICE.txt
 create mode 100644 plugins/repository-s3/licenses/checksums-spi-2.30.31.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/checksums-spi-LICENSE.txt
 create mode 100644 plugins/repository-s3/licenses/checksums-spi-NOTICE.txt
 delete mode 100644 plugins/repository-s3/licenses/endpoints-spi-2.20.86.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/endpoints-spi-2.30.31.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/http-auth-2.30.31.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/http-auth-LICENSE.txt
 create mode 100644 plugins/repository-s3/licenses/http-auth-NOTICE.txt
 create mode 100644 plugins/repository-s3/licenses/http-auth-aws-2.30.31.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/http-auth-aws-LICENSE.txt
 create mode 100644 plugins/repository-s3/licenses/http-auth-aws-NOTICE.txt
 create mode 100644 plugins/repository-s3/licenses/http-auth-spi-2.30.31.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/http-auth-spi-LICENSE.txt
 create mode 100644 plugins/repository-s3/licenses/http-auth-spi-NOTICE.txt
 delete mode 100644 plugins/repository-s3/licenses/http-client-spi-2.20.86.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/http-client-spi-2.30.31.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/identity-spi-2.30.31.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/identity-spi-LICENSE.txt
 create mode 100644 plugins/repository-s3/licenses/identity-spi-NOTICE.txt
 delete mode 100644 plugins/repository-s3/licenses/json-utils-2.20.86.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/json-utils-2.30.31.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/metrics-spi-2.20.86.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/metrics-spi-2.30.31.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/netty-nio-client-2.20.86.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/netty-nio-client-2.30.31.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/profiles-2.20.86.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/profiles-2.30.31.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/protocol-core-2.20.86.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/protocol-core-2.30.31.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/regions-2.20.86.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/regions-2.30.31.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/retries-2.30.31.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/retries-LICENSE.txt
 create mode 100644 plugins/repository-s3/licenses/retries-NOTICE.txt
 create mode 100644 plugins/repository-s3/licenses/retries-spi-2.30.31.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/retries-spi-LICENSE.txt
 create mode 100644 plugins/repository-s3/licenses/retries-spi-NOTICE.txt
 delete mode 100644 plugins/repository-s3/licenses/s3-2.20.86.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/s3-2.30.31.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/sdk-core-2.20.86.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/sdk-core-2.30.31.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/signer-2.20.86.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/signer-2.30.31.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/sts-2.20.86.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/sts-2.30.31.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/third-party-jackson-core-2.20.86.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/third-party-jackson-core-2.30.31.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/utils-2.20.86.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/utils-2.30.31.jar.sha1

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45fd4813e72da..091e832e01cd1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `com.google.api.grpc:proto-google-common-protos` from 2.37.1 to 2.52.0 ([#17379](https://github.com/opensearch-project/OpenSearch/pull/17379))
 - Bump `net.minidev:json-smart` from 2.5.1 to 2.5.2 ([#17378](https://github.com/opensearch-project/OpenSearch/pull/17378))
 - Bump `com.netflix.nebula.ospackage-base` from 11.10.1 to 11.11.1 ([#17374](https://github.com/opensearch-project/OpenSearch/pull/17374))
+- Bump `software.amazon.awssdk` from 2.20.86 to 2.30.31 ([17396](https://github.com/opensearch-project/OpenSearch/pull/17396))
 
 ### Changed
 - Convert transport-reactor-netty4 to use gradle version catalog [#17233](https://github.com/opensearch-project/OpenSearch/pull/17233)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index abdd87394b35c..90518ca71ec53 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -52,7 +52,8 @@ commonslang       = "3.14.0"
 commonscompress   = "1.26.1"
 commonsio         = "2.16.0"
 # plugin dependencies
-aws               = "2.20.86"
+aws               = "2.30.31"
+awscrt            = "0.35.0"
 reactivestreams   = "1.0.4"
 
 # when updating this version, you need to ensure compatibility with:
diff --git a/plugins/crypto-kms/build.gradle b/plugins/crypto-kms/build.gradle
index fa63a4a7153d3..d66c731dc16af 100644
--- a/plugins/crypto-kms/build.gradle
+++ b/plugins/crypto-kms/build.gradle
@@ -30,10 +30,13 @@ dependencies {
   api "software.amazon.awssdk:aws-core:${versions.aws}"
   api "software.amazon.awssdk:utils:${versions.aws}"
   api "software.amazon.awssdk:auth:${versions.aws}"
+  api "software.amazon.awssdk:identity-spi:${versions.aws}"
   api "software.amazon.awssdk:kms:${versions.aws}"
+  api "software.amazon.awssdk:http-auth-spi:${versions.aws}"
   api "software.amazon.awssdk:http-client-spi:${versions.aws}"
   api "software.amazon.awssdk:apache-client:${versions.aws}"
   api "software.amazon.awssdk:regions:${versions.aws}"
+  api "software.amazon.awssdk:retries-spi:${versions.aws}"
   api "software.amazon.awssdk:profiles:${versions.aws}"
   api "software.amazon.awssdk:endpoints-spi:${versions.aws}"
   api "software.amazon.awssdk:annotations:${versions.aws}"
diff --git a/plugins/crypto-kms/licenses/annotations-2.20.86.jar.sha1 b/plugins/crypto-kms/licenses/annotations-2.20.86.jar.sha1
deleted file mode 100644
index 8d30ad649916b..0000000000000
--- a/plugins/crypto-kms/licenses/annotations-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7e785e9ecb1230e52e9daa713335f38809ddcb74
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/annotations-2.30.31.jar.sha1 b/plugins/crypto-kms/licenses/annotations-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..d45f8758c9405
--- /dev/null
+++ b/plugins/crypto-kms/licenses/annotations-2.30.31.jar.sha1
@@ -0,0 +1 @@
+c5acc1da9567290302d80ffa1633785afa4ce630
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/apache-client-2.20.86.jar.sha1 b/plugins/crypto-kms/licenses/apache-client-2.20.86.jar.sha1
deleted file mode 100644
index e7ae36581925c..0000000000000
--- a/plugins/crypto-kms/licenses/apache-client-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-af31c4d3abec23b73061c6965364a6e3abbcc01a
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/apache-client-2.30.31.jar.sha1 b/plugins/crypto-kms/licenses/apache-client-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..97331cbda2c1b
--- /dev/null
+++ b/plugins/crypto-kms/licenses/apache-client-2.30.31.jar.sha1
@@ -0,0 +1 @@
+d1c602dba702782a0afec0a08c919322693a3bf8
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/auth-2.20.86.jar.sha1 b/plugins/crypto-kms/licenses/auth-2.20.86.jar.sha1
deleted file mode 100644
index e4c1b29cea894..0000000000000
--- a/plugins/crypto-kms/licenses/auth-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f2da82f33776ce4814a3ab53b5ccb82a5d135936
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/auth-2.30.31.jar.sha1 b/plugins/crypto-kms/licenses/auth-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..c1e199ca02fc8
--- /dev/null
+++ b/plugins/crypto-kms/licenses/auth-2.30.31.jar.sha1
@@ -0,0 +1 @@
+8887962b04ce5f1a9f46d44acd806949b17082da
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/aws-core-2.20.86.jar.sha1 b/plugins/crypto-kms/licenses/aws-core-2.20.86.jar.sha1
deleted file mode 100644
index d42a15c4da413..0000000000000
--- a/plugins/crypto-kms/licenses/aws-core-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ea126147c3d17a8b3075e3122ec9c2b94fe1f6d5
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/aws-core-2.30.31.jar.sha1 b/plugins/crypto-kms/licenses/aws-core-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..16050fd1d8c6d
--- /dev/null
+++ b/plugins/crypto-kms/licenses/aws-core-2.30.31.jar.sha1
@@ -0,0 +1 @@
+5016fadbd7146171b4afe09eb0675b710b0f2d12
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/aws-json-protocol-2.20.86.jar.sha1 b/plugins/crypto-kms/licenses/aws-json-protocol-2.20.86.jar.sha1
deleted file mode 100644
index ee08d240fbfba..0000000000000
--- a/plugins/crypto-kms/licenses/aws-json-protocol-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8b9d09c1aa9d3f2119267f0b6549ae1810512c7b
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/aws-json-protocol-2.30.31.jar.sha1 b/plugins/crypto-kms/licenses/aws-json-protocol-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..bfc742d8687d1
--- /dev/null
+++ b/plugins/crypto-kms/licenses/aws-json-protocol-2.30.31.jar.sha1
@@ -0,0 +1 @@
+4600659276f84e114c1fabeb1478911c581a7739
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/aws-query-protocol-2.20.86.jar.sha1 b/plugins/crypto-kms/licenses/aws-query-protocol-2.20.86.jar.sha1
deleted file mode 100644
index 9b19f570d56fb..0000000000000
--- a/plugins/crypto-kms/licenses/aws-query-protocol-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e001792ec1a681f5bc6ee4157d572173416304ad
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/aws-query-protocol-2.30.31.jar.sha1 b/plugins/crypto-kms/licenses/aws-query-protocol-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..9508295147c96
--- /dev/null
+++ b/plugins/crypto-kms/licenses/aws-query-protocol-2.30.31.jar.sha1
@@ -0,0 +1 @@
+61596c0cb577a4a6c438a5a7ee0391d2d825b3fe
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/endpoints-spi-2.20.86.jar.sha1 b/plugins/crypto-kms/licenses/endpoints-spi-2.20.86.jar.sha1
deleted file mode 100644
index 16f9db1fd6327..0000000000000
--- a/plugins/crypto-kms/licenses/endpoints-spi-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2b9075dd0ed32da97f95229f55c01425353e8cba
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/endpoints-spi-2.30.31.jar.sha1 b/plugins/crypto-kms/licenses/endpoints-spi-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..4dbc884c3da6f
--- /dev/null
+++ b/plugins/crypto-kms/licenses/endpoints-spi-2.30.31.jar.sha1
@@ -0,0 +1 @@
+0734f4b9c68f19201896dd47639035b4e0a7964d
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/http-auth-spi-2.30.31.jar.sha1 b/plugins/crypto-kms/licenses/http-auth-spi-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..491ffe4dd0584
--- /dev/null
+++ b/plugins/crypto-kms/licenses/http-auth-spi-2.30.31.jar.sha1
@@ -0,0 +1 @@
+513519f79635441d5205fc31d56c2e0d5826d27f
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/http-auth-spi-LICENSE.txt b/plugins/crypto-kms/licenses/http-auth-spi-LICENSE.txt
new file mode 100644
index 0000000000000..d645695673349
--- /dev/null
+++ b/plugins/crypto-kms/licenses/http-auth-spi-LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/plugins/crypto-kms/licenses/http-auth-spi-NOTICE.txt b/plugins/crypto-kms/licenses/http-auth-spi-NOTICE.txt
new file mode 100644
index 0000000000000..d2bc5723e9aea
--- /dev/null
+++ b/plugins/crypto-kms/licenses/http-auth-spi-NOTICE.txt
@@ -0,0 +1,14 @@
+OpenSearch (https://opensearch.org/)
+Copyright OpenSearch Contributors
+
+This product includes software developed by
+Elasticsearch (http://www.elastic.co).
+Copyright 2009-2018 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
+
+This product includes software developed by
+Joda.org (http://www.joda.org/).
+
+
diff --git a/plugins/crypto-kms/licenses/http-client-spi-2.20.86.jar.sha1 b/plugins/crypto-kms/licenses/http-client-spi-2.20.86.jar.sha1
deleted file mode 100644
index 0662e15b1f3e6..0000000000000
--- a/plugins/crypto-kms/licenses/http-client-spi-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-776bfc86fabc6e8c792ea4650a281d0bec5e9708
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/http-client-spi-2.30.31.jar.sha1 b/plugins/crypto-kms/licenses/http-client-spi-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..d86fa139f535c
--- /dev/null
+++ b/plugins/crypto-kms/licenses/http-client-spi-2.30.31.jar.sha1
@@ -0,0 +1 @@
+5fa894c333793b7481aa03aa87512b20e11b057d
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/identity-spi-2.30.31.jar.sha1 b/plugins/crypto-kms/licenses/identity-spi-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..9eeab9ad13dba
--- /dev/null
+++ b/plugins/crypto-kms/licenses/identity-spi-2.30.31.jar.sha1
@@ -0,0 +1 @@
+46da74ac074b176c25fba07c6541737422622c1d
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/identity-spi-LICENSE.txt b/plugins/crypto-kms/licenses/identity-spi-LICENSE.txt
new file mode 100644
index 0000000000000..d645695673349
--- /dev/null
+++ b/plugins/crypto-kms/licenses/identity-spi-LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/plugins/crypto-kms/licenses/identity-spi-NOTICE.txt b/plugins/crypto-kms/licenses/identity-spi-NOTICE.txt
new file mode 100644
index 0000000000000..d2bc5723e9aea
--- /dev/null
+++ b/plugins/crypto-kms/licenses/identity-spi-NOTICE.txt
@@ -0,0 +1,14 @@
+OpenSearch (https://opensearch.org/)
+Copyright OpenSearch Contributors
+
+This product includes software developed by
+Elasticsearch (http://www.elastic.co).
+Copyright 2009-2018 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
+
+This product includes software developed by
+Joda.org (http://www.joda.org/).
+
+
diff --git a/plugins/crypto-kms/licenses/json-utils-2.20.86.jar.sha1 b/plugins/crypto-kms/licenses/json-utils-2.20.86.jar.sha1
deleted file mode 100644
index 7011f8c3e6c78..0000000000000
--- a/plugins/crypto-kms/licenses/json-utils-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5dd418ad48e3bfd8c3fa05ff29a955b91c1af666
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/json-utils-2.30.31.jar.sha1 b/plugins/crypto-kms/licenses/json-utils-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..5019f6d48fa0a
--- /dev/null
+++ b/plugins/crypto-kms/licenses/json-utils-2.30.31.jar.sha1
@@ -0,0 +1 @@
+7f0ef4b49299df2fd39f92113d94524729c61032
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/kms-2.20.86.jar.sha1 b/plugins/crypto-kms/licenses/kms-2.20.86.jar.sha1
deleted file mode 100644
index 32c4e9f432898..0000000000000
--- a/plugins/crypto-kms/licenses/kms-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6a81c2f14acaa7b9dcdc80c715d6e44d815a818a
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/kms-2.30.31.jar.sha1 b/plugins/crypto-kms/licenses/kms-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..becd3d624ef17
--- /dev/null
+++ b/plugins/crypto-kms/licenses/kms-2.30.31.jar.sha1
@@ -0,0 +1 @@
+0bb8a87a83edf1eb0c4dddb2afb1158ac858626d
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/metrics-spi-2.20.86.jar.sha1 b/plugins/crypto-kms/licenses/metrics-spi-2.20.86.jar.sha1
deleted file mode 100644
index bbd88bb9e1b0c..0000000000000
--- a/plugins/crypto-kms/licenses/metrics-spi-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-74a65d0f8decd0b3057fb500ca5409ff5778752a
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/metrics-spi-2.30.31.jar.sha1 b/plugins/crypto-kms/licenses/metrics-spi-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..69ab3ec6f79ff
--- /dev/null
+++ b/plugins/crypto-kms/licenses/metrics-spi-2.30.31.jar.sha1
@@ -0,0 +1 @@
+57a979cbc99d0bf4113d96aaf4f453303a015966
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/profiles-2.20.86.jar.sha1 b/plugins/crypto-kms/licenses/profiles-2.20.86.jar.sha1
deleted file mode 100644
index 425ce9b92f9f2..0000000000000
--- a/plugins/crypto-kms/licenses/profiles-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-27a8f4aa488d1d3ef947865ee0190f16d10a3cc7
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/profiles-2.30.31.jar.sha1 b/plugins/crypto-kms/licenses/profiles-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..6d4d2a1ac8d65
--- /dev/null
+++ b/plugins/crypto-kms/licenses/profiles-2.30.31.jar.sha1
@@ -0,0 +1 @@
+d6d2d5788695972140dfe8b012ea7ccd97b82eef
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/protocol-core-2.20.86.jar.sha1 b/plugins/crypto-kms/licenses/protocol-core-2.20.86.jar.sha1
deleted file mode 100644
index 8de58699d8d82..0000000000000
--- a/plugins/crypto-kms/licenses/protocol-core-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bd85984ac6327a50d20e7957ecebf4fa3ad7766b
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/protocol-core-2.30.31.jar.sha1 b/plugins/crypto-kms/licenses/protocol-core-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..caae2a4302976
--- /dev/null
+++ b/plugins/crypto-kms/licenses/protocol-core-2.30.31.jar.sha1
@@ -0,0 +1 @@
+ee17b25525aee497b6d520c8e499f39de7204fbc
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/regions-2.20.86.jar.sha1 b/plugins/crypto-kms/licenses/regions-2.20.86.jar.sha1
deleted file mode 100644
index 266bc76ad6f77..0000000000000
--- a/plugins/crypto-kms/licenses/regions-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-04fd460ce1c633986ecef1b4218d3e7067a7087d
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/regions-2.30.31.jar.sha1 b/plugins/crypto-kms/licenses/regions-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..8e9876686a144
--- /dev/null
+++ b/plugins/crypto-kms/licenses/regions-2.30.31.jar.sha1
@@ -0,0 +1 @@
+7ce1df66496dcf9b124edb78ab9675e1e7d5c427
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/retries-spi-2.30.31.jar.sha1 b/plugins/crypto-kms/licenses/retries-spi-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..854e3d7e4aebf
--- /dev/null
+++ b/plugins/crypto-kms/licenses/retries-spi-2.30.31.jar.sha1
@@ -0,0 +1 @@
+4d9166189594243f88045fbf0c871a81e3914c0b
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/retries-spi-LICENSE.txt b/plugins/crypto-kms/licenses/retries-spi-LICENSE.txt
new file mode 100644
index 0000000000000..d645695673349
--- /dev/null
+++ b/plugins/crypto-kms/licenses/retries-spi-LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/plugins/crypto-kms/licenses/retries-spi-NOTICE.txt b/plugins/crypto-kms/licenses/retries-spi-NOTICE.txt
new file mode 100644
index 0000000000000..d2bc5723e9aea
--- /dev/null
+++ b/plugins/crypto-kms/licenses/retries-spi-NOTICE.txt
@@ -0,0 +1,14 @@
+OpenSearch (https://opensearch.org/)
+Copyright OpenSearch Contributors
+
+This product includes software developed by
+Elasticsearch (http://www.elastic.co).
+Copyright 2009-2018 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
+
+This product includes software developed by
+Joda.org (http://www.joda.org/).
+
+
diff --git a/plugins/crypto-kms/licenses/sdk-core-2.20.86.jar.sha1 b/plugins/crypto-kms/licenses/sdk-core-2.20.86.jar.sha1
deleted file mode 100644
index 9eca40e6b9a9a..0000000000000
--- a/plugins/crypto-kms/licenses/sdk-core-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1b9df9ca5e4918fab05db3b703b2873e83104c30
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/sdk-core-2.30.31.jar.sha1 b/plugins/crypto-kms/licenses/sdk-core-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..ee3d7e3bff68d
--- /dev/null
+++ b/plugins/crypto-kms/licenses/sdk-core-2.30.31.jar.sha1
@@ -0,0 +1 @@
+b95c07d4796105c2e61c4c6ab60e3189886b2787
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/third-party-jackson-core-2.20.86.jar.sha1 b/plugins/crypto-kms/licenses/third-party-jackson-core-2.20.86.jar.sha1
deleted file mode 100644
index c9c3d4dc53505..0000000000000
--- a/plugins/crypto-kms/licenses/third-party-jackson-core-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5ad6e7f7d52d8a5390b2daf2fd8ffcab97fe3102
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/third-party-jackson-core-2.30.31.jar.sha1 b/plugins/crypto-kms/licenses/third-party-jackson-core-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..a07a8eda62447
--- /dev/null
+++ b/plugins/crypto-kms/licenses/third-party-jackson-core-2.30.31.jar.sha1
@@ -0,0 +1 @@
+100d8022939bd59cd7d2461bd4fb0fd9fa028499
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/utils-2.20.86.jar.sha1 b/plugins/crypto-kms/licenses/utils-2.20.86.jar.sha1
deleted file mode 100644
index b91a3b3047570..0000000000000
--- a/plugins/crypto-kms/licenses/utils-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7a61f8b3c54ecf3dc785830d4f482f19ca52bc57
\ No newline at end of file
diff --git a/plugins/crypto-kms/licenses/utils-2.30.31.jar.sha1 b/plugins/crypto-kms/licenses/utils-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..184ff1cc5f9ce
--- /dev/null
+++ b/plugins/crypto-kms/licenses/utils-2.30.31.jar.sha1
@@ -0,0 +1 @@
+3340adacb87ff28f90a039d57c81311b296db89e
\ No newline at end of file
diff --git a/plugins/crypto-kms/src/test/java/org/opensearch/crypto/kms/KmsServiceTests.java b/plugins/crypto-kms/src/test/java/org/opensearch/crypto/kms/KmsServiceTests.java
index 1424cce473592..8d63d1c0eccd7 100644
--- a/plugins/crypto-kms/src/test/java/org/opensearch/crypto/kms/KmsServiceTests.java
+++ b/plugins/crypto-kms/src/test/java/org/opensearch/crypto/kms/KmsServiceTests.java
@@ -31,7 +31,7 @@ public void testAWSDefaultConfiguration() {
                 KmsClientSettings.getClientSettings(Settings.EMPTY)
             );
 
-            assertNull(proxyConfiguration.scheme());
+            assertEquals("http", proxyConfiguration.scheme());
             assertNull(proxyConfiguration.host());
             assertEquals(proxyConfiguration.port(), 0);
             assertNull(proxyConfiguration.username());
@@ -131,14 +131,11 @@ public void testClientSettingsReInit() {
                         assertTrue(credentials instanceof AwsBasicCredentials);
                     }
 
-                    assertEquals(
-                        mockKmsClientTest.proxyConfiguration.toString(),
-                        "ProxyConfiguration(endpoint=https://proxy-host-1:881, username=proxy_username_1, preemptiveBasicAuthenticationEnabled=false)"
-                    );
                     assertEquals(mockKmsClientTest.proxyConfiguration.host(), "proxy-host-1");
                     assertEquals(mockKmsClientTest.proxyConfiguration.port(), 881);
                     assertEquals(mockKmsClientTest.proxyConfiguration.username(), "proxy_username_1");
                     assertEquals(mockKmsClientTest.proxyConfiguration.password(), "proxy_password_1");
+                    assertFalse(mockKmsClientTest.proxyConfiguration.preemptiveBasicAuthenticationEnabled());
                 }
                 // reload secure settings2
                 plugin.reload(settings2);
@@ -155,14 +152,11 @@ public void testClientSettingsReInit() {
                         assertTrue(credentials instanceof AwsBasicCredentials);
                     }
 
-                    assertEquals(
-                        mockKmsClientTest.proxyConfiguration.toString(),
-                        "ProxyConfiguration(endpoint=https://proxy-host-1:881, username=proxy_username_1, preemptiveBasicAuthenticationEnabled=false)"
-                    );
                     assertEquals(mockKmsClientTest.proxyConfiguration.host(), "proxy-host-1");
                     assertEquals(mockKmsClientTest.proxyConfiguration.port(), 881);
                     assertEquals(mockKmsClientTest.proxyConfiguration.username(), "proxy_username_1");
                     assertEquals(mockKmsClientTest.proxyConfiguration.password(), "proxy_password_1");
+                    assertFalse(mockKmsClientTest.proxyConfiguration.preemptiveBasicAuthenticationEnabled());
                 }
             }
             try (AmazonKmsClientReference clientReference = plugin.kmsService.client(cryptoMetadata)) {
@@ -179,14 +173,11 @@ public void testClientSettingsReInit() {
                     assertTrue(credentials instanceof AwsBasicCredentials);
                 }
 
-                assertEquals(
-                    mockKmsClientTest.proxyConfiguration.toString(),
-                    "ProxyConfiguration(endpoint=https://proxy-host-2:882, username=proxy_username_2, preemptiveBasicAuthenticationEnabled=false)"
-                );
                 assertEquals(mockKmsClientTest.proxyConfiguration.host(), "proxy-host-2");
                 assertEquals(mockKmsClientTest.proxyConfiguration.port(), 882);
                 assertEquals(mockKmsClientTest.proxyConfiguration.username(), "proxy_username_2");
                 assertEquals(mockKmsClientTest.proxyConfiguration.password(), "proxy_password_2");
+                assertFalse(mockKmsClientTest.proxyConfiguration.preemptiveBasicAuthenticationEnabled());
             }
         }
     }
diff --git a/plugins/discovery-ec2/build.gradle b/plugins/discovery-ec2/build.gradle
index 8d615e0bf8d9d..7a7eb8da24fb6 100644
--- a/plugins/discovery-ec2/build.gradle
+++ b/plugins/discovery-ec2/build.gradle
@@ -43,6 +43,15 @@ dependencies {
   api "software.amazon.awssdk:aws-core:${versions.aws}"
   api "software.amazon.awssdk:utils:${versions.aws}"
   api "software.amazon.awssdk:auth:${versions.aws}"
+  api "software.amazon.awssdk:identity-spi:${versions.aws}"
+  api "software.amazon.awssdk:checksums:${versions.aws}"
+  api "software.amazon.awssdk:checksums-spi:${versions.aws}"
+  api "software.amazon.awssdk.crt:aws-crt:${versions.awscrt}"
+  api "software.amazon.awssdk:http-auth:${versions.aws}"
+  api "software.amazon.awssdk:http-auth-aws:${versions.aws}"
+  api "software.amazon.awssdk:http-auth-spi:${versions.aws}"
+  api "software.amazon.awssdk:retries:${versions.aws}"
+  api "software.amazon.awssdk:retries-spi:${versions.aws}"
   api "software.amazon.awssdk:ec2:${versions.aws}"
   api "software.amazon.awssdk:http-client-spi:${versions.aws}"
   api "software.amazon.awssdk:apache-client:${versions.aws}"
@@ -158,6 +167,8 @@ tasks.named("thirdPartyAudit").configure {
     'org.slf4j.impl.StaticMarkerBinder',
     'software.amazon.eventstream.HeaderValue',
     'software.amazon.eventstream.Message',
-    'software.amazon.eventstream.MessageDecoder'
+    'software.amazon.eventstream.MessageDecoder',
+    'org.graalvm.nativeimage.hosted.Feature',
+    'org.graalvm.nativeimage.hosted.Feature$AfterImageWriteAccess'
   )
 }
diff --git a/plugins/discovery-ec2/licenses/annotations-2.20.86.jar.sha1 b/plugins/discovery-ec2/licenses/annotations-2.20.86.jar.sha1
deleted file mode 100644
index 8d30ad649916b..0000000000000
--- a/plugins/discovery-ec2/licenses/annotations-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7e785e9ecb1230e52e9daa713335f38809ddcb74
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/annotations-2.30.31.jar.sha1 b/plugins/discovery-ec2/licenses/annotations-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..d45f8758c9405
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/annotations-2.30.31.jar.sha1
@@ -0,0 +1 @@
+c5acc1da9567290302d80ffa1633785afa4ce630
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/apache-client-2.20.86.jar.sha1 b/plugins/discovery-ec2/licenses/apache-client-2.20.86.jar.sha1
deleted file mode 100644
index e7ae36581925c..0000000000000
--- a/plugins/discovery-ec2/licenses/apache-client-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-af31c4d3abec23b73061c6965364a6e3abbcc01a
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/apache-client-2.30.31.jar.sha1 b/plugins/discovery-ec2/licenses/apache-client-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..97331cbda2c1b
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/apache-client-2.30.31.jar.sha1
@@ -0,0 +1 @@
+d1c602dba702782a0afec0a08c919322693a3bf8
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/auth-2.20.86.jar.sha1 b/plugins/discovery-ec2/licenses/auth-2.20.86.jar.sha1
deleted file mode 100644
index e4c1b29cea894..0000000000000
--- a/plugins/discovery-ec2/licenses/auth-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f2da82f33776ce4814a3ab53b5ccb82a5d135936
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/auth-2.30.31.jar.sha1 b/plugins/discovery-ec2/licenses/auth-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..c1e199ca02fc8
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/auth-2.30.31.jar.sha1
@@ -0,0 +1 @@
+8887962b04ce5f1a9f46d44acd806949b17082da
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/aws-core-2.20.86.jar.sha1 b/plugins/discovery-ec2/licenses/aws-core-2.20.86.jar.sha1
deleted file mode 100644
index d42a15c4da413..0000000000000
--- a/plugins/discovery-ec2/licenses/aws-core-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ea126147c3d17a8b3075e3122ec9c2b94fe1f6d5
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/aws-core-2.30.31.jar.sha1 b/plugins/discovery-ec2/licenses/aws-core-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..16050fd1d8c6d
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/aws-core-2.30.31.jar.sha1
@@ -0,0 +1 @@
+5016fadbd7146171b4afe09eb0675b710b0f2d12
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/aws-crt-0.35.0.jar.sha1 b/plugins/discovery-ec2/licenses/aws-crt-0.35.0.jar.sha1
new file mode 100644
index 0000000000000..1097f5bb4d814
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/aws-crt-0.35.0.jar.sha1
@@ -0,0 +1 @@
+33041403e1a9dd94f40330206eda5ffc22ee185c
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/aws-crt-LICENSE.txt b/plugins/discovery-ec2/licenses/aws-crt-LICENSE.txt
new file mode 100644
index 0000000000000..d645695673349
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/aws-crt-LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/plugins/discovery-ec2/licenses/aws-crt-NOTICE.txt b/plugins/discovery-ec2/licenses/aws-crt-NOTICE.txt
new file mode 100644
index 0000000000000..d2bc5723e9aea
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/aws-crt-NOTICE.txt
@@ -0,0 +1,14 @@
+OpenSearch (https://opensearch.org/)
+Copyright OpenSearch Contributors
+
+This product includes software developed by
+Elasticsearch (http://www.elastic.co).
+Copyright 2009-2018 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
+
+This product includes software developed by
+Joda.org (http://www.joda.org/).
+
+
diff --git a/plugins/discovery-ec2/licenses/aws-json-protocol-2.20.86.jar.sha1 b/plugins/discovery-ec2/licenses/aws-json-protocol-2.20.86.jar.sha1
deleted file mode 100644
index ee08d240fbfba..0000000000000
--- a/plugins/discovery-ec2/licenses/aws-json-protocol-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8b9d09c1aa9d3f2119267f0b6549ae1810512c7b
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/aws-json-protocol-2.30.31.jar.sha1 b/plugins/discovery-ec2/licenses/aws-json-protocol-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..bfc742d8687d1
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/aws-json-protocol-2.30.31.jar.sha1
@@ -0,0 +1 @@
+4600659276f84e114c1fabeb1478911c581a7739
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/aws-query-protocol-2.20.86.jar.sha1 b/plugins/discovery-ec2/licenses/aws-query-protocol-2.20.86.jar.sha1
deleted file mode 100644
index 9b19f570d56fb..0000000000000
--- a/plugins/discovery-ec2/licenses/aws-query-protocol-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e001792ec1a681f5bc6ee4157d572173416304ad
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/aws-query-protocol-2.30.31.jar.sha1 b/plugins/discovery-ec2/licenses/aws-query-protocol-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..9508295147c96
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/aws-query-protocol-2.30.31.jar.sha1
@@ -0,0 +1 @@
+61596c0cb577a4a6c438a5a7ee0391d2d825b3fe
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/checksums-2.30.31.jar.sha1 b/plugins/discovery-ec2/licenses/checksums-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..4447b86f6e872
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/checksums-2.30.31.jar.sha1
@@ -0,0 +1 @@
+6d00287bc0ceb013dd5c74f1c4eb296ae61b34d4
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/checksums-LICENSE.txt b/plugins/discovery-ec2/licenses/checksums-LICENSE.txt
new file mode 100644
index 0000000000000..d645695673349
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/checksums-LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/plugins/discovery-ec2/licenses/checksums-NOTICE.txt b/plugins/discovery-ec2/licenses/checksums-NOTICE.txt
new file mode 100644
index 0000000000000..d2bc5723e9aea
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/checksums-NOTICE.txt
@@ -0,0 +1,14 @@
+OpenSearch (https://opensearch.org/)
+Copyright OpenSearch Contributors
+
+This product includes software developed by
+Elasticsearch (http://www.elastic.co).
+Copyright 2009-2018 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
+
+This product includes software developed by
+Joda.org (http://www.joda.org/).
+
+
diff --git a/plugins/discovery-ec2/licenses/checksums-spi-2.30.31.jar.sha1 b/plugins/discovery-ec2/licenses/checksums-spi-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..078cab150c5ad
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/checksums-spi-2.30.31.jar.sha1
@@ -0,0 +1 @@
+b5a5b0a39403acf41c21fd16cd11c7c8d887601b
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/checksums-spi-LICENSE.txt b/plugins/discovery-ec2/licenses/checksums-spi-LICENSE.txt
new file mode 100644
index 0000000000000..d645695673349
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/checksums-spi-LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/plugins/discovery-ec2/licenses/checksums-spi-NOTICE.txt b/plugins/discovery-ec2/licenses/checksums-spi-NOTICE.txt
new file mode 100644
index 0000000000000..d2bc5723e9aea
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/checksums-spi-NOTICE.txt
@@ -0,0 +1,14 @@
+OpenSearch (https://opensearch.org/)
+Copyright OpenSearch Contributors
+
+This product includes software developed by
+Elasticsearch (http://www.elastic.co).
+Copyright 2009-2018 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
+
+This product includes software developed by
+Joda.org (http://www.joda.org/).
+
+
diff --git a/plugins/discovery-ec2/licenses/ec2-2.20.86.jar.sha1 b/plugins/discovery-ec2/licenses/ec2-2.20.86.jar.sha1
deleted file mode 100644
index 18c43cfc7516d..0000000000000
--- a/plugins/discovery-ec2/licenses/ec2-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3522a0829622a9c80152e6e2528bb79166f0b709
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/ec2-2.30.31.jar.sha1 b/plugins/discovery-ec2/licenses/ec2-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..e5982e9b99aa7
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/ec2-2.30.31.jar.sha1
@@ -0,0 +1 @@
+e1df5c01dc20de548b572d4bcfd75bba360411f2
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/endpoints-spi-2.20.86.jar.sha1 b/plugins/discovery-ec2/licenses/endpoints-spi-2.20.86.jar.sha1
deleted file mode 100644
index 16f9db1fd6327..0000000000000
--- a/plugins/discovery-ec2/licenses/endpoints-spi-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2b9075dd0ed32da97f95229f55c01425353e8cba
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/endpoints-spi-2.30.31.jar.sha1 b/plugins/discovery-ec2/licenses/endpoints-spi-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..4dbc884c3da6f
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/endpoints-spi-2.30.31.jar.sha1
@@ -0,0 +1 @@
+0734f4b9c68f19201896dd47639035b4e0a7964d
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/http-auth-2.30.31.jar.sha1 b/plugins/discovery-ec2/licenses/http-auth-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..79893fb4fbf58
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/http-auth-2.30.31.jar.sha1
@@ -0,0 +1 @@
+b7baeb158b0af0e400d89a32595c9127db2bbb6e
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/http-auth-LICENSE.txt b/plugins/discovery-ec2/licenses/http-auth-LICENSE.txt
new file mode 100644
index 0000000000000..d645695673349
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/http-auth-LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/plugins/discovery-ec2/licenses/http-auth-NOTICE.txt b/plugins/discovery-ec2/licenses/http-auth-NOTICE.txt
new file mode 100644
index 0000000000000..d2bc5723e9aea
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/http-auth-NOTICE.txt
@@ -0,0 +1,14 @@
+OpenSearch (https://opensearch.org/)
+Copyright OpenSearch Contributors
+
+This product includes software developed by
+Elasticsearch (http://www.elastic.co).
+Copyright 2009-2018 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
+
+This product includes software developed by
+Joda.org (http://www.joda.org/).
+
+
diff --git a/plugins/discovery-ec2/licenses/http-auth-aws-2.30.31.jar.sha1 b/plugins/discovery-ec2/licenses/http-auth-aws-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..d190c6ca52e98
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/http-auth-aws-2.30.31.jar.sha1
@@ -0,0 +1 @@
+f2a7d383158746c82b0f41b021e0da23a2597b35
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/http-auth-aws-LICENSE.txt b/plugins/discovery-ec2/licenses/http-auth-aws-LICENSE.txt
new file mode 100644
index 0000000000000..d645695673349
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/http-auth-aws-LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/plugins/discovery-ec2/licenses/http-auth-aws-NOTICE.txt b/plugins/discovery-ec2/licenses/http-auth-aws-NOTICE.txt
new file mode 100644
index 0000000000000..d2bc5723e9aea
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/http-auth-aws-NOTICE.txt
@@ -0,0 +1,14 @@
+OpenSearch (https://opensearch.org/)
+Copyright OpenSearch Contributors
+
+This product includes software developed by
+Elasticsearch (http://www.elastic.co).
+Copyright 2009-2018 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
+
+This product includes software developed by
+Joda.org (http://www.joda.org/).
+
+
diff --git a/plugins/discovery-ec2/licenses/http-auth-spi-2.30.31.jar.sha1 b/plugins/discovery-ec2/licenses/http-auth-spi-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..491ffe4dd0584
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/http-auth-spi-2.30.31.jar.sha1
@@ -0,0 +1 @@
+513519f79635441d5205fc31d56c2e0d5826d27f
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/http-auth-spi-LICENSE.txt b/plugins/discovery-ec2/licenses/http-auth-spi-LICENSE.txt
new file mode 100644
index 0000000000000..d645695673349
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/http-auth-spi-LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/plugins/discovery-ec2/licenses/http-auth-spi-NOTICE.txt b/plugins/discovery-ec2/licenses/http-auth-spi-NOTICE.txt
new file mode 100644
index 0000000000000..d2bc5723e9aea
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/http-auth-spi-NOTICE.txt
@@ -0,0 +1,14 @@
+OpenSearch (https://opensearch.org/)
+Copyright OpenSearch Contributors
+
+This product includes software developed by
+Elasticsearch (http://www.elastic.co).
+Copyright 2009-2018 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
+
+This product includes software developed by
+Joda.org (http://www.joda.org/).
+
+
diff --git a/plugins/discovery-ec2/licenses/http-client-spi-2.20.86.jar.sha1 b/plugins/discovery-ec2/licenses/http-client-spi-2.20.86.jar.sha1
deleted file mode 100644
index 0662e15b1f3e6..0000000000000
--- a/plugins/discovery-ec2/licenses/http-client-spi-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-776bfc86fabc6e8c792ea4650a281d0bec5e9708
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/http-client-spi-2.30.31.jar.sha1 b/plugins/discovery-ec2/licenses/http-client-spi-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..d86fa139f535c
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/http-client-spi-2.30.31.jar.sha1
@@ -0,0 +1 @@
+5fa894c333793b7481aa03aa87512b20e11b057d
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/identity-spi-2.30.31.jar.sha1 b/plugins/discovery-ec2/licenses/identity-spi-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..9eeab9ad13dba
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/identity-spi-2.30.31.jar.sha1
@@ -0,0 +1 @@
+46da74ac074b176c25fba07c6541737422622c1d
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/identity-spi-LICENSE.txt b/plugins/discovery-ec2/licenses/identity-spi-LICENSE.txt
new file mode 100644
index 0000000000000..d645695673349
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/identity-spi-LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/plugins/discovery-ec2/licenses/identity-spi-NOTICE.txt b/plugins/discovery-ec2/licenses/identity-spi-NOTICE.txt
new file mode 100644
index 0000000000000..d2bc5723e9aea
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/identity-spi-NOTICE.txt
@@ -0,0 +1,14 @@
+OpenSearch (https://opensearch.org/)
+Copyright OpenSearch Contributors
+
+This product includes software developed by
+Elasticsearch (http://www.elastic.co).
+Copyright 2009-2018 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
+
+This product includes software developed by
+Joda.org (http://www.joda.org/).
+
+
diff --git a/plugins/discovery-ec2/licenses/json-utils-2.20.86.jar.sha1 b/plugins/discovery-ec2/licenses/json-utils-2.20.86.jar.sha1
deleted file mode 100644
index 7011f8c3e6c78..0000000000000
--- a/plugins/discovery-ec2/licenses/json-utils-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5dd418ad48e3bfd8c3fa05ff29a955b91c1af666
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/json-utils-2.30.31.jar.sha1 b/plugins/discovery-ec2/licenses/json-utils-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..5019f6d48fa0a
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/json-utils-2.30.31.jar.sha1
@@ -0,0 +1 @@
+7f0ef4b49299df2fd39f92113d94524729c61032
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/metrics-spi-2.20.86.jar.sha1 b/plugins/discovery-ec2/licenses/metrics-spi-2.20.86.jar.sha1
deleted file mode 100644
index bbd88bb9e1b0c..0000000000000
--- a/plugins/discovery-ec2/licenses/metrics-spi-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-74a65d0f8decd0b3057fb500ca5409ff5778752a
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/metrics-spi-2.30.31.jar.sha1 b/plugins/discovery-ec2/licenses/metrics-spi-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..69ab3ec6f79ff
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/metrics-spi-2.30.31.jar.sha1
@@ -0,0 +1 @@
+57a979cbc99d0bf4113d96aaf4f453303a015966
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/profiles-2.20.86.jar.sha1 b/plugins/discovery-ec2/licenses/profiles-2.20.86.jar.sha1
deleted file mode 100644
index 425ce9b92f9f2..0000000000000
--- a/plugins/discovery-ec2/licenses/profiles-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-27a8f4aa488d1d3ef947865ee0190f16d10a3cc7
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/profiles-2.30.31.jar.sha1 b/plugins/discovery-ec2/licenses/profiles-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..6d4d2a1ac8d65
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/profiles-2.30.31.jar.sha1
@@ -0,0 +1 @@
+d6d2d5788695972140dfe8b012ea7ccd97b82eef
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/protocol-core-2.20.86.jar.sha1 b/plugins/discovery-ec2/licenses/protocol-core-2.20.86.jar.sha1
deleted file mode 100644
index 8de58699d8d82..0000000000000
--- a/plugins/discovery-ec2/licenses/protocol-core-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bd85984ac6327a50d20e7957ecebf4fa3ad7766b
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/protocol-core-2.30.31.jar.sha1 b/plugins/discovery-ec2/licenses/protocol-core-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..caae2a4302976
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/protocol-core-2.30.31.jar.sha1
@@ -0,0 +1 @@
+ee17b25525aee497b6d520c8e499f39de7204fbc
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/regions-2.20.86.jar.sha1 b/plugins/discovery-ec2/licenses/regions-2.20.86.jar.sha1
deleted file mode 100644
index 266bc76ad6f77..0000000000000
--- a/plugins/discovery-ec2/licenses/regions-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-04fd460ce1c633986ecef1b4218d3e7067a7087d
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/regions-2.30.31.jar.sha1 b/plugins/discovery-ec2/licenses/regions-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..8e9876686a144
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/regions-2.30.31.jar.sha1
@@ -0,0 +1 @@
+7ce1df66496dcf9b124edb78ab9675e1e7d5c427
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/retries-2.30.31.jar.sha1 b/plugins/discovery-ec2/licenses/retries-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..98b46e3439ac7
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/retries-2.30.31.jar.sha1
@@ -0,0 +1 @@
+b490f67c9d3f000ae40928d9aa3c9debceac0966
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/retries-LICENSE.txt b/plugins/discovery-ec2/licenses/retries-LICENSE.txt
new file mode 100644
index 0000000000000..d645695673349
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/retries-LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/plugins/discovery-ec2/licenses/retries-NOTICE.txt b/plugins/discovery-ec2/licenses/retries-NOTICE.txt
new file mode 100644
index 0000000000000..d2bc5723e9aea
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/retries-NOTICE.txt
@@ -0,0 +1,14 @@
+OpenSearch (https://opensearch.org/)
+Copyright OpenSearch Contributors
+
+This product includes software developed by
+Elasticsearch (http://www.elastic.co).
+Copyright 2009-2018 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
+
+This product includes software developed by
+Joda.org (http://www.joda.org/).
+
+
diff --git a/plugins/discovery-ec2/licenses/retries-spi-2.30.31.jar.sha1 b/plugins/discovery-ec2/licenses/retries-spi-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..854e3d7e4aebf
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/retries-spi-2.30.31.jar.sha1
@@ -0,0 +1 @@
+4d9166189594243f88045fbf0c871a81e3914c0b
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/retries-spi-LICENSE.txt b/plugins/discovery-ec2/licenses/retries-spi-LICENSE.txt
new file mode 100644
index 0000000000000..d645695673349
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/retries-spi-LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/plugins/discovery-ec2/licenses/retries-spi-NOTICE.txt b/plugins/discovery-ec2/licenses/retries-spi-NOTICE.txt
new file mode 100644
index 0000000000000..d2bc5723e9aea
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/retries-spi-NOTICE.txt
@@ -0,0 +1,14 @@
+OpenSearch (https://opensearch.org/)
+Copyright OpenSearch Contributors
+
+This product includes software developed by
+Elasticsearch (http://www.elastic.co).
+Copyright 2009-2018 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
+
+This product includes software developed by
+Joda.org (http://www.joda.org/).
+
+
diff --git a/plugins/discovery-ec2/licenses/sdk-core-2.20.86.jar.sha1 b/plugins/discovery-ec2/licenses/sdk-core-2.20.86.jar.sha1
deleted file mode 100644
index 9eca40e6b9a9a..0000000000000
--- a/plugins/discovery-ec2/licenses/sdk-core-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1b9df9ca5e4918fab05db3b703b2873e83104c30
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/sdk-core-2.30.31.jar.sha1 b/plugins/discovery-ec2/licenses/sdk-core-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..ee3d7e3bff68d
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/sdk-core-2.30.31.jar.sha1
@@ -0,0 +1 @@
+b95c07d4796105c2e61c4c6ab60e3189886b2787
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/third-party-jackson-core-2.20.86.jar.sha1 b/plugins/discovery-ec2/licenses/third-party-jackson-core-2.20.86.jar.sha1
deleted file mode 100644
index c9c3d4dc53505..0000000000000
--- a/plugins/discovery-ec2/licenses/third-party-jackson-core-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5ad6e7f7d52d8a5390b2daf2fd8ffcab97fe3102
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/third-party-jackson-core-2.30.31.jar.sha1 b/plugins/discovery-ec2/licenses/third-party-jackson-core-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..a07a8eda62447
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/third-party-jackson-core-2.30.31.jar.sha1
@@ -0,0 +1 @@
+100d8022939bd59cd7d2461bd4fb0fd9fa028499
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/utils-2.20.86.jar.sha1 b/plugins/discovery-ec2/licenses/utils-2.20.86.jar.sha1
deleted file mode 100644
index b91a3b3047570..0000000000000
--- a/plugins/discovery-ec2/licenses/utils-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7a61f8b3c54ecf3dc785830d4f482f19ca52bc57
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/utils-2.30.31.jar.sha1 b/plugins/discovery-ec2/licenses/utils-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..184ff1cc5f9ce
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/utils-2.30.31.jar.sha1
@@ -0,0 +1 @@
+3340adacb87ff28f90a039d57c81311b296db89e
\ No newline at end of file
diff --git a/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/AwsEc2ServiceImplTests.java b/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/AwsEc2ServiceImplTests.java
index 3164abe456515..d5f1a5e2d0e45 100644
--- a/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/AwsEc2ServiceImplTests.java
+++ b/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/AwsEc2ServiceImplTests.java
@@ -131,7 +131,7 @@ public void testAWSDefaultConfiguration() {
             Ec2ClientSettings.getClientSettings(Settings.EMPTY)
         );
 
-        assertNull(proxyConfiguration.scheme());
+        assertEquals("http", proxyConfiguration.scheme());
         assertNull(proxyConfiguration.host());
         assertThat(proxyConfiguration.port(), is(0));
         assertNull(proxyConfiguration.username());
diff --git a/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/Ec2DiscoveryPluginTests.java b/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/Ec2DiscoveryPluginTests.java
index bde508a0afe96..40c7ba4fc53d7 100644
--- a/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/Ec2DiscoveryPluginTests.java
+++ b/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/Ec2DiscoveryPluginTests.java
@@ -180,14 +180,11 @@ public void testClientSettingsReInit() throws IOException {
                         assertThat(credentials, instanceOf(AwsBasicCredentials.class));
                     }
 
-                    assertEquals(
-                        mockEc2Client.proxyConfiguration.toString(),
-                        "ProxyConfiguration(endpoint=https://proxy-host-1:881, username=proxy_username_1, preemptiveBasicAuthenticationEnabled=false)"
-                    );
                     assertEquals(mockEc2Client.proxyConfiguration.host(), "proxy-host-1");
                     assertEquals(mockEc2Client.proxyConfiguration.port(), 881);
                     assertEquals(mockEc2Client.proxyConfiguration.username(), "proxy_username_1");
                     assertEquals(mockEc2Client.proxyConfiguration.password(), "proxy_password_1");
+                    assertFalse(mockEc2Client.proxyConfiguration.preemptiveBasicAuthenticationEnabled());
                 }
                 // reload secure settings2
                 plugin.reload(settings2);
@@ -204,14 +201,11 @@ public void testClientSettingsReInit() throws IOException {
                         assertThat(credentials, instanceOf(AwsBasicCredentials.class));
                     }
 
-                    assertEquals(
-                        mockEc2Client.proxyConfiguration.toString(),
-                        "ProxyConfiguration(endpoint=https://proxy-host-1:881, username=proxy_username_1, preemptiveBasicAuthenticationEnabled=false)"
-                    );
                     assertEquals(mockEc2Client.proxyConfiguration.host(), "proxy-host-1");
                     assertEquals(mockEc2Client.proxyConfiguration.port(), 881);
                     assertEquals(mockEc2Client.proxyConfiguration.username(), "proxy_username_1");
                     assertEquals(mockEc2Client.proxyConfiguration.password(), "proxy_password_1");
+                    assertFalse(mockEc2Client.proxyConfiguration.preemptiveBasicAuthenticationEnabled());
                 }
             }
             try (AmazonEc2ClientReference clientReference = plugin.ec2Service.client()) {
@@ -228,14 +222,11 @@ public void testClientSettingsReInit() throws IOException {
                     assertThat(credentials, instanceOf(AwsBasicCredentials.class));
                 }
 
-                assertEquals(
-                    mockEc2Client.proxyConfiguration.toString(),
-                    "ProxyConfiguration(endpoint=https://proxy-host-2:882, username=proxy_username_2, preemptiveBasicAuthenticationEnabled=false)"
-                );
                 assertEquals(mockEc2Client.proxyConfiguration.host(), "proxy-host-2");
                 assertEquals(mockEc2Client.proxyConfiguration.port(), 882);
                 assertEquals(mockEc2Client.proxyConfiguration.username(), "proxy_username_2");
                 assertEquals(mockEc2Client.proxyConfiguration.password(), "proxy_password_2");
+                assertFalse(mockEc2Client.proxyConfiguration.preemptiveBasicAuthenticationEnabled());
             }
         }
     }
diff --git a/plugins/repository-s3/build.gradle b/plugins/repository-s3/build.gradle
index 6e84edddcc252..de9c5420ba034 100644
--- a/plugins/repository-s3/build.gradle
+++ b/plugins/repository-s3/build.gradle
@@ -51,6 +51,15 @@ dependencies {
   api "software.amazon.awssdk:annotations:${versions.aws}"
   api "software.amazon.awssdk:aws-core:${versions.aws}"
   api "software.amazon.awssdk:auth:${versions.aws}"
+  api "software.amazon.awssdk:identity-spi:${versions.aws}"
+  api "software.amazon.awssdk:checksums:${versions.aws}"
+  api "software.amazon.awssdk:checksums-spi:${versions.aws}"
+  api "software.amazon.awssdk.crt:aws-crt:${versions.awscrt}"
+  api "software.amazon.awssdk:http-auth:${versions.aws}"
+  api "software.amazon.awssdk:http-auth-aws:${versions.aws}"
+  api "software.amazon.awssdk:http-auth-spi:${versions.aws}"
+  api "software.amazon.awssdk:retries:${versions.aws}"
+  api "software.amazon.awssdk:retries-spi:${versions.aws}"
   api "software.amazon.awssdk:endpoints-spi:${versions.aws}"
   api "software.amazon.awssdk:http-client-spi:${versions.aws}"
   api "software.amazon.awssdk:apache-client:${versions.aws}"
@@ -517,34 +526,11 @@ thirdPartyAudit {
     'reactor.blockhound.BlockHound$Builder',
     'reactor.blockhound.integration.BlockHoundIntegration',
 
+    'org.graalvm.nativeimage.hosted.Feature',
+    'org.graalvm.nativeimage.hosted.Feature$AfterImageWriteAccess',
+
     'software.amazon.awssdk.arns.Arn',
     'software.amazon.awssdk.arns.ArnResource',
-    'software.amazon.awssdk.crt.CRT',
-    'software.amazon.awssdk.crt.auth.credentials.Credentials',
-    'software.amazon.awssdk.crt.auth.credentials.CredentialsProvider',
-    'software.amazon.awssdk.crt.auth.credentials.DelegateCredentialsProvider$DelegateCredentialsProviderBuilder',
-    'software.amazon.awssdk.crt.http.HttpHeader',
-    'software.amazon.awssdk.crt.http.HttpMonitoringOptions',
-    'software.amazon.awssdk.crt.http.HttpProxyOptions',
-    'software.amazon.awssdk.crt.http.HttpRequest',
-    'software.amazon.awssdk.crt.http.HttpRequestBodyStream',
-    'software.amazon.awssdk.crt.io.ClientBootstrap',
-    'software.amazon.awssdk.crt.io.ExponentialBackoffRetryOptions',
-    'software.amazon.awssdk.crt.io.StandardRetryOptions',
-    'software.amazon.awssdk.crt.io.TlsCipherPreference',
-    'software.amazon.awssdk.crt.io.TlsContext',
-    'software.amazon.awssdk.crt.io.TlsContextOptions',
-    'software.amazon.awssdk.crt.s3.ChecksumAlgorithm',
-    'software.amazon.awssdk.crt.s3.ChecksumConfig',
-    'software.amazon.awssdk.crt.s3.ChecksumConfig$ChecksumLocation',
-    'software.amazon.awssdk.crt.s3.ResumeToken',
-    'software.amazon.awssdk.crt.s3.S3Client',
-    'software.amazon.awssdk.crt.s3.S3ClientOptions',
-    'software.amazon.awssdk.crt.s3.S3FinishedResponseContext',
-    'software.amazon.awssdk.crt.s3.S3MetaRequest',
-    'software.amazon.awssdk.crt.s3.S3MetaRequestOptions',
-    'software.amazon.awssdk.crt.s3.S3MetaRequestOptions$MetaRequestType',
-    'software.amazon.awssdk.crt.s3.S3MetaRequestResponseHandler',
     'software.amazon.awssdk.crtcore.CrtConfigurationUtils',
     'software.amazon.awssdk.crtcore.CrtConnectionHealthConfiguration',
     'software.amazon.awssdk.crtcore.CrtConnectionHealthConfiguration$Builder',
diff --git a/plugins/repository-s3/licenses/annotations-2.20.86.jar.sha1 b/plugins/repository-s3/licenses/annotations-2.20.86.jar.sha1
deleted file mode 100644
index 8d30ad649916b..0000000000000
--- a/plugins/repository-s3/licenses/annotations-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7e785e9ecb1230e52e9daa713335f38809ddcb74
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/annotations-2.30.31.jar.sha1 b/plugins/repository-s3/licenses/annotations-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..d45f8758c9405
--- /dev/null
+++ b/plugins/repository-s3/licenses/annotations-2.30.31.jar.sha1
@@ -0,0 +1 @@
+c5acc1da9567290302d80ffa1633785afa4ce630
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/apache-client-2.20.86.jar.sha1 b/plugins/repository-s3/licenses/apache-client-2.20.86.jar.sha1
deleted file mode 100644
index e7ae36581925c..0000000000000
--- a/plugins/repository-s3/licenses/apache-client-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-af31c4d3abec23b73061c6965364a6e3abbcc01a
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/apache-client-2.30.31.jar.sha1 b/plugins/repository-s3/licenses/apache-client-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..97331cbda2c1b
--- /dev/null
+++ b/plugins/repository-s3/licenses/apache-client-2.30.31.jar.sha1
@@ -0,0 +1 @@
+d1c602dba702782a0afec0a08c919322693a3bf8
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/auth-2.20.86.jar.sha1 b/plugins/repository-s3/licenses/auth-2.20.86.jar.sha1
deleted file mode 100644
index e4c1b29cea894..0000000000000
--- a/plugins/repository-s3/licenses/auth-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f2da82f33776ce4814a3ab53b5ccb82a5d135936
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/auth-2.30.31.jar.sha1 b/plugins/repository-s3/licenses/auth-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..c1e199ca02fc8
--- /dev/null
+++ b/plugins/repository-s3/licenses/auth-2.30.31.jar.sha1
@@ -0,0 +1 @@
+8887962b04ce5f1a9f46d44acd806949b17082da
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/aws-core-2.20.86.jar.sha1 b/plugins/repository-s3/licenses/aws-core-2.20.86.jar.sha1
deleted file mode 100644
index d42a15c4da413..0000000000000
--- a/plugins/repository-s3/licenses/aws-core-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ea126147c3d17a8b3075e3122ec9c2b94fe1f6d5
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/aws-core-2.30.31.jar.sha1 b/plugins/repository-s3/licenses/aws-core-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..16050fd1d8c6d
--- /dev/null
+++ b/plugins/repository-s3/licenses/aws-core-2.30.31.jar.sha1
@@ -0,0 +1 @@
+5016fadbd7146171b4afe09eb0675b710b0f2d12
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/aws-crt-0.35.0.jar.sha1 b/plugins/repository-s3/licenses/aws-crt-0.35.0.jar.sha1
new file mode 100644
index 0000000000000..1097f5bb4d814
--- /dev/null
+++ b/plugins/repository-s3/licenses/aws-crt-0.35.0.jar.sha1
@@ -0,0 +1 @@
+33041403e1a9dd94f40330206eda5ffc22ee185c
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/aws-crt-LICENSE.txt b/plugins/repository-s3/licenses/aws-crt-LICENSE.txt
new file mode 100644
index 0000000000000..d645695673349
--- /dev/null
+++ b/plugins/repository-s3/licenses/aws-crt-LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/plugins/repository-s3/licenses/aws-crt-NOTICE.txt b/plugins/repository-s3/licenses/aws-crt-NOTICE.txt
new file mode 100644
index 0000000000000..d2bc5723e9aea
--- /dev/null
+++ b/plugins/repository-s3/licenses/aws-crt-NOTICE.txt
@@ -0,0 +1,14 @@
+OpenSearch (https://opensearch.org/)
+Copyright OpenSearch Contributors
+
+This product includes software developed by
+Elasticsearch (http://www.elastic.co).
+Copyright 2009-2018 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
+
+This product includes software developed by
+Joda.org (http://www.joda.org/).
+
+
diff --git a/plugins/repository-s3/licenses/aws-json-protocol-2.20.86.jar.sha1 b/plugins/repository-s3/licenses/aws-json-protocol-2.20.86.jar.sha1
deleted file mode 100644
index ee08d240fbfba..0000000000000
--- a/plugins/repository-s3/licenses/aws-json-protocol-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8b9d09c1aa9d3f2119267f0b6549ae1810512c7b
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/aws-json-protocol-2.30.31.jar.sha1 b/plugins/repository-s3/licenses/aws-json-protocol-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..bfc742d8687d1
--- /dev/null
+++ b/plugins/repository-s3/licenses/aws-json-protocol-2.30.31.jar.sha1
@@ -0,0 +1 @@
+4600659276f84e114c1fabeb1478911c581a7739
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/aws-query-protocol-2.20.86.jar.sha1 b/plugins/repository-s3/licenses/aws-query-protocol-2.20.86.jar.sha1
deleted file mode 100644
index 9b19f570d56fb..0000000000000
--- a/plugins/repository-s3/licenses/aws-query-protocol-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e001792ec1a681f5bc6ee4157d572173416304ad
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/aws-query-protocol-2.30.31.jar.sha1 b/plugins/repository-s3/licenses/aws-query-protocol-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..9508295147c96
--- /dev/null
+++ b/plugins/repository-s3/licenses/aws-query-protocol-2.30.31.jar.sha1
@@ -0,0 +1 @@
+61596c0cb577a4a6c438a5a7ee0391d2d825b3fe
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/aws-xml-protocol-2.20.86.jar.sha1 b/plugins/repository-s3/licenses/aws-xml-protocol-2.20.86.jar.sha1
deleted file mode 100644
index 50940d73f4f7b..0000000000000
--- a/plugins/repository-s3/licenses/aws-xml-protocol-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b78a1182a9cf3cccf416cc5a441d08174b08682d
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/aws-xml-protocol-2.30.31.jar.sha1 b/plugins/repository-s3/licenses/aws-xml-protocol-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..79a09fa635a20
--- /dev/null
+++ b/plugins/repository-s3/licenses/aws-xml-protocol-2.30.31.jar.sha1
@@ -0,0 +1 @@
+ad1620b4e221840e2215348a296cc762c23a59c3
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/checksums-2.30.31.jar.sha1 b/plugins/repository-s3/licenses/checksums-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..4447b86f6e872
--- /dev/null
+++ b/plugins/repository-s3/licenses/checksums-2.30.31.jar.sha1
@@ -0,0 +1 @@
+6d00287bc0ceb013dd5c74f1c4eb296ae61b34d4
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/checksums-LICENSE.txt b/plugins/repository-s3/licenses/checksums-LICENSE.txt
new file mode 100644
index 0000000000000..d645695673349
--- /dev/null
+++ b/plugins/repository-s3/licenses/checksums-LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/plugins/repository-s3/licenses/checksums-NOTICE.txt b/plugins/repository-s3/licenses/checksums-NOTICE.txt
new file mode 100644
index 0000000000000..d2bc5723e9aea
--- /dev/null
+++ b/plugins/repository-s3/licenses/checksums-NOTICE.txt
@@ -0,0 +1,14 @@
+OpenSearch (https://opensearch.org/)
+Copyright OpenSearch Contributors
+
+This product includes software developed by
+Elasticsearch (http://www.elastic.co).
+Copyright 2009-2018 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
+
+This product includes software developed by
+Joda.org (http://www.joda.org/).
+
+
diff --git a/plugins/repository-s3/licenses/checksums-spi-2.30.31.jar.sha1 b/plugins/repository-s3/licenses/checksums-spi-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..078cab150c5ad
--- /dev/null
+++ b/plugins/repository-s3/licenses/checksums-spi-2.30.31.jar.sha1
@@ -0,0 +1 @@
+b5a5b0a39403acf41c21fd16cd11c7c8d887601b
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/checksums-spi-LICENSE.txt b/plugins/repository-s3/licenses/checksums-spi-LICENSE.txt
new file mode 100644
index 0000000000000..d645695673349
--- /dev/null
+++ b/plugins/repository-s3/licenses/checksums-spi-LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/plugins/repository-s3/licenses/checksums-spi-NOTICE.txt b/plugins/repository-s3/licenses/checksums-spi-NOTICE.txt
new file mode 100644
index 0000000000000..d2bc5723e9aea
--- /dev/null
+++ b/plugins/repository-s3/licenses/checksums-spi-NOTICE.txt
@@ -0,0 +1,14 @@
+OpenSearch (https://opensearch.org/)
+Copyright OpenSearch Contributors
+
+This product includes software developed by
+Elasticsearch (http://www.elastic.co).
+Copyright 2009-2018 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
+
+This product includes software developed by
+Joda.org (http://www.joda.org/).
+
+
diff --git a/plugins/repository-s3/licenses/endpoints-spi-2.20.86.jar.sha1 b/plugins/repository-s3/licenses/endpoints-spi-2.20.86.jar.sha1
deleted file mode 100644
index 16f9db1fd6327..0000000000000
--- a/plugins/repository-s3/licenses/endpoints-spi-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2b9075dd0ed32da97f95229f55c01425353e8cba
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/endpoints-spi-2.30.31.jar.sha1 b/plugins/repository-s3/licenses/endpoints-spi-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..4dbc884c3da6f
--- /dev/null
+++ b/plugins/repository-s3/licenses/endpoints-spi-2.30.31.jar.sha1
@@ -0,0 +1 @@
+0734f4b9c68f19201896dd47639035b4e0a7964d
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/http-auth-2.30.31.jar.sha1 b/plugins/repository-s3/licenses/http-auth-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..79893fb4fbf58
--- /dev/null
+++ b/plugins/repository-s3/licenses/http-auth-2.30.31.jar.sha1
@@ -0,0 +1 @@
+b7baeb158b0af0e400d89a32595c9127db2bbb6e
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/http-auth-LICENSE.txt b/plugins/repository-s3/licenses/http-auth-LICENSE.txt
new file mode 100644
index 0000000000000..d645695673349
--- /dev/null
+++ b/plugins/repository-s3/licenses/http-auth-LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/plugins/repository-s3/licenses/http-auth-NOTICE.txt b/plugins/repository-s3/licenses/http-auth-NOTICE.txt
new file mode 100644
index 0000000000000..d2bc5723e9aea
--- /dev/null
+++ b/plugins/repository-s3/licenses/http-auth-NOTICE.txt
@@ -0,0 +1,14 @@
+OpenSearch (https://opensearch.org/)
+Copyright OpenSearch Contributors
+
+This product includes software developed by
+Elasticsearch (http://www.elastic.co).
+Copyright 2009-2018 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
+
+This product includes software developed by
+Joda.org (http://www.joda.org/).
+
+
diff --git a/plugins/repository-s3/licenses/http-auth-aws-2.30.31.jar.sha1 b/plugins/repository-s3/licenses/http-auth-aws-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..d190c6ca52e98
--- /dev/null
+++ b/plugins/repository-s3/licenses/http-auth-aws-2.30.31.jar.sha1
@@ -0,0 +1 @@
+f2a7d383158746c82b0f41b021e0da23a2597b35
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/http-auth-aws-LICENSE.txt b/plugins/repository-s3/licenses/http-auth-aws-LICENSE.txt
new file mode 100644
index 0000000000000..d645695673349
--- /dev/null
+++ b/plugins/repository-s3/licenses/http-auth-aws-LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/plugins/repository-s3/licenses/http-auth-aws-NOTICE.txt b/plugins/repository-s3/licenses/http-auth-aws-NOTICE.txt
new file mode 100644
index 0000000000000..d2bc5723e9aea
--- /dev/null
+++ b/plugins/repository-s3/licenses/http-auth-aws-NOTICE.txt
@@ -0,0 +1,14 @@
+OpenSearch (https://opensearch.org/)
+Copyright OpenSearch Contributors
+
+This product includes software developed by
+Elasticsearch (http://www.elastic.co).
+Copyright 2009-2018 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
+
+This product includes software developed by
+Joda.org (http://www.joda.org/).
+
+
diff --git a/plugins/repository-s3/licenses/http-auth-spi-2.30.31.jar.sha1 b/plugins/repository-s3/licenses/http-auth-spi-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..491ffe4dd0584
--- /dev/null
+++ b/plugins/repository-s3/licenses/http-auth-spi-2.30.31.jar.sha1
@@ -0,0 +1 @@
+513519f79635441d5205fc31d56c2e0d5826d27f
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/http-auth-spi-LICENSE.txt b/plugins/repository-s3/licenses/http-auth-spi-LICENSE.txt
new file mode 100644
index 0000000000000..d645695673349
--- /dev/null
+++ b/plugins/repository-s3/licenses/http-auth-spi-LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/plugins/repository-s3/licenses/http-auth-spi-NOTICE.txt b/plugins/repository-s3/licenses/http-auth-spi-NOTICE.txt
new file mode 100644
index 0000000000000..d2bc5723e9aea
--- /dev/null
+++ b/plugins/repository-s3/licenses/http-auth-spi-NOTICE.txt
@@ -0,0 +1,14 @@
+OpenSearch (https://opensearch.org/)
+Copyright OpenSearch Contributors
+
+This product includes software developed by
+Elasticsearch (http://www.elastic.co).
+Copyright 2009-2018 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
+
+This product includes software developed by
+Joda.org (http://www.joda.org/).
+
+
diff --git a/plugins/repository-s3/licenses/http-client-spi-2.20.86.jar.sha1 b/plugins/repository-s3/licenses/http-client-spi-2.20.86.jar.sha1
deleted file mode 100644
index 0662e15b1f3e6..0000000000000
--- a/plugins/repository-s3/licenses/http-client-spi-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-776bfc86fabc6e8c792ea4650a281d0bec5e9708
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/http-client-spi-2.30.31.jar.sha1 b/plugins/repository-s3/licenses/http-client-spi-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..d86fa139f535c
--- /dev/null
+++ b/plugins/repository-s3/licenses/http-client-spi-2.30.31.jar.sha1
@@ -0,0 +1 @@
+5fa894c333793b7481aa03aa87512b20e11b057d
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/identity-spi-2.30.31.jar.sha1 b/plugins/repository-s3/licenses/identity-spi-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..9eeab9ad13dba
--- /dev/null
+++ b/plugins/repository-s3/licenses/identity-spi-2.30.31.jar.sha1
@@ -0,0 +1 @@
+46da74ac074b176c25fba07c6541737422622c1d
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/identity-spi-LICENSE.txt b/plugins/repository-s3/licenses/identity-spi-LICENSE.txt
new file mode 100644
index 0000000000000..d645695673349
--- /dev/null
+++ b/plugins/repository-s3/licenses/identity-spi-LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/plugins/repository-s3/licenses/identity-spi-NOTICE.txt b/plugins/repository-s3/licenses/identity-spi-NOTICE.txt
new file mode 100644
index 0000000000000..d2bc5723e9aea
--- /dev/null
+++ b/plugins/repository-s3/licenses/identity-spi-NOTICE.txt
@@ -0,0 +1,14 @@
+OpenSearch (https://opensearch.org/)
+Copyright OpenSearch Contributors
+
+This product includes software developed by
+Elasticsearch (http://www.elastic.co).
+Copyright 2009-2018 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
+
+This product includes software developed by
+Joda.org (http://www.joda.org/).
+
+
diff --git a/plugins/repository-s3/licenses/json-utils-2.20.86.jar.sha1 b/plugins/repository-s3/licenses/json-utils-2.20.86.jar.sha1
deleted file mode 100644
index 7011f8c3e6c78..0000000000000
--- a/plugins/repository-s3/licenses/json-utils-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5dd418ad48e3bfd8c3fa05ff29a955b91c1af666
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/json-utils-2.30.31.jar.sha1 b/plugins/repository-s3/licenses/json-utils-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..5019f6d48fa0a
--- /dev/null
+++ b/plugins/repository-s3/licenses/json-utils-2.30.31.jar.sha1
@@ -0,0 +1 @@
+7f0ef4b49299df2fd39f92113d94524729c61032
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/metrics-spi-2.20.86.jar.sha1 b/plugins/repository-s3/licenses/metrics-spi-2.20.86.jar.sha1
deleted file mode 100644
index bbd88bb9e1b0c..0000000000000
--- a/plugins/repository-s3/licenses/metrics-spi-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-74a65d0f8decd0b3057fb500ca5409ff5778752a
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/metrics-spi-2.30.31.jar.sha1 b/plugins/repository-s3/licenses/metrics-spi-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..69ab3ec6f79ff
--- /dev/null
+++ b/plugins/repository-s3/licenses/metrics-spi-2.30.31.jar.sha1
@@ -0,0 +1 @@
+57a979cbc99d0bf4113d96aaf4f453303a015966
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-nio-client-2.20.86.jar.sha1 b/plugins/repository-s3/licenses/netty-nio-client-2.20.86.jar.sha1
deleted file mode 100644
index 4ae8b2ec5a23c..0000000000000
--- a/plugins/repository-s3/licenses/netty-nio-client-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-29195a65eeea36cf1960d1939bca6586d5842dad
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-nio-client-2.30.31.jar.sha1 b/plugins/repository-s3/licenses/netty-nio-client-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..f49d74cc59e37
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-nio-client-2.30.31.jar.sha1
@@ -0,0 +1 @@
+a7226fc3811c7a071e44a33273e081f212e581e3
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/profiles-2.20.86.jar.sha1 b/plugins/repository-s3/licenses/profiles-2.20.86.jar.sha1
deleted file mode 100644
index 425ce9b92f9f2..0000000000000
--- a/plugins/repository-s3/licenses/profiles-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-27a8f4aa488d1d3ef947865ee0190f16d10a3cc7
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/profiles-2.30.31.jar.sha1 b/plugins/repository-s3/licenses/profiles-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..6d4d2a1ac8d65
--- /dev/null
+++ b/plugins/repository-s3/licenses/profiles-2.30.31.jar.sha1
@@ -0,0 +1 @@
+d6d2d5788695972140dfe8b012ea7ccd97b82eef
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/protocol-core-2.20.86.jar.sha1 b/plugins/repository-s3/licenses/protocol-core-2.20.86.jar.sha1
deleted file mode 100644
index 8de58699d8d82..0000000000000
--- a/plugins/repository-s3/licenses/protocol-core-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bd85984ac6327a50d20e7957ecebf4fa3ad7766b
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/protocol-core-2.30.31.jar.sha1 b/plugins/repository-s3/licenses/protocol-core-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..caae2a4302976
--- /dev/null
+++ b/plugins/repository-s3/licenses/protocol-core-2.30.31.jar.sha1
@@ -0,0 +1 @@
+ee17b25525aee497b6d520c8e499f39de7204fbc
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/regions-2.20.86.jar.sha1 b/plugins/repository-s3/licenses/regions-2.20.86.jar.sha1
deleted file mode 100644
index 266bc76ad6f77..0000000000000
--- a/plugins/repository-s3/licenses/regions-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-04fd460ce1c633986ecef1b4218d3e7067a7087d
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/regions-2.30.31.jar.sha1 b/plugins/repository-s3/licenses/regions-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..8e9876686a144
--- /dev/null
+++ b/plugins/repository-s3/licenses/regions-2.30.31.jar.sha1
@@ -0,0 +1 @@
+7ce1df66496dcf9b124edb78ab9675e1e7d5c427
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/retries-2.30.31.jar.sha1 b/plugins/repository-s3/licenses/retries-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..98b46e3439ac7
--- /dev/null
+++ b/plugins/repository-s3/licenses/retries-2.30.31.jar.sha1
@@ -0,0 +1 @@
+b490f67c9d3f000ae40928d9aa3c9debceac0966
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/retries-LICENSE.txt b/plugins/repository-s3/licenses/retries-LICENSE.txt
new file mode 100644
index 0000000000000..d645695673349
--- /dev/null
+++ b/plugins/repository-s3/licenses/retries-LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/plugins/repository-s3/licenses/retries-NOTICE.txt b/plugins/repository-s3/licenses/retries-NOTICE.txt
new file mode 100644
index 0000000000000..d2bc5723e9aea
--- /dev/null
+++ b/plugins/repository-s3/licenses/retries-NOTICE.txt
@@ -0,0 +1,14 @@
+OpenSearch (https://opensearch.org/)
+Copyright OpenSearch Contributors
+
+This product includes software developed by
+Elasticsearch (http://www.elastic.co).
+Copyright 2009-2018 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
+
+This product includes software developed by
+Joda.org (http://www.joda.org/).
+
+
diff --git a/plugins/repository-s3/licenses/retries-spi-2.30.31.jar.sha1 b/plugins/repository-s3/licenses/retries-spi-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..854e3d7e4aebf
--- /dev/null
+++ b/plugins/repository-s3/licenses/retries-spi-2.30.31.jar.sha1
@@ -0,0 +1 @@
+4d9166189594243f88045fbf0c871a81e3914c0b
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/retries-spi-LICENSE.txt b/plugins/repository-s3/licenses/retries-spi-LICENSE.txt
new file mode 100644
index 0000000000000..d645695673349
--- /dev/null
+++ b/plugins/repository-s3/licenses/retries-spi-LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/plugins/repository-s3/licenses/retries-spi-NOTICE.txt b/plugins/repository-s3/licenses/retries-spi-NOTICE.txt
new file mode 100644
index 0000000000000..d2bc5723e9aea
--- /dev/null
+++ b/plugins/repository-s3/licenses/retries-spi-NOTICE.txt
@@ -0,0 +1,14 @@
+OpenSearch (https://opensearch.org/)
+Copyright OpenSearch Contributors
+
+This product includes software developed by
+Elasticsearch (http://www.elastic.co).
+Copyright 2009-2018 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
+
+This product includes software developed by
+Joda.org (http://www.joda.org/).
+
+
diff --git a/plugins/repository-s3/licenses/s3-2.20.86.jar.sha1 b/plugins/repository-s3/licenses/s3-2.20.86.jar.sha1
deleted file mode 100644
index 7125793759db5..0000000000000
--- a/plugins/repository-s3/licenses/s3-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6a37f591abd11a3f848f091f1724825741daaeb2
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/s3-2.30.31.jar.sha1 b/plugins/repository-s3/licenses/s3-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..eb9aa9d13fe83
--- /dev/null
+++ b/plugins/repository-s3/licenses/s3-2.30.31.jar.sha1
@@ -0,0 +1 @@
+958f263cf6b7e2ce6eb453627d57debd7fdd449b
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/sdk-core-2.20.86.jar.sha1 b/plugins/repository-s3/licenses/sdk-core-2.20.86.jar.sha1
deleted file mode 100644
index 9eca40e6b9a9a..0000000000000
--- a/plugins/repository-s3/licenses/sdk-core-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1b9df9ca5e4918fab05db3b703b2873e83104c30
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/sdk-core-2.30.31.jar.sha1 b/plugins/repository-s3/licenses/sdk-core-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..ee3d7e3bff68d
--- /dev/null
+++ b/plugins/repository-s3/licenses/sdk-core-2.30.31.jar.sha1
@@ -0,0 +1 @@
+b95c07d4796105c2e61c4c6ab60e3189886b2787
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/signer-2.20.86.jar.sha1 b/plugins/repository-s3/licenses/signer-2.20.86.jar.sha1
deleted file mode 100644
index cb73b19e14fcf..0000000000000
--- a/plugins/repository-s3/licenses/signer-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-52b92753b944d3e1b8c6814bc9d6c93119ca6421
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/signer-2.30.31.jar.sha1 b/plugins/repository-s3/licenses/signer-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..a03a173e4e2ad
--- /dev/null
+++ b/plugins/repository-s3/licenses/signer-2.30.31.jar.sha1
@@ -0,0 +1 @@
+e3d07951f347b85e5129cc31ed613a70f9259cac
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/sts-2.20.86.jar.sha1 b/plugins/repository-s3/licenses/sts-2.20.86.jar.sha1
deleted file mode 100644
index 1f40b6dcd8417..0000000000000
--- a/plugins/repository-s3/licenses/sts-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7415d850a4aea10935f84766065dd76a3d327a54
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/sts-2.30.31.jar.sha1 b/plugins/repository-s3/licenses/sts-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..3752d0003bc8d
--- /dev/null
+++ b/plugins/repository-s3/licenses/sts-2.30.31.jar.sha1
@@ -0,0 +1 @@
+fb85a774f8e7265ed4bc4255e6df8a80ee8cf4b9
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/third-party-jackson-core-2.20.86.jar.sha1 b/plugins/repository-s3/licenses/third-party-jackson-core-2.20.86.jar.sha1
deleted file mode 100644
index c9c3d4dc53505..0000000000000
--- a/plugins/repository-s3/licenses/third-party-jackson-core-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5ad6e7f7d52d8a5390b2daf2fd8ffcab97fe3102
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/third-party-jackson-core-2.30.31.jar.sha1 b/plugins/repository-s3/licenses/third-party-jackson-core-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..a07a8eda62447
--- /dev/null
+++ b/plugins/repository-s3/licenses/third-party-jackson-core-2.30.31.jar.sha1
@@ -0,0 +1 @@
+100d8022939bd59cd7d2461bd4fb0fd9fa028499
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/utils-2.20.86.jar.sha1 b/plugins/repository-s3/licenses/utils-2.20.86.jar.sha1
deleted file mode 100644
index b91a3b3047570..0000000000000
--- a/plugins/repository-s3/licenses/utils-2.20.86.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7a61f8b3c54ecf3dc785830d4f482f19ca52bc57
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/utils-2.30.31.jar.sha1 b/plugins/repository-s3/licenses/utils-2.30.31.jar.sha1
new file mode 100644
index 0000000000000..184ff1cc5f9ce
--- /dev/null
+++ b/plugins/repository-s3/licenses/utils-2.30.31.jar.sha1
@@ -0,0 +1 @@
+3340adacb87ff28f90a039d57c81311b296db89e
\ No newline at end of file