diff --git a/solr/licenses/annotations-2.42.37.jar.sha1 b/solr/licenses/annotations-2.42.37.jar.sha1
deleted file mode 100644
index dbcf3de7171c..000000000000
--- a/solr/licenses/annotations-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b1a13a1f1d3b5445e2f60dcc01c0e1c66662ce32
diff --git a/solr/licenses/annotations-2.46.17.jar.sha1 b/solr/licenses/annotations-2.46.17.jar.sha1
new file mode 100644
index 000000000000..3cf3b15c1481
--- /dev/null
+++ b/solr/licenses/annotations-2.46.17.jar.sha1
@@ -0,0 +1 @@
+421c380b853f3222bbb0c499191b1efc2b36ba7d
diff --git a/solr/licenses/apache-client-2.42.37.jar.sha1 b/solr/licenses/apache-client-2.42.37.jar.sha1
deleted file mode 100644
index 06b09d5efbe4..000000000000
--- a/solr/licenses/apache-client-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-34a1dcf7f2d504954b00b5d2df485b445ff0fe4a
diff --git a/solr/licenses/apache-client-2.46.17.jar.sha1 b/solr/licenses/apache-client-2.46.17.jar.sha1
new file mode 100644
index 000000000000..503cb79a1615
--- /dev/null
+++ b/solr/licenses/apache-client-2.46.17.jar.sha1
@@ -0,0 +1 @@
+79e3af1775fed1926f934782d6ac83cfdf7ad154
diff --git a/solr/licenses/apache5-client-2.46.17.jar.sha1 b/solr/licenses/apache5-client-2.46.17.jar.sha1
new file mode 100644
index 000000000000..1621bb74e4ff
--- /dev/null
+++ b/solr/licenses/apache5-client-2.46.17.jar.sha1
@@ -0,0 +1 @@
+6a8582139ffba62f07ee7fdad975f8f0253840f1
diff --git a/solr/licenses/apache5-client-LICENSE-ASL.txt b/solr/licenses/apache5-client-LICENSE-ASL.txt
new file mode 100644
index 000000000000..1eef70a9b9f4
--- /dev/null
+++ b/solr/licenses/apache5-client-LICENSE-ASL.txt
@@ -0,0 +1,206 @@
+
+                                 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.
+
+   Note: Other license terms may apply to certain, identified software files contained within or distributed
+   with the accompanying software if such terms are included in the directory containing the accompanying software.
+   Such other license terms will then apply in lieu of the terms of the software license above.
diff --git a/solr/licenses/apache5-client-NOTICE.txt b/solr/licenses/apache5-client-NOTICE.txt
new file mode 100644
index 000000000000..7b5a06890325
--- /dev/null
+++ b/solr/licenses/apache5-client-NOTICE.txt
@@ -0,0 +1,25 @@
+AWS SDK for Java 2.0
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+This product includes software developed by
+Amazon Technologies, Inc (http://www.amazon.com/).
+
+**********************
+THIRD PARTY COMPONENTS
+**********************
+This software includes third party software subject to the following copyrights:
+- XML parsing and utility functions from JetS3t - Copyright 2006-2009 James Murty.
+- PKCS#1 PEM encoded private key parsing and utility functions from oauth.googlecode.com - Copyright 1998-2010 AOL Inc.
+- Apache Commons Lang - https://github.com/apache/commons-lang
+- Netty Reactive Streams - https://github.com/playframework/netty-reactive-streams
+- Jackson-core - https://github.com/FasterXML/jackson-core
+- Jackson-dataformat-cbor - https://github.com/FasterXML/jackson-dataformats-binary
+
+The licenses for these third party components are included in LICENSE.txt
+
+- For Apache Commons Lang see also this required NOTICE:
+  Apache Commons Lang
+  Copyright 2001-2020 The Apache Software Foundation
+  
+  This product includes software developed at
+  The Apache Software Foundation (https://www.apache.org/).
diff --git a/solr/licenses/arns-2.42.37.jar.sha1 b/solr/licenses/arns-2.42.37.jar.sha1
deleted file mode 100644
index bd3ecaf3c21a..000000000000
--- a/solr/licenses/arns-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dfa5f78ee3ef1ae7751d77cbfea79ab9462a4eda
diff --git a/solr/licenses/arns-2.46.17.jar.sha1 b/solr/licenses/arns-2.46.17.jar.sha1
new file mode 100644
index 000000000000..2e87ec6d7fa1
--- /dev/null
+++ b/solr/licenses/arns-2.46.17.jar.sha1
@@ -0,0 +1 @@
+b39f0fbce96135c9b168cf3d24473a76f38cdbd1
diff --git a/solr/licenses/auth-2.42.37.jar.sha1 b/solr/licenses/auth-2.42.37.jar.sha1
deleted file mode 100644
index 82f6bede40be..000000000000
--- a/solr/licenses/auth-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1367486a9ad11dc1d86db7b91f1ae6763c80caa9
diff --git a/solr/licenses/auth-2.46.17.jar.sha1 b/solr/licenses/auth-2.46.17.jar.sha1
new file mode 100644
index 000000000000..501d7affea45
--- /dev/null
+++ b/solr/licenses/auth-2.46.17.jar.sha1
@@ -0,0 +1 @@
+0e7b3fe1baf2a4dbf1858ddea045d60950ccb04a
diff --git a/solr/licenses/aws-core-2.42.37.jar.sha1 b/solr/licenses/aws-core-2.42.37.jar.sha1
deleted file mode 100644
index 81229d11a2ab..000000000000
--- a/solr/licenses/aws-core-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-81da5401148dc666e61137c2ec4cb6d16a1d93e9
diff --git a/solr/licenses/aws-core-2.46.17.jar.sha1 b/solr/licenses/aws-core-2.46.17.jar.sha1
new file mode 100644
index 000000000000..c27f859d5fc0
--- /dev/null
+++ b/solr/licenses/aws-core-2.46.17.jar.sha1
@@ -0,0 +1 @@
+9dd4ab62a8ec46d8afc23b80a2e6e2472943b5a2
diff --git a/solr/licenses/aws-query-protocol-2.42.37.jar.sha1 b/solr/licenses/aws-query-protocol-2.42.37.jar.sha1
deleted file mode 100644
index 63439cfd09ef..000000000000
--- a/solr/licenses/aws-query-protocol-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e9e2849ad9acc8ac3589d9fb77c6ba9e5e7e327c
diff --git a/solr/licenses/aws-query-protocol-2.46.17.jar.sha1 b/solr/licenses/aws-query-protocol-2.46.17.jar.sha1
new file mode 100644
index 000000000000..a152d88a0a39
--- /dev/null
+++ b/solr/licenses/aws-query-protocol-2.46.17.jar.sha1
@@ -0,0 +1 @@
+b9661443d20f3d5e2a56c03f7952b93cb54c8e57
diff --git a/solr/licenses/aws-xml-protocol-2.42.37.jar.sha1 b/solr/licenses/aws-xml-protocol-2.42.37.jar.sha1
deleted file mode 100644
index c7d66dbc614a..000000000000
--- a/solr/licenses/aws-xml-protocol-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-495e1f5428bea389bd9bf4d431bc16445d9d6ce9
diff --git a/solr/licenses/aws-xml-protocol-2.46.17.jar.sha1 b/solr/licenses/aws-xml-protocol-2.46.17.jar.sha1
new file mode 100644
index 000000000000..90b4e2ba58a5
--- /dev/null
+++ b/solr/licenses/aws-xml-protocol-2.46.17.jar.sha1
@@ -0,0 +1 @@
+1375388137e71d4771a530b17c0776e3ffcb65f0
diff --git a/solr/licenses/checksums-2.42.37.jar.sha1 b/solr/licenses/checksums-2.42.37.jar.sha1
deleted file mode 100644
index 74684e7cf131..000000000000
--- a/solr/licenses/checksums-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b74d0ae9d5f24686f687687cf9f0fbf075eeaa63
diff --git a/solr/licenses/checksums-2.46.17.jar.sha1 b/solr/licenses/checksums-2.46.17.jar.sha1
new file mode 100644
index 000000000000..87c084ddde2e
--- /dev/null
+++ b/solr/licenses/checksums-2.46.17.jar.sha1
@@ -0,0 +1 @@
+003c13820784f5b2e9806e7ba2cd003bd1c30e91
diff --git a/solr/licenses/checksums-spi-2.42.37.jar.sha1 b/solr/licenses/checksums-spi-2.42.37.jar.sha1
deleted file mode 100644
index 29316fa67d0e..000000000000
--- a/solr/licenses/checksums-spi-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9efc58b403257390065e1dac7137a79e261df2a9
diff --git a/solr/licenses/checksums-spi-2.46.17.jar.sha1 b/solr/licenses/checksums-spi-2.46.17.jar.sha1
new file mode 100644
index 000000000000..55b16ac59ffd
--- /dev/null
+++ b/solr/licenses/checksums-spi-2.46.17.jar.sha1
@@ -0,0 +1 @@
+65d2b93a2e968bad046d930ad8a704d12d5742c1
diff --git a/solr/licenses/crt-core-2.42.37.jar.sha1 b/solr/licenses/crt-core-2.42.37.jar.sha1
deleted file mode 100644
index 6863d6be63fe..000000000000
--- a/solr/licenses/crt-core-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4e3d8cfb9b52b94f60a91849bbfa09c0bc0f1ab9
diff --git a/solr/licenses/crt-core-2.46.17.jar.sha1 b/solr/licenses/crt-core-2.46.17.jar.sha1
new file mode 100644
index 000000000000..ca4f76da8705
--- /dev/null
+++ b/solr/licenses/crt-core-2.46.17.jar.sha1
@@ -0,0 +1 @@
+a2b266e984177c7be2975757f50429e44854484a
diff --git a/solr/licenses/endpoints-spi-2.42.37.jar.sha1 b/solr/licenses/endpoints-spi-2.42.37.jar.sha1
deleted file mode 100644
index cb6f35d8a95a..000000000000
--- a/solr/licenses/endpoints-spi-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5cf2c9e67fdf32b57417f1975cdff243268e383a
diff --git a/solr/licenses/endpoints-spi-2.46.17.jar.sha1 b/solr/licenses/endpoints-spi-2.46.17.jar.sha1
new file mode 100644
index 000000000000..576fab8fdcde
--- /dev/null
+++ b/solr/licenses/endpoints-spi-2.46.17.jar.sha1
@@ -0,0 +1 @@
+6e85196754b8c948742d1716681e482f2b9dd492
diff --git a/solr/licenses/http-auth-2.42.37.jar.sha1 b/solr/licenses/http-auth-2.42.37.jar.sha1
deleted file mode 100644
index 7c240cb4aa5d..000000000000
--- a/solr/licenses/http-auth-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ad2b97b222ba564bc4e1f5d89a4edfe50e9bcdf8
diff --git a/solr/licenses/http-auth-2.46.17.jar.sha1 b/solr/licenses/http-auth-2.46.17.jar.sha1
new file mode 100644
index 000000000000..b4cf41acb7f3
--- /dev/null
+++ b/solr/licenses/http-auth-2.46.17.jar.sha1
@@ -0,0 +1 @@
+6f48708e7f978969ade0115ebb27c9e0d2db7e05
diff --git a/solr/licenses/http-auth-aws-2.42.37.jar.sha1 b/solr/licenses/http-auth-aws-2.42.37.jar.sha1
deleted file mode 100644
index db90fbda51f5..000000000000
--- a/solr/licenses/http-auth-aws-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-98fa9005878817a77ca4ac8bd36173e5fd7762e8
diff --git a/solr/licenses/http-auth-aws-2.46.17.jar.sha1 b/solr/licenses/http-auth-aws-2.46.17.jar.sha1
new file mode 100644
index 000000000000..066fe1c23eea
--- /dev/null
+++ b/solr/licenses/http-auth-aws-2.46.17.jar.sha1
@@ -0,0 +1 @@
+03cdf15a6cf03428c77247c8564c875a606b2690
diff --git a/solr/licenses/http-auth-aws-eventstream-2.42.37.jar.sha1 b/solr/licenses/http-auth-aws-eventstream-2.42.37.jar.sha1
deleted file mode 100644
index 92d481ec2554..000000000000
--- a/solr/licenses/http-auth-aws-eventstream-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-443b35c30db91baad70a365c68243f0e08caf70c
diff --git a/solr/licenses/http-auth-aws-eventstream-2.46.17.jar.sha1 b/solr/licenses/http-auth-aws-eventstream-2.46.17.jar.sha1
new file mode 100644
index 000000000000..8c033da9a752
--- /dev/null
+++ b/solr/licenses/http-auth-aws-eventstream-2.46.17.jar.sha1
@@ -0,0 +1 @@
+37b17870c6b9d4ab05eeba668c895717b7b82cd8
diff --git a/solr/licenses/http-auth-spi-2.42.37.jar.sha1 b/solr/licenses/http-auth-spi-2.42.37.jar.sha1
deleted file mode 100644
index c45d3c53f511..000000000000
--- a/solr/licenses/http-auth-spi-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e72436b6c5e7601f2d6172b09fe44ab5c97c33e7
diff --git a/solr/licenses/http-auth-spi-2.46.17.jar.sha1 b/solr/licenses/http-auth-spi-2.46.17.jar.sha1
new file mode 100644
index 000000000000..5a77da086039
--- /dev/null
+++ b/solr/licenses/http-auth-spi-2.46.17.jar.sha1
@@ -0,0 +1 @@
+7d9f5207119ac239e43d9e413eb3d45a689f83b1
diff --git a/solr/licenses/http-client-spi-2.42.37.jar.sha1 b/solr/licenses/http-client-spi-2.42.37.jar.sha1
deleted file mode 100644
index 85a0700bd9b0..000000000000
--- a/solr/licenses/http-client-spi-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a6a7d757cc5c0606c725228a25c5800ef2380d5d
diff --git a/solr/licenses/http-client-spi-2.46.17.jar.sha1 b/solr/licenses/http-client-spi-2.46.17.jar.sha1
new file mode 100644
index 000000000000..eecacdca41ae
--- /dev/null
+++ b/solr/licenses/http-client-spi-2.46.17.jar.sha1
@@ -0,0 +1 @@
+2ab1a2fce74d4594ac03067da6bac0b3fea23b17
diff --git a/solr/licenses/httpclient5-5.2.1.jar.sha1 b/solr/licenses/httpclient5-5.2.1.jar.sha1
deleted file mode 100644
index 5008d9aae803..000000000000
--- a/solr/licenses/httpclient5-5.2.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0c900514d3446d9ce5d9dbd90c21192048125440
diff --git a/solr/licenses/httpclient5-5.6.1.jar.sha1 b/solr/licenses/httpclient5-5.6.1.jar.sha1
new file mode 100644
index 000000000000..69efb3603e85
--- /dev/null
+++ b/solr/licenses/httpclient5-5.6.1.jar.sha1
@@ -0,0 +1 @@
+b418ba210ace28adf920f1decf64d673953d07cf
diff --git a/solr/licenses/httpcore5-5.2.3.jar.sha1 b/solr/licenses/httpcore5-5.2.3.jar.sha1
deleted file mode 100644
index 9a0b58fcbfdc..000000000000
--- a/solr/licenses/httpcore5-5.2.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-687cede1a44f70c7741abfab6ee2aa53dd2bfb54
diff --git a/solr/licenses/httpcore5-5.4.2.jar.sha1 b/solr/licenses/httpcore5-5.4.2.jar.sha1
new file mode 100644
index 000000000000..c9048d8d404d
--- /dev/null
+++ b/solr/licenses/httpcore5-5.4.2.jar.sha1
@@ -0,0 +1 @@
+346d5f65ff819510666541ba94b3abf747454916
diff --git a/solr/licenses/httpcore5-h2-5.2.jar.sha1 b/solr/licenses/httpcore5-h2-5.2.jar.sha1
deleted file mode 100644
index ff13228a443e..000000000000
--- a/solr/licenses/httpcore5-h2-5.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-698bd8c759ccc7fd7398f3179ff45d0e5a7ccc16
diff --git a/solr/licenses/httpcore5-h2-5.4.jar.sha1 b/solr/licenses/httpcore5-h2-5.4.jar.sha1
new file mode 100644
index 000000000000..f8e386f67ab1
--- /dev/null
+++ b/solr/licenses/httpcore5-h2-5.4.jar.sha1
@@ -0,0 +1 @@
+83cdd62ef3140664f46be59c2c2727141d1c5a32
diff --git a/solr/licenses/identity-spi-2.42.37.jar.sha1 b/solr/licenses/identity-spi-2.42.37.jar.sha1
deleted file mode 100644
index 0319e9963c18..000000000000
--- a/solr/licenses/identity-spi-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c0bcbea7717e6220421af3c320f59272e1964a25
diff --git a/solr/licenses/identity-spi-2.46.17.jar.sha1 b/solr/licenses/identity-spi-2.46.17.jar.sha1
new file mode 100644
index 000000000000..ca08123ca054
--- /dev/null
+++ b/solr/licenses/identity-spi-2.46.17.jar.sha1
@@ -0,0 +1 @@
+063c6435d7633e01c714ff1e28b7fe13c846a45d
diff --git a/solr/licenses/json-utils-2.42.37.jar.sha1 b/solr/licenses/json-utils-2.42.37.jar.sha1
deleted file mode 100644
index 0dd0e260574b..000000000000
--- a/solr/licenses/json-utils-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bed7e7e88026ff273838cbd40de3b9eded21e306
diff --git a/solr/licenses/json-utils-2.46.17.jar.sha1 b/solr/licenses/json-utils-2.46.17.jar.sha1
new file mode 100644
index 000000000000..d7014fee416b
--- /dev/null
+++ b/solr/licenses/json-utils-2.46.17.jar.sha1
@@ -0,0 +1 @@
+24ec06a3d5b9d430e6de1d88cf041be36a7fd560
diff --git a/solr/licenses/metrics-spi-2.42.37.jar.sha1 b/solr/licenses/metrics-spi-2.42.37.jar.sha1
deleted file mode 100644
index e892e21ff55c..000000000000
--- a/solr/licenses/metrics-spi-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-87e9e8c04f82394aa7cb916616e1cbcfc7a954f8
diff --git a/solr/licenses/metrics-spi-2.46.17.jar.sha1 b/solr/licenses/metrics-spi-2.46.17.jar.sha1
new file mode 100644
index 000000000000..8a367fab7bd8
--- /dev/null
+++ b/solr/licenses/metrics-spi-2.46.17.jar.sha1
@@ -0,0 +1 @@
+532e07e3a4236bae07bd63c90d7914f52dd23d5f
diff --git a/solr/licenses/profiles-2.42.37.jar.sha1 b/solr/licenses/profiles-2.42.37.jar.sha1
deleted file mode 100644
index 7a9c3b0f0e29..000000000000
--- a/solr/licenses/profiles-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b2e57056153651f93a826a6e0cfc2d935d876ee3
diff --git a/solr/licenses/profiles-2.46.17.jar.sha1 b/solr/licenses/profiles-2.46.17.jar.sha1
new file mode 100644
index 000000000000..4d913b17675b
--- /dev/null
+++ b/solr/licenses/profiles-2.46.17.jar.sha1
@@ -0,0 +1 @@
+4d7a10d2e471740e1055a1513ed996a762850ccf
diff --git a/solr/licenses/protocol-core-2.42.37.jar.sha1 b/solr/licenses/protocol-core-2.42.37.jar.sha1
deleted file mode 100644
index 0e838547cc83..000000000000
--- a/solr/licenses/protocol-core-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-49bcc7cdf41b39b84f83f22201f888ac6d60b3e8
diff --git a/solr/licenses/protocol-core-2.46.17.jar.sha1 b/solr/licenses/protocol-core-2.46.17.jar.sha1
new file mode 100644
index 000000000000..e21f46dcdab6
--- /dev/null
+++ b/solr/licenses/protocol-core-2.46.17.jar.sha1
@@ -0,0 +1 @@
+63c63ddd7dbaab91f9406625578fd1969b34108d
diff --git a/solr/licenses/regions-2.42.37.jar.sha1 b/solr/licenses/regions-2.42.37.jar.sha1
deleted file mode 100644
index 42d0cc1ff7da..000000000000
--- a/solr/licenses/regions-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9f2f7e54e093b5d77638b97f5fa087bbc38f7638
diff --git a/solr/licenses/regions-2.46.17.jar.sha1 b/solr/licenses/regions-2.46.17.jar.sha1
new file mode 100644
index 000000000000..5ad50fc4fb10
--- /dev/null
+++ b/solr/licenses/regions-2.46.17.jar.sha1
@@ -0,0 +1 @@
+ec6c415cf5ebbb9ddd72fdadf14aedaf828a3b6b
diff --git a/solr/licenses/retries-2.42.37.jar.sha1 b/solr/licenses/retries-2.42.37.jar.sha1
deleted file mode 100644
index 9a9273794346..000000000000
--- a/solr/licenses/retries-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-360553c72c0e1b1949b8109bf4f202096bf3eac7
diff --git a/solr/licenses/retries-2.46.17.jar.sha1 b/solr/licenses/retries-2.46.17.jar.sha1
new file mode 100644
index 000000000000..468ea2d84a63
--- /dev/null
+++ b/solr/licenses/retries-2.46.17.jar.sha1
@@ -0,0 +1 @@
+33b5700ff1bb58a76e9b67867540aa3a961f03c5
diff --git a/solr/licenses/retries-spi-2.42.37.jar.sha1 b/solr/licenses/retries-spi-2.42.37.jar.sha1
deleted file mode 100644
index 66207ff36536..000000000000
--- a/solr/licenses/retries-spi-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-de34d04f9fc382bea4b91c6e398739512db0b96e
diff --git a/solr/licenses/retries-spi-2.46.17.jar.sha1 b/solr/licenses/retries-spi-2.46.17.jar.sha1
new file mode 100644
index 000000000000..6129b120878c
--- /dev/null
+++ b/solr/licenses/retries-spi-2.46.17.jar.sha1
@@ -0,0 +1 @@
+ffb9e4fc620e9779b53b959125a86921b945cf70
diff --git a/solr/licenses/s3-2.42.37.jar.sha1 b/solr/licenses/s3-2.42.37.jar.sha1
deleted file mode 100644
index 4f9e990c363e..000000000000
--- a/solr/licenses/s3-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1f84320b40a915b39b002bcd08247c6c4186be47
diff --git a/solr/licenses/s3-2.46.17.jar.sha1 b/solr/licenses/s3-2.46.17.jar.sha1
new file mode 100644
index 000000000000..f2dc072d7380
--- /dev/null
+++ b/solr/licenses/s3-2.46.17.jar.sha1
@@ -0,0 +1 @@
+3f3a90c40030235f3f2d754fc5d85703b5b37223
diff --git a/solr/licenses/sdk-core-2.42.37.jar.sha1 b/solr/licenses/sdk-core-2.42.37.jar.sha1
deleted file mode 100644
index 71dc4bad1a23..000000000000
--- a/solr/licenses/sdk-core-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-07de694e0e72862f093c5c837f27fb384a6b9610
diff --git a/solr/licenses/sdk-core-2.46.17.jar.sha1 b/solr/licenses/sdk-core-2.46.17.jar.sha1
new file mode 100644
index 000000000000..97965e1afa23
--- /dev/null
+++ b/solr/licenses/sdk-core-2.46.17.jar.sha1
@@ -0,0 +1 @@
+a5ce78d4f92624100ab39e721929534f93f08df7
diff --git a/solr/licenses/sts-2.42.37.jar.sha1 b/solr/licenses/sts-2.42.37.jar.sha1
deleted file mode 100644
index 1090f07d7282..000000000000
--- a/solr/licenses/sts-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e1ce18a7bb2209d6203073357e77d470c4573f06
diff --git a/solr/licenses/sts-2.46.17.jar.sha1 b/solr/licenses/sts-2.46.17.jar.sha1
new file mode 100644
index 000000000000..2d61277af183
--- /dev/null
+++ b/solr/licenses/sts-2.46.17.jar.sha1
@@ -0,0 +1 @@
+022d998b64f71e57057bef3580cec6f60a701c82
diff --git a/solr/licenses/third-party-jackson-core-2.42.37.jar.sha1 b/solr/licenses/third-party-jackson-core-2.42.37.jar.sha1
deleted file mode 100644
index 6fb5a7ac5af8..000000000000
--- a/solr/licenses/third-party-jackson-core-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-09ad8d94e91bfa5c6e2ceb0aa9b9f3201ebf9ab9
diff --git a/solr/licenses/third-party-jackson-core-2.46.17.jar.sha1 b/solr/licenses/third-party-jackson-core-2.46.17.jar.sha1
new file mode 100644
index 000000000000..8ebf5401c59c
--- /dev/null
+++ b/solr/licenses/third-party-jackson-core-2.46.17.jar.sha1
@@ -0,0 +1 @@
+1d6ca0541e795b6386885c7ec88d0139e0a00bed
diff --git a/solr/licenses/url-connection-client-2.42.37.jar.sha1 b/solr/licenses/url-connection-client-2.42.37.jar.sha1
deleted file mode 100644
index 6ac8dc316dfe..000000000000
--- a/solr/licenses/url-connection-client-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0d6dc3d6fdf3404e29321698c0c7ea4b0de2c90d
diff --git a/solr/licenses/url-connection-client-2.46.17.jar.sha1 b/solr/licenses/url-connection-client-2.46.17.jar.sha1
new file mode 100644
index 000000000000..88eaafae6eb5
--- /dev/null
+++ b/solr/licenses/url-connection-client-2.46.17.jar.sha1
@@ -0,0 +1 @@
+33203e981c224fa4356cf7b8c025c075b327fb21
diff --git a/solr/licenses/utils-2.42.37.jar.sha1 b/solr/licenses/utils-2.42.37.jar.sha1
deleted file mode 100644
index cdea5b4a6636..000000000000
--- a/solr/licenses/utils-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9b862317e697a236013adbd9299174595ed279bb
diff --git a/solr/licenses/utils-2.46.17.jar.sha1 b/solr/licenses/utils-2.46.17.jar.sha1
new file mode 100644
index 000000000000..8279faa5d3e5
--- /dev/null
+++ b/solr/licenses/utils-2.46.17.jar.sha1
@@ -0,0 +1 @@
+1e40b6fd0e0eaf72e6339f05ce0209da60713d91
diff --git a/solr/licenses/utils-lite-2.42.37.jar.sha1 b/solr/licenses/utils-lite-2.42.37.jar.sha1
deleted file mode 100644
index 28a9b84e9b95..000000000000
--- a/solr/licenses/utils-lite-2.42.37.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7fbe573b0b7764ae29d2b36e63543a372c4cbbfb
diff --git a/solr/licenses/utils-lite-2.46.17.jar.sha1 b/solr/licenses/utils-lite-2.46.17.jar.sha1
new file mode 100644
index 000000000000..b35707755efe
--- /dev/null
+++ b/solr/licenses/utils-lite-2.46.17.jar.sha1
@@ -0,0 +1 @@
+9d7f08d137796e1877694313c59dff8e469a7dfd
diff --git a/versions.lock b/versions.lock
index 1b2d685a5bae..da93de04ee96 100644
--- a/versions.lock
+++ b/versions.lock
@@ -196,9 +196,9 @@ org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.5.0 (1 constraints: 0805ff35)
 org.apache.httpcomponents:httpclient:4.5.14 (7 constraints: b7695b2f)
 org.apache.httpcomponents:httpcore:4.4.16 (6 constraints: ea5cc678)
 org.apache.httpcomponents:httpmime:4.5.14 (1 constraints: 40054f3b)
-org.apache.httpcomponents.client5:httpclient5:5.2.1 (1 constraints: 6b10bdb3)
-org.apache.httpcomponents.core5:httpcore5:5.2.3 (3 constraints: 40351d23)
-org.apache.httpcomponents.core5:httpcore5-h2:5.2 (1 constraints: dd12c315)
+org.apache.httpcomponents.client5:httpclient5:5.6.1 (2 constraints: 6520b445)
+org.apache.httpcomponents.core5:httpcore5:5.4.2 (4 constraints: 3d45d154)
+org.apache.httpcomponents.core5:httpcore5-h2:5.4 (1 constraints: df12c515)
 org.apache.kafka:kafka-clients:3.9.2 (13 constraints: 7db456b4)
 org.apache.kafka:kafka-group-coordinator:3.9.2 (2 constraints: aa1748bd)
 org.apache.kafka:kafka-group-coordinator-api:3.9.2 (2 constraints: 111c3e15)
@@ -345,37 +345,38 @@ org.slf4j:jul-to-slf4j:2.0.17 (2 constraints: c11bd27e)
 org.slf4j:slf4j-api:2.0.17 (68 constraints: 6cd32dae)
 org.threeten:threetenbp:1.6.9 (4 constraints: 2833ea68)
 org.xerial.snappy:snappy-java:1.1.10.8 (5 constraints: c146fa38)
-software.amazon.awssdk:annotations:2.42.37 (30 constraints: 48cb1be0)
-software.amazon.awssdk:apache-client:2.42.37 (4 constraints: 092a12e2)
-software.amazon.awssdk:arns:2.42.37 (2 constraints: 1f1828c1)
-software.amazon.awssdk:auth:2.42.37 (5 constraints: 4738643e)
-software.amazon.awssdk:aws-core:2.42.37 (6 constraints: f84d7b1c)
-software.amazon.awssdk:aws-query-protocol:2.42.37 (3 constraints: 582a2ddd)
-software.amazon.awssdk:aws-xml-protocol:2.42.37 (2 constraints: 1f1828c1)
-software.amazon.awssdk:bom:2.42.37 (1 constraints: 7405b840)
-software.amazon.awssdk:checksums:2.42.37 (4 constraints: 883656f4)
-software.amazon.awssdk:checksums-spi:2.42.37 (7 constraints: 6f622c0d)
-software.amazon.awssdk:crt-core:2.42.37 (1 constraints: c40b9df9)
-software.amazon.awssdk:endpoints-spi:2.42.37 (5 constraints: 09414072)
-software.amazon.awssdk:http-auth:2.42.37 (5 constraints: a33ffc76)
-software.amazon.awssdk:http-auth-aws:2.42.37 (5 constraints: 9a3f655a)
-software.amazon.awssdk:http-auth-aws-eventstream:2.42.37 (2 constraints: 2b190fff)
-software.amazon.awssdk:http-auth-spi:2.42.37 (8 constraints: c86c0fd5)
-software.amazon.awssdk:http-client-spi:2.42.37 (15 constraints: 68da0709)
-software.amazon.awssdk:identity-spi:2.42.37 (9 constraints: fd7c9bb9)
-software.amazon.awssdk:json-utils:2.42.37 (5 constraints: 793fae3c)
-software.amazon.awssdk:metrics-spi:2.42.37 (7 constraints: 3662850f)
-software.amazon.awssdk:profiles:2.42.37 (8 constraints: 5f617a41)
-software.amazon.awssdk:protocol-core:2.42.37 (5 constraints: 85483c58)
-software.amazon.awssdk:regions:2.42.37 (7 constraints: 40501bad)
-software.amazon.awssdk:retries:2.42.37 (3 constraints: cf284227)
-software.amazon.awssdk:retries-spi:2.42.37 (7 constraints: 9754df98)
-software.amazon.awssdk:s3:2.42.37 (4 constraints: e32f12c0)
-software.amazon.awssdk:sdk-core:2.42.37 (10 constraints: 7e877bde)
-software.amazon.awssdk:sts:2.42.37 (2 constraints: cf110715)
-software.amazon.awssdk:third-party-jackson-core:2.42.37 (2 constraints: 911bdaa7)
-software.amazon.awssdk:utils:2.42.37 (26 constraints: 2684ebff)
-software.amazon.awssdk:utils-lite:2.42.37 (2 constraints: 9a1a0d72)
+software.amazon.awssdk:annotations:2.46.17 (31 constraints: e6db2e80)
+software.amazon.awssdk:apache-client:2.46.17 (2 constraints: d3116915)
+software.amazon.awssdk:apache5-client:2.46.17 (3 constraints: 9c24d24a)
+software.amazon.awssdk:arns:2.46.17 (2 constraints: 231888c1)
+software.amazon.awssdk:auth:2.46.17 (5 constraints: 51388841)
+software.amazon.awssdk:aws-core:2.46.17 (6 constraints: 044e6321)
+software.amazon.awssdk:aws-query-protocol:2.46.17 (3 constraints: 5e2a2fde)
+software.amazon.awssdk:aws-xml-protocol:2.46.17 (2 constraints: 231888c1)
+software.amazon.awssdk:bom:2.46.17 (1 constraints: 7605c440)
+software.amazon.awssdk:checksums:2.46.17 (4 constraints: 903670f6)
+software.amazon.awssdk:checksums-spi:2.46.17 (7 constraints: 7d626814)
+software.amazon.awssdk:crt-core:2.46.17 (1 constraints: c60ba9f9)
+software.amazon.awssdk:endpoints-spi:2.46.17 (5 constraints: 13417a75)
+software.amazon.awssdk:http-auth:2.46.17 (5 constraints: ad3f207a)
+software.amazon.awssdk:http-auth-aws:2.46.17 (5 constraints: a43f9f5d)
+software.amazon.awssdk:http-auth-aws-eventstream:2.46.17 (2 constraints: 2f1971ff)
+software.amazon.awssdk:http-auth-spi:2.46.17 (8 constraints: d86c37de)
+software.amazon.awssdk:http-client-spi:2.46.17 (16 constraints: e8ea66a9)
+software.amazon.awssdk:identity-spi:2.46.17 (9 constraints: 0f7d8bc5)
+software.amazon.awssdk:json-utils:2.46.17 (5 constraints: 833fd83f)
+software.amazon.awssdk:metrics-spi:2.46.17 (8 constraints: a672306c)
+software.amazon.awssdk:profiles:2.46.17 (8 constraints: 6f615a4a)
+software.amazon.awssdk:protocol-core:2.46.17 (5 constraints: 8f48705b)
+software.amazon.awssdk:regions:2.46.17 (7 constraints: 4c500db2)
+software.amazon.awssdk:retries:2.46.17 (3 constraints: d5285828)
+software.amazon.awssdk:retries-spi:2.46.17 (7 constraints: a554919f)
+software.amazon.awssdk:s3:2.46.17 (4 constraints: e72f26c1)
+software.amazon.awssdk:sdk-core:2.46.17 (10 constraints: 92876ded)
+software.amazon.awssdk:sts:2.46.17 (2 constraints: d3116915)
+software.amazon.awssdk:third-party-jackson-core:2.46.17 (2 constraints: 951b4aa8)
+software.amazon.awssdk:utils:2.46.17 (27 constraints: ba943b6d)
+software.amazon.awssdk:utils-lite:2.46.17 (2 constraints: 9e1a6f72)
 software.amazon.eventstream:eventstream:1.0.1 (3 constraints: cd2e5385)
 ua.net.nlp:morfologik-ukrainian-search:4.9.1 (1 constraints: d5126e1e)
 
@@ -465,5 +466,5 @@ org.springframework.boot:spring-boot-starter-logging:2.7.13 (1 constraints: 6e13
 org.springframework.boot:spring-boot-starter-web:2.7.13 (1 constraints: f30a39d6)
 org.testcontainers:testcontainers:1.20.4 (1 constraints: 3905313b)
 org.yaml:snakeyaml:1.30 (1 constraints: 0713d91f)
-software.amazon.awssdk:url-connection-client:2.42.37 (2 constraints: 461f04f7)
+software.amazon.awssdk:url-connection-client:2.46.17 (2 constraints: 481f10f7)
 software.amazon.ion:ion-java:1.0.2 (1 constraints: 720db831)
diff --git a/versions.props b/versions.props
index db559662c37a..ae0f03064f6f 100644
--- a/versions.props
+++ b/versions.props
@@ -85,4 +85,4 @@ org.semver4j:semver4j=5.8.0
 org.slf4j:*=2.0.17
 org.testcontainers:testcontainers*=1.20.4
 org.xerial.snappy:snappy-java=1.1.10.8
-software.amazon.awssdk:*=2.42.37
+software.amazon.awssdk:*=2.46.17