You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by kr...@apache.org on 2023/05/15 17:19:49 UTC
[solr] branch branch_9x updated: Revert "Update dependencies com.adobe.testing:s3mock-junit4 to v2.11.0, org.springframework.boot:spring-boot to 2.7.10, org.springframework:spring to 5.3.26, and software.amazon.awssdk to 2.19.1 (#1535)"
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new b016f12395a Revert "Update dependencies com.adobe.testing:s3mock-junit4 to v2.11.0, org.springframework.boot:spring-boot to 2.7.10, org.springframework:spring to 5.3.26, and software.amazon.awssdk to 2.19.1 (#1535)"
b016f12395a is described below
commit b016f12395a4d44169d6a7372c29b3d30ae05d69
Author: Kevin Risden <kr...@apache.org>
AuthorDate: Mon May 15 13:16:58 2023 -0400
Revert "Update dependencies com.adobe.testing:s3mock-junit4 to v2.11.0, org.springframework.boot:spring-boot to 2.7.10, org.springframework:spring to 5.3.26, and software.amazon.awssdk to 2.19.1 (#1535)"
This reverts commit 43a19cfce15a86af06be3bed830c0c5756abba21.
---
.../randomization/policies/solr-tests.policy | 3 -
solr/licenses/annotations-2.17.63.jar.sha1 | 1 +
solr/licenses/annotations-2.19.1.jar.sha1 | 1 -
solr/licenses/apache-client-2.17.63.jar.sha1 | 1 +
solr/licenses/apache-client-2.19.1.jar.sha1 | 1 -
solr/licenses/arns-2.17.63.jar.sha1 | 1 +
solr/licenses/arns-2.19.1.jar.sha1 | 1 -
solr/licenses/auth-2.17.63.jar.sha1 | 1 +
solr/licenses/auth-2.19.1.jar.sha1 | 1 -
solr/licenses/aws-core-2.17.63.jar.sha1 | 1 +
solr/licenses/aws-core-2.19.1.jar.sha1 | 1 -
solr/licenses/aws-java-sdk-core-1.12.15.jar.sha1 | 1 +
solr/licenses/aws-java-sdk-core-1.12.369.jar.sha1 | 1 -
solr/licenses/aws-java-sdk-kms-1.12.15.jar.sha1 | 1 +
solr/licenses/aws-java-sdk-kms-1.12.369.jar.sha1 | 1 -
solr/licenses/aws-java-sdk-s3-1.12.15.jar.sha1 | 1 +
solr/licenses/aws-java-sdk-s3-1.12.369.jar.sha1 | 1 -
solr/licenses/aws-query-protocol-2.17.63.jar.sha1 | 1 +
solr/licenses/aws-query-protocol-2.19.1.jar.sha1 | 1 -
solr/licenses/aws-xml-protocol-2.17.63.jar.sha1 | 1 +
solr/licenses/aws-xml-protocol-2.19.1.jar.sha1 | 1 -
solr/licenses/endpoints-spi-2.19.1.jar.sha1 | 1 -
solr/licenses/endpoints-spi-LICENSE-ASL.txt | 53 ----------
solr/licenses/endpoints-spi-NOTICE.txt | 14 ---
solr/licenses/http-client-spi-2.17.63.jar.sha1 | 1 +
solr/licenses/http-client-spi-2.19.1.jar.sha1 | 1 -
solr/licenses/jaxb-runtime-2.3.5.jar.sha1 | 1 +
solr/licenses/jaxb-runtime-2.3.7.jar.sha1 | 1 -
solr/licenses/jmespath-java-1.12.15.jar.sha1 | 1 +
solr/licenses/jmespath-java-1.12.369.jar.sha1 | 1 -
solr/licenses/json-utils-2.17.63.jar.sha1 | 1 +
solr/licenses/json-utils-2.19.1.jar.sha1 | 1 -
solr/licenses/metrics-spi-2.17.63.jar.sha1 | 1 +
solr/licenses/metrics-spi-2.19.1.jar.sha1 | 1 -
solr/licenses/micrometer-core-1.7.12.jar.sha1 | 1 +
solr/licenses/micrometer-core-1.9.9.jar.sha1 | 1 -
solr/licenses/profiles-2.17.63.jar.sha1 | 1 +
solr/licenses/profiles-2.19.1.jar.sha1 | 1 -
solr/licenses/protocol-core-2.17.63.jar.sha1 | 1 +
solr/licenses/protocol-core-2.19.1.jar.sha1 | 1 -
solr/licenses/regions-2.17.63.jar.sha1 | 1 +
solr/licenses/regions-2.19.1.jar.sha1 | 1 -
solr/licenses/s3-2.17.63.jar.sha1 | 1 +
solr/licenses/s3-2.19.1.jar.sha1 | 1 -
solr/licenses/s3mock-2.1.34.jar.sha1 | 1 +
solr/licenses/s3mock-2.11.0.jar.sha1 | 1 -
solr/licenses/s3mock-junit4-2.1.34.jar.sha1 | 1 +
solr/licenses/s3mock-junit4-2.11.0.jar.sha1 | 1 -
.../s3mock-testsupport-common-2.1.34.jar.sha1 | 1 +
.../s3mock-testsupport-common-2.11.0.jar.sha1 | 1 -
solr/licenses/sdk-core-2.17.63.jar.sha1 | 1 +
solr/licenses/sdk-core-2.19.1.jar.sha1 | 1 -
solr/licenses/snakeyaml-1.28.jar.sha1 | 1 +
solr/licenses/snakeyaml-1.30.jar.sha1 | 1 -
solr/licenses/spring-aop-5.3.23.jar.sha1 | 1 +
solr/licenses/spring-aop-5.3.26.jar.sha1 | 1 -
solr/licenses/spring-beans-5.3.23.jar.sha1 | 1 +
solr/licenses/spring-beans-5.3.26.jar.sha1 | 1 -
solr/licenses/spring-boot-2.5.14.jar.sha1 | 1 +
solr/licenses/spring-boot-2.7.10.jar.sha1 | 1 -
solr/licenses/spring-boot-actuator-2.5.14.jar.sha1 | 1 +
solr/licenses/spring-boot-actuator-2.7.10.jar.sha1 | 1 -
...ing-boot-actuator-autoconfigure-2.5.14.jar.sha1 | 1 +
...ing-boot-actuator-autoconfigure-2.7.10.jar.sha1 | 1 -
.../spring-boot-autoconfigure-2.5.14.jar.sha1 | 1 +
.../spring-boot-autoconfigure-2.7.10.jar.sha1 | 1 -
solr/licenses/spring-boot-starter-2.5.14.jar.sha1 | 1 +
solr/licenses/spring-boot-starter-2.7.10.jar.sha1 | 1 -
.../spring-boot-starter-actuator-2.5.14.jar.sha1 | 1 +
.../spring-boot-starter-actuator-2.7.10.jar.sha1 | 1 -
.../spring-boot-starter-jetty-2.5.14.jar.sha1 | 1 +
.../spring-boot-starter-jetty-2.7.10.jar.sha1 | 1 -
.../spring-boot-starter-json-2.5.14.jar.sha1 | 1 +
.../spring-boot-starter-json-2.7.10.jar.sha1 | 1 -
.../spring-boot-starter-logging-2.5.14.jar.sha1 | 1 +
.../spring-boot-starter-logging-2.7.10.jar.sha1 | 1 -
.../spring-boot-starter-web-2.5.14.jar.sha1 | 1 +
.../spring-boot-starter-web-2.7.10.jar.sha1 | 1 -
solr/licenses/spring-context-5.3.23.jar.sha1 | 1 +
solr/licenses/spring-context-5.3.26.jar.sha1 | 1 -
solr/licenses/spring-core-5.3.23.jar.sha1 | 1 +
solr/licenses/spring-core-5.3.26.jar.sha1 | 1 -
solr/licenses/spring-expression-5.3.23.jar.sha1 | 1 +
solr/licenses/spring-expression-5.3.26.jar.sha1 | 1 -
solr/licenses/spring-jcl-5.3.23.jar.sha1 | 1 +
solr/licenses/spring-jcl-5.3.26.jar.sha1 | 1 -
solr/licenses/spring-web-5.3.23.jar.sha1 | 1 +
solr/licenses/spring-web-5.3.26.jar.sha1 | 1 -
solr/licenses/spring-webmvc-5.3.23.jar.sha1 | 1 +
solr/licenses/spring-webmvc-5.3.26.jar.sha1 | 1 -
solr/licenses/sts-2.17.63.jar.sha1 | 1 +
solr/licenses/sts-2.19.1.jar.sha1 | 1 -
.../third-party-jackson-core-2.17.63.jar.sha1 | 1 +
.../third-party-jackson-core-2.19.1.jar.sha1 | 1 -
solr/licenses/tomcat-embed-el-9.0.63.jar.sha1 | 1 +
solr/licenses/tomcat-embed-el-9.0.73.jar.sha1 | 1 -
solr/licenses/txw2-2.3.5.jar.sha1 | 1 +
solr/licenses/txw2-2.3.7.jar.sha1 | 1 -
.../url-connection-client-2.17.63.jar.sha1 | 1 +
.../licenses/url-connection-client-2.19.1.jar.sha1 | 1 -
solr/licenses/utils-2.17.63.jar.sha1 | 1 +
solr/licenses/utils-2.19.1.jar.sha1 | 1 -
.../java/org/apache/solr/s3/S3StorageClient.java | 3 -
.../org/apache/solr/s3/S3BackupRepositoryTest.java | 4 +-
.../src/test/org/apache/solr/s3/S3PathsTest.java | 2 +-
.../collections/AbstractBackupRepositoryTest.java | 18 ++--
.../collections/AbstractIncrementalBackupTest.java | 2 +-
versions.lock | 117 ++++++++++-----------
versions.props | 8 +-
109 files changed, 124 insertions(+), 199 deletions(-)
diff --git a/gradle/testing/randomization/policies/solr-tests.policy b/gradle/testing/randomization/policies/solr-tests.policy
index 43b7446ece8..2d699cdb56e 100644
--- a/gradle/testing/randomization/policies/solr-tests.policy
+++ b/gradle/testing/randomization/policies/solr-tests.policy
@@ -144,9 +144,6 @@ grant {
permission javax.xml.bind.JAXBPermission "setDatatypeConverter";
- // needed by s3mock
- permission java.lang.RuntimePermission "accessClassInPackage.sun.nio.fs";
-
// SSL related properties for Solr tests
permission javax.net.ssl.SSLPermission "setDefaultSSLContext";
diff --git a/solr/licenses/annotations-2.17.63.jar.sha1 b/solr/licenses/annotations-2.17.63.jar.sha1
new file mode 100644
index 00000000000..bc853b6e42a
--- /dev/null
+++ b/solr/licenses/annotations-2.17.63.jar.sha1
@@ -0,0 +1 @@
+599f644340477536866076c5e255197111ebac72
diff --git a/solr/licenses/annotations-2.19.1.jar.sha1 b/solr/licenses/annotations-2.19.1.jar.sha1
deleted file mode 100644
index d26d04aaaba..00000000000
--- a/solr/licenses/annotations-2.19.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7f997d71e88fcf45467231bcc255a212656be4a9
diff --git a/solr/licenses/apache-client-2.17.63.jar.sha1 b/solr/licenses/apache-client-2.17.63.jar.sha1
new file mode 100644
index 00000000000..cb392314bc7
--- /dev/null
+++ b/solr/licenses/apache-client-2.17.63.jar.sha1
@@ -0,0 +1 @@
+252e49b4abce929c30848b33bd6e9620412c6731
diff --git a/solr/licenses/apache-client-2.19.1.jar.sha1 b/solr/licenses/apache-client-2.19.1.jar.sha1
deleted file mode 100644
index abee274f918..00000000000
--- a/solr/licenses/apache-client-2.19.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-78b9f8c2680b696ca09b28182a779d6b57edde93
diff --git a/solr/licenses/arns-2.17.63.jar.sha1 b/solr/licenses/arns-2.17.63.jar.sha1
new file mode 100644
index 00000000000..9dd868ef958
--- /dev/null
+++ b/solr/licenses/arns-2.17.63.jar.sha1
@@ -0,0 +1 @@
+8b76ee1514a65b5891bcf957ad118c8f8ab441b8
diff --git a/solr/licenses/arns-2.19.1.jar.sha1 b/solr/licenses/arns-2.19.1.jar.sha1
deleted file mode 100644
index b87f40aad0f..00000000000
--- a/solr/licenses/arns-2.19.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4d21c37a1f7eded752bb694095edd78e97a63dee
diff --git a/solr/licenses/auth-2.17.63.jar.sha1 b/solr/licenses/auth-2.17.63.jar.sha1
new file mode 100644
index 00000000000..5567c2dcad4
--- /dev/null
+++ b/solr/licenses/auth-2.17.63.jar.sha1
@@ -0,0 +1 @@
+93adf1d64823a5c81a141b69cf8d9a0a0a3f15e1
diff --git a/solr/licenses/auth-2.19.1.jar.sha1 b/solr/licenses/auth-2.19.1.jar.sha1
deleted file mode 100644
index eeed2922d82..00000000000
--- a/solr/licenses/auth-2.19.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e6f05f12153be962f923c1d3a989b19be84f12f4
diff --git a/solr/licenses/aws-core-2.17.63.jar.sha1 b/solr/licenses/aws-core-2.17.63.jar.sha1
new file mode 100644
index 00000000000..2e4d4b8b651
--- /dev/null
+++ b/solr/licenses/aws-core-2.17.63.jar.sha1
@@ -0,0 +1 @@
+dceb84de5c839f3b9888d18806235155b2769471
diff --git a/solr/licenses/aws-core-2.19.1.jar.sha1 b/solr/licenses/aws-core-2.19.1.jar.sha1
deleted file mode 100644
index 3699ebd2d86..00000000000
--- a/solr/licenses/aws-core-2.19.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-184be3dc2a0653ed684b66aed48e22b0bf0c5f2d
diff --git a/solr/licenses/aws-java-sdk-core-1.12.15.jar.sha1 b/solr/licenses/aws-java-sdk-core-1.12.15.jar.sha1
new file mode 100644
index 00000000000..840ba4d358b
--- /dev/null
+++ b/solr/licenses/aws-java-sdk-core-1.12.15.jar.sha1
@@ -0,0 +1 @@
+6b3df58b3908dfaf7bdef66005d5bc190117debb
diff --git a/solr/licenses/aws-java-sdk-core-1.12.369.jar.sha1 b/solr/licenses/aws-java-sdk-core-1.12.369.jar.sha1
deleted file mode 100644
index 7eafd6f907e..00000000000
--- a/solr/licenses/aws-java-sdk-core-1.12.369.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b1c5247aaa9701fb215a2d19cd8f235470ec23dc
diff --git a/solr/licenses/aws-java-sdk-kms-1.12.15.jar.sha1 b/solr/licenses/aws-java-sdk-kms-1.12.15.jar.sha1
new file mode 100644
index 00000000000..be936a01da1
--- /dev/null
+++ b/solr/licenses/aws-java-sdk-kms-1.12.15.jar.sha1
@@ -0,0 +1 @@
+c22f8a7a167de059645ce65ce4f41a22d9287e04
diff --git a/solr/licenses/aws-java-sdk-kms-1.12.369.jar.sha1 b/solr/licenses/aws-java-sdk-kms-1.12.369.jar.sha1
deleted file mode 100644
index 64d88b7e2c4..00000000000
--- a/solr/licenses/aws-java-sdk-kms-1.12.369.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-807ce9341d88858bc9315c4d986a92f5e9582b9c
diff --git a/solr/licenses/aws-java-sdk-s3-1.12.15.jar.sha1 b/solr/licenses/aws-java-sdk-s3-1.12.15.jar.sha1
new file mode 100644
index 00000000000..1a8a33c600f
--- /dev/null
+++ b/solr/licenses/aws-java-sdk-s3-1.12.15.jar.sha1
@@ -0,0 +1 @@
+d360360ca1a93cce9efa197be138e6f8741dd716
diff --git a/solr/licenses/aws-java-sdk-s3-1.12.369.jar.sha1 b/solr/licenses/aws-java-sdk-s3-1.12.369.jar.sha1
deleted file mode 100644
index e576de5e0e1..00000000000
--- a/solr/licenses/aws-java-sdk-s3-1.12.369.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-691e59352e58a6f758ba319013bccd1ace872594
diff --git a/solr/licenses/aws-query-protocol-2.17.63.jar.sha1 b/solr/licenses/aws-query-protocol-2.17.63.jar.sha1
new file mode 100644
index 00000000000..f8a83c074a6
--- /dev/null
+++ b/solr/licenses/aws-query-protocol-2.17.63.jar.sha1
@@ -0,0 +1 @@
+4fb16d65dde6f2279ac0823de038b11d1b1296a7
diff --git a/solr/licenses/aws-query-protocol-2.19.1.jar.sha1 b/solr/licenses/aws-query-protocol-2.19.1.jar.sha1
deleted file mode 100644
index b865d13b02f..00000000000
--- a/solr/licenses/aws-query-protocol-2.19.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-24c1ebb8ec890776b02c401716673f86bba5352f
diff --git a/solr/licenses/aws-xml-protocol-2.17.63.jar.sha1 b/solr/licenses/aws-xml-protocol-2.17.63.jar.sha1
new file mode 100644
index 00000000000..ff5c09f0515
--- /dev/null
+++ b/solr/licenses/aws-xml-protocol-2.17.63.jar.sha1
@@ -0,0 +1 @@
+91259bb6f7be19ec8f2dcb780bb1a8f7681ea790
diff --git a/solr/licenses/aws-xml-protocol-2.19.1.jar.sha1 b/solr/licenses/aws-xml-protocol-2.19.1.jar.sha1
deleted file mode 100644
index 6a6ebdb55d3..00000000000
--- a/solr/licenses/aws-xml-protocol-2.19.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7a07a7650ff846f3f1ddd1e03773117a27888eb0
diff --git a/solr/licenses/endpoints-spi-2.19.1.jar.sha1 b/solr/licenses/endpoints-spi-2.19.1.jar.sha1
deleted file mode 100644
index 0bb6ff3443d..00000000000
--- a/solr/licenses/endpoints-spi-2.19.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-72b11a82f2b97388912bd7c8e368d1b7734b7511
diff --git a/solr/licenses/endpoints-spi-LICENSE-ASL.txt b/solr/licenses/endpoints-spi-LICENSE-ASL.txt
deleted file mode 100644
index 22d244f8c3a..00000000000
--- a/solr/licenses/endpoints-spi-LICENSE-ASL.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-Apache License
-Version 2.0, January 2004
-
-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 it [...]
-
-"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 combin [...]
-
-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:
-
- 1. You must give any other recipients of the Work or Derivative Works a copy of this License; and
- 2. You must cause any modified files to carry prominent notices stating that You changed the files; and
- 3. 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
- 4. 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 Work [...]
-
-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 [...]
-
-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 limit [...]
-
-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 h [...]
-
-END OF TERMS AND CONDITIONS
-
-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/endpoints-spi-NOTICE.txt b/solr/licenses/endpoints-spi-NOTICE.txt
deleted file mode 100644
index 303d412734f..00000000000
--- a/solr/licenses/endpoints-spi-NOTICE.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-AWS SDK for Java
-Copyright 2010-2014 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.
-
-The licenses for these third party components are included in LICENSE.txt
diff --git a/solr/licenses/http-client-spi-2.17.63.jar.sha1 b/solr/licenses/http-client-spi-2.17.63.jar.sha1
new file mode 100644
index 00000000000..9a8121304cd
--- /dev/null
+++ b/solr/licenses/http-client-spi-2.17.63.jar.sha1
@@ -0,0 +1 @@
+3d34c848cb6f007360da6dd75e57b4ff32a712ef
diff --git a/solr/licenses/http-client-spi-2.19.1.jar.sha1 b/solr/licenses/http-client-spi-2.19.1.jar.sha1
deleted file mode 100644
index ccdc66fea33..00000000000
--- a/solr/licenses/http-client-spi-2.19.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fcb6229aca049ea608c739c5a0fda2eeb4c9ab4d
diff --git a/solr/licenses/jaxb-runtime-2.3.5.jar.sha1 b/solr/licenses/jaxb-runtime-2.3.5.jar.sha1
new file mode 100644
index 00000000000..c61fff6d309
--- /dev/null
+++ b/solr/licenses/jaxb-runtime-2.3.5.jar.sha1
@@ -0,0 +1 @@
+a169a961a2bb9ac69517ec1005e451becf5cdfab
diff --git a/solr/licenses/jaxb-runtime-2.3.7.jar.sha1 b/solr/licenses/jaxb-runtime-2.3.7.jar.sha1
deleted file mode 100644
index 54fd7fb6dea..00000000000
--- a/solr/licenses/jaxb-runtime-2.3.7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ebcde6a44159eb9e3db721dfe6b45f26e6272341
diff --git a/solr/licenses/jmespath-java-1.12.15.jar.sha1 b/solr/licenses/jmespath-java-1.12.15.jar.sha1
new file mode 100644
index 00000000000..4c4c3889dc0
--- /dev/null
+++ b/solr/licenses/jmespath-java-1.12.15.jar.sha1
@@ -0,0 +1 @@
+a61d37bf81e4e2ff9a9b16491e8697cfab4bdee5
diff --git a/solr/licenses/jmespath-java-1.12.369.jar.sha1 b/solr/licenses/jmespath-java-1.12.369.jar.sha1
deleted file mode 100644
index 843a0f6e8b0..00000000000
--- a/solr/licenses/jmespath-java-1.12.369.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0ddf72369229e32634b94cda92cad5d08e98c7c8
diff --git a/solr/licenses/json-utils-2.17.63.jar.sha1 b/solr/licenses/json-utils-2.17.63.jar.sha1
new file mode 100644
index 00000000000..6af220fe9e5
--- /dev/null
+++ b/solr/licenses/json-utils-2.17.63.jar.sha1
@@ -0,0 +1 @@
+2bfd957071b0c3c6d5a413b4f00501b67669c3dd
diff --git a/solr/licenses/json-utils-2.19.1.jar.sha1 b/solr/licenses/json-utils-2.19.1.jar.sha1
deleted file mode 100644
index f63bd355ad1..00000000000
--- a/solr/licenses/json-utils-2.19.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d5c19389d0f6bc84e333f51e965f4cfc77b42192
diff --git a/solr/licenses/metrics-spi-2.17.63.jar.sha1 b/solr/licenses/metrics-spi-2.17.63.jar.sha1
new file mode 100644
index 00000000000..fbf0817f3b3
--- /dev/null
+++ b/solr/licenses/metrics-spi-2.17.63.jar.sha1
@@ -0,0 +1 @@
+0e28a7880239d3a3adf33a72591f3b943793445d
diff --git a/solr/licenses/metrics-spi-2.19.1.jar.sha1 b/solr/licenses/metrics-spi-2.19.1.jar.sha1
deleted file mode 100644
index e2f3fc1f8e2..00000000000
--- a/solr/licenses/metrics-spi-2.19.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-45ee961b4c9cfef7c1dc492c7e0028a24e0fdf27
diff --git a/solr/licenses/micrometer-core-1.7.12.jar.sha1 b/solr/licenses/micrometer-core-1.7.12.jar.sha1
new file mode 100644
index 00000000000..7fbe56d5602
--- /dev/null
+++ b/solr/licenses/micrometer-core-1.7.12.jar.sha1
@@ -0,0 +1 @@
+2a6df7cf6131216940f3ae64c0c6b290d77de0cd
diff --git a/solr/licenses/micrometer-core-1.9.9.jar.sha1 b/solr/licenses/micrometer-core-1.9.9.jar.sha1
deleted file mode 100644
index 452d7c25c5f..00000000000
--- a/solr/licenses/micrometer-core-1.9.9.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-71ca38f65a24b2fda26ff5c0cce78699c9d31d49
diff --git a/solr/licenses/profiles-2.17.63.jar.sha1 b/solr/licenses/profiles-2.17.63.jar.sha1
new file mode 100644
index 00000000000..f896e38ee31
--- /dev/null
+++ b/solr/licenses/profiles-2.17.63.jar.sha1
@@ -0,0 +1 @@
+58fab0a5d8cc836465c1124de6a723a322389073
diff --git a/solr/licenses/profiles-2.19.1.jar.sha1 b/solr/licenses/profiles-2.19.1.jar.sha1
deleted file mode 100644
index d9df40fc703..00000000000
--- a/solr/licenses/profiles-2.19.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-234d2c1603ee6320c3c002adc9f4d922d1d3f46c
diff --git a/solr/licenses/protocol-core-2.17.63.jar.sha1 b/solr/licenses/protocol-core-2.17.63.jar.sha1
new file mode 100644
index 00000000000..a0846bf51ac
--- /dev/null
+++ b/solr/licenses/protocol-core-2.17.63.jar.sha1
@@ -0,0 +1 @@
+dd41fa62ba7ccf1171279b4e6e29e1cb4706250e
diff --git a/solr/licenses/protocol-core-2.19.1.jar.sha1 b/solr/licenses/protocol-core-2.19.1.jar.sha1
deleted file mode 100644
index 63fd761459b..00000000000
--- a/solr/licenses/protocol-core-2.19.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e22829648b1048a8c04afbc44ebf980d2813927b
diff --git a/solr/licenses/regions-2.17.63.jar.sha1 b/solr/licenses/regions-2.17.63.jar.sha1
new file mode 100644
index 00000000000..33cc3cbbbf0
--- /dev/null
+++ b/solr/licenses/regions-2.17.63.jar.sha1
@@ -0,0 +1 @@
+dc592a4db459766bcedd1df94db11a64ba82477c
diff --git a/solr/licenses/regions-2.19.1.jar.sha1 b/solr/licenses/regions-2.19.1.jar.sha1
deleted file mode 100644
index ef18acb856d..00000000000
--- a/solr/licenses/regions-2.19.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-88463fbb02efe9f7f8e034c67e32518fc293cce1
diff --git a/solr/licenses/s3-2.17.63.jar.sha1 b/solr/licenses/s3-2.17.63.jar.sha1
new file mode 100644
index 00000000000..5eb230676e3
--- /dev/null
+++ b/solr/licenses/s3-2.17.63.jar.sha1
@@ -0,0 +1 @@
+bcd787e10b955fd2e222063a8768fdc66422e8da
diff --git a/solr/licenses/s3-2.19.1.jar.sha1 b/solr/licenses/s3-2.19.1.jar.sha1
deleted file mode 100644
index 809ff7777f8..00000000000
--- a/solr/licenses/s3-2.19.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-de2b254642388ef34971765d1550cf0100f2b364
diff --git a/solr/licenses/s3mock-2.1.34.jar.sha1 b/solr/licenses/s3mock-2.1.34.jar.sha1
new file mode 100644
index 00000000000..9dede15e5dd
--- /dev/null
+++ b/solr/licenses/s3mock-2.1.34.jar.sha1
@@ -0,0 +1 @@
+1d01b90a971d751444251bc72be019a77eb77a7b
diff --git a/solr/licenses/s3mock-2.11.0.jar.sha1 b/solr/licenses/s3mock-2.11.0.jar.sha1
deleted file mode 100644
index 1ff4ca434e8..00000000000
--- a/solr/licenses/s3mock-2.11.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-53d4206ef435744eeee7bdb7c7d8871caddd25f6
diff --git a/solr/licenses/s3mock-junit4-2.1.34.jar.sha1 b/solr/licenses/s3mock-junit4-2.1.34.jar.sha1
new file mode 100644
index 00000000000..bf545362441
--- /dev/null
+++ b/solr/licenses/s3mock-junit4-2.1.34.jar.sha1
@@ -0,0 +1 @@
+ddac2928d2bf30dab3a3330f43a5c02a2315cda8
diff --git a/solr/licenses/s3mock-junit4-2.11.0.jar.sha1 b/solr/licenses/s3mock-junit4-2.11.0.jar.sha1
deleted file mode 100644
index bf66b76dbf7..00000000000
--- a/solr/licenses/s3mock-junit4-2.11.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-95565959537aebda7480edd6d92d942528ebd9a0
diff --git a/solr/licenses/s3mock-testsupport-common-2.1.34.jar.sha1 b/solr/licenses/s3mock-testsupport-common-2.1.34.jar.sha1
new file mode 100644
index 00000000000..dabafd70c94
--- /dev/null
+++ b/solr/licenses/s3mock-testsupport-common-2.1.34.jar.sha1
@@ -0,0 +1 @@
+09e127b9e40a01f16bdd510f2aaf490b17e1b1f3
diff --git a/solr/licenses/s3mock-testsupport-common-2.11.0.jar.sha1 b/solr/licenses/s3mock-testsupport-common-2.11.0.jar.sha1
deleted file mode 100644
index efd5cef0d64..00000000000
--- a/solr/licenses/s3mock-testsupport-common-2.11.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ddbdfc49083dfd77e2bc3b105ca830744fac3bda
diff --git a/solr/licenses/sdk-core-2.17.63.jar.sha1 b/solr/licenses/sdk-core-2.17.63.jar.sha1
new file mode 100644
index 00000000000..26f8f5d6bb1
--- /dev/null
+++ b/solr/licenses/sdk-core-2.17.63.jar.sha1
@@ -0,0 +1 @@
+ccee98793365d0c99fa7436b815d317cc35253f2
diff --git a/solr/licenses/sdk-core-2.19.1.jar.sha1 b/solr/licenses/sdk-core-2.19.1.jar.sha1
deleted file mode 100644
index cd484134efc..00000000000
--- a/solr/licenses/sdk-core-2.19.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5388ddf9d5da45b2087b7e45f381ba6721b06462
diff --git a/solr/licenses/snakeyaml-1.28.jar.sha1 b/solr/licenses/snakeyaml-1.28.jar.sha1
new file mode 100644
index 00000000000..879e89213e8
--- /dev/null
+++ b/solr/licenses/snakeyaml-1.28.jar.sha1
@@ -0,0 +1 @@
+7cae037c3014350c923776548e71c9feb7a69259
diff --git a/solr/licenses/snakeyaml-1.30.jar.sha1 b/solr/licenses/snakeyaml-1.30.jar.sha1
deleted file mode 100644
index 365daa0aef7..00000000000
--- a/solr/licenses/snakeyaml-1.30.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8fde7fe2586328ac3c68db92045e1c8759125000
diff --git a/solr/licenses/spring-aop-5.3.23.jar.sha1 b/solr/licenses/spring-aop-5.3.23.jar.sha1
new file mode 100644
index 00000000000..b9b6080f9e5
--- /dev/null
+++ b/solr/licenses/spring-aop-5.3.23.jar.sha1
@@ -0,0 +1 @@
+30d0034ba29178e98781d85f51a7eb709a628e9b
diff --git a/solr/licenses/spring-aop-5.3.26.jar.sha1 b/solr/licenses/spring-aop-5.3.26.jar.sha1
deleted file mode 100644
index 906d65225ad..00000000000
--- a/solr/licenses/spring-aop-5.3.26.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-48d5f80bac87b2fa507a7669fb9fc3c24893a91c
diff --git a/solr/licenses/spring-beans-5.3.23.jar.sha1 b/solr/licenses/spring-beans-5.3.23.jar.sha1
new file mode 100644
index 00000000000..82b616e0d43
--- /dev/null
+++ b/solr/licenses/spring-beans-5.3.23.jar.sha1
@@ -0,0 +1 @@
+3bdefbf6042ed742cbe16f27d2d14cca9096a606
diff --git a/solr/licenses/spring-beans-5.3.26.jar.sha1 b/solr/licenses/spring-beans-5.3.26.jar.sha1
deleted file mode 100644
index b452a4b979c..00000000000
--- a/solr/licenses/spring-beans-5.3.26.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-203a417a6022ba6597db2026b64bac656b7ede0a
diff --git a/solr/licenses/spring-boot-2.5.14.jar.sha1 b/solr/licenses/spring-boot-2.5.14.jar.sha1
new file mode 100644
index 00000000000..263b6d90901
--- /dev/null
+++ b/solr/licenses/spring-boot-2.5.14.jar.sha1
@@ -0,0 +1 @@
+4d581ebadc5fda0ec2d4a70653fe89087bd55983
diff --git a/solr/licenses/spring-boot-2.7.10.jar.sha1 b/solr/licenses/spring-boot-2.7.10.jar.sha1
deleted file mode 100644
index 03ee83a5704..00000000000
--- a/solr/licenses/spring-boot-2.7.10.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-538847f69a830791fac87bd3c232a001bd2c6806
diff --git a/solr/licenses/spring-boot-actuator-2.5.14.jar.sha1 b/solr/licenses/spring-boot-actuator-2.5.14.jar.sha1
new file mode 100644
index 00000000000..9292954d702
--- /dev/null
+++ b/solr/licenses/spring-boot-actuator-2.5.14.jar.sha1
@@ -0,0 +1 @@
+7d8e27b27011ff0d5be6d09d7c335fee2c9bf239
diff --git a/solr/licenses/spring-boot-actuator-2.7.10.jar.sha1 b/solr/licenses/spring-boot-actuator-2.7.10.jar.sha1
deleted file mode 100644
index 22397e157cc..00000000000
--- a/solr/licenses/spring-boot-actuator-2.7.10.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b6b4925825deabc7581f31f535e0485550cac7b0
diff --git a/solr/licenses/spring-boot-actuator-autoconfigure-2.5.14.jar.sha1 b/solr/licenses/spring-boot-actuator-autoconfigure-2.5.14.jar.sha1
new file mode 100644
index 00000000000..04f5cdb748e
--- /dev/null
+++ b/solr/licenses/spring-boot-actuator-autoconfigure-2.5.14.jar.sha1
@@ -0,0 +1 @@
+b6bbfcf903699302aba7446b541772a1eb208272
diff --git a/solr/licenses/spring-boot-actuator-autoconfigure-2.7.10.jar.sha1 b/solr/licenses/spring-boot-actuator-autoconfigure-2.7.10.jar.sha1
deleted file mode 100644
index 1e7aa498255..00000000000
--- a/solr/licenses/spring-boot-actuator-autoconfigure-2.7.10.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-34c6b707e929954fecada408bb8a1f1b8eb4fee8
diff --git a/solr/licenses/spring-boot-autoconfigure-2.5.14.jar.sha1 b/solr/licenses/spring-boot-autoconfigure-2.5.14.jar.sha1
new file mode 100644
index 00000000000..954a37e9d37
--- /dev/null
+++ b/solr/licenses/spring-boot-autoconfigure-2.5.14.jar.sha1
@@ -0,0 +1 @@
+83a8477a3d150070792594dc3a72addc65de118e
diff --git a/solr/licenses/spring-boot-autoconfigure-2.7.10.jar.sha1 b/solr/licenses/spring-boot-autoconfigure-2.7.10.jar.sha1
deleted file mode 100644
index 6293c407aa3..00000000000
--- a/solr/licenses/spring-boot-autoconfigure-2.7.10.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-514bec7b4e424199325b4f3c8949b9e2b5f6f16c
diff --git a/solr/licenses/spring-boot-starter-2.5.14.jar.sha1 b/solr/licenses/spring-boot-starter-2.5.14.jar.sha1
new file mode 100644
index 00000000000..29393666dae
--- /dev/null
+++ b/solr/licenses/spring-boot-starter-2.5.14.jar.sha1
@@ -0,0 +1 @@
+932d4aba1c83f5bd0e5176dfd432ef1e6f874a9b
diff --git a/solr/licenses/spring-boot-starter-2.7.10.jar.sha1 b/solr/licenses/spring-boot-starter-2.7.10.jar.sha1
deleted file mode 100644
index 505057f30a1..00000000000
--- a/solr/licenses/spring-boot-starter-2.7.10.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-307ab4f1ca9ae26944c407e2352d6e705097c0e2
diff --git a/solr/licenses/spring-boot-starter-actuator-2.5.14.jar.sha1 b/solr/licenses/spring-boot-starter-actuator-2.5.14.jar.sha1
new file mode 100644
index 00000000000..8129f1851b2
--- /dev/null
+++ b/solr/licenses/spring-boot-starter-actuator-2.5.14.jar.sha1
@@ -0,0 +1 @@
+cc4c81502b3507dc1694dcef09370d0e97d047de
diff --git a/solr/licenses/spring-boot-starter-actuator-2.7.10.jar.sha1 b/solr/licenses/spring-boot-starter-actuator-2.7.10.jar.sha1
deleted file mode 100644
index ef04fe692f4..00000000000
--- a/solr/licenses/spring-boot-starter-actuator-2.7.10.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-61b32bd1c4c301393224e629fdbe85a4aad132ef
diff --git a/solr/licenses/spring-boot-starter-jetty-2.5.14.jar.sha1 b/solr/licenses/spring-boot-starter-jetty-2.5.14.jar.sha1
new file mode 100644
index 00000000000..27dd9d61726
--- /dev/null
+++ b/solr/licenses/spring-boot-starter-jetty-2.5.14.jar.sha1
@@ -0,0 +1 @@
+17c20c40f0116ca6ce0fb478286e6064d2188dd0
diff --git a/solr/licenses/spring-boot-starter-jetty-2.7.10.jar.sha1 b/solr/licenses/spring-boot-starter-jetty-2.7.10.jar.sha1
deleted file mode 100644
index 0ef1f0e68bf..00000000000
--- a/solr/licenses/spring-boot-starter-jetty-2.7.10.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-86fdd70ccc81caba8dc95db9055e7584c5f8cc67
diff --git a/solr/licenses/spring-boot-starter-json-2.5.14.jar.sha1 b/solr/licenses/spring-boot-starter-json-2.5.14.jar.sha1
new file mode 100644
index 00000000000..ca55546f289
--- /dev/null
+++ b/solr/licenses/spring-boot-starter-json-2.5.14.jar.sha1
@@ -0,0 +1 @@
+24640eed89ce4705722d0a5e103cb3cce2fbf9a5
diff --git a/solr/licenses/spring-boot-starter-json-2.7.10.jar.sha1 b/solr/licenses/spring-boot-starter-json-2.7.10.jar.sha1
deleted file mode 100644
index a989d2430b9..00000000000
--- a/solr/licenses/spring-boot-starter-json-2.7.10.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-eca10dbca78387d79eb711bdb60d54d28be61621
diff --git a/solr/licenses/spring-boot-starter-logging-2.5.14.jar.sha1 b/solr/licenses/spring-boot-starter-logging-2.5.14.jar.sha1
new file mode 100644
index 00000000000..e5a29f0b59c
--- /dev/null
+++ b/solr/licenses/spring-boot-starter-logging-2.5.14.jar.sha1
@@ -0,0 +1 @@
+312e9c5f3476ccc6b809c227fdfe7a72cdbce592
diff --git a/solr/licenses/spring-boot-starter-logging-2.7.10.jar.sha1 b/solr/licenses/spring-boot-starter-logging-2.7.10.jar.sha1
deleted file mode 100644
index 881049601d8..00000000000
--- a/solr/licenses/spring-boot-starter-logging-2.7.10.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-104816b754b243f2640d43144c933352dacfdb5b
diff --git a/solr/licenses/spring-boot-starter-web-2.5.14.jar.sha1 b/solr/licenses/spring-boot-starter-web-2.5.14.jar.sha1
new file mode 100644
index 00000000000..f540a96a5f5
--- /dev/null
+++ b/solr/licenses/spring-boot-starter-web-2.5.14.jar.sha1
@@ -0,0 +1 @@
+284d497a5786bae68ece94a22f9ca4a7b52ff0c5
diff --git a/solr/licenses/spring-boot-starter-web-2.7.10.jar.sha1 b/solr/licenses/spring-boot-starter-web-2.7.10.jar.sha1
deleted file mode 100644
index d7434012c95..00000000000
--- a/solr/licenses/spring-boot-starter-web-2.7.10.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-aff75a41f298e83ad9542d8f26b12bbe8e105c35
diff --git a/solr/licenses/spring-context-5.3.23.jar.sha1 b/solr/licenses/spring-context-5.3.23.jar.sha1
new file mode 100644
index 00000000000..5487c862696
--- /dev/null
+++ b/solr/licenses/spring-context-5.3.23.jar.sha1
@@ -0,0 +1 @@
+530b36b2ce2c9e471c6a260c3f181bcd20325a58
diff --git a/solr/licenses/spring-context-5.3.26.jar.sha1 b/solr/licenses/spring-context-5.3.26.jar.sha1
deleted file mode 100644
index 2aa1c52684a..00000000000
--- a/solr/licenses/spring-context-5.3.26.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-060596de235eaacc8fe736167abdc2a1bf3d8b26
diff --git a/solr/licenses/spring-core-5.3.23.jar.sha1 b/solr/licenses/spring-core-5.3.23.jar.sha1
new file mode 100644
index 00000000000..1b83d4905c5
--- /dev/null
+++ b/solr/licenses/spring-core-5.3.23.jar.sha1
@@ -0,0 +1 @@
+91407dc1106ea423c44150f3da1a0b4f8e25e5ca
diff --git a/solr/licenses/spring-core-5.3.26.jar.sha1 b/solr/licenses/spring-core-5.3.26.jar.sha1
deleted file mode 100644
index fc8d45ead78..00000000000
--- a/solr/licenses/spring-core-5.3.26.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-81f0f0bbba14ca6e17d52f0b1c7d52da8c4da098
diff --git a/solr/licenses/spring-expression-5.3.23.jar.sha1 b/solr/licenses/spring-expression-5.3.23.jar.sha1
new file mode 100644
index 00000000000..7253c5b000c
--- /dev/null
+++ b/solr/licenses/spring-expression-5.3.23.jar.sha1
@@ -0,0 +1 @@
+3a676bf4b9bc42bd37ab5ad264acb6ceb63397a2
diff --git a/solr/licenses/spring-expression-5.3.26.jar.sha1 b/solr/licenses/spring-expression-5.3.26.jar.sha1
deleted file mode 100644
index fba56918d71..00000000000
--- a/solr/licenses/spring-expression-5.3.26.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-75ccfb9a99560d6a6b2654eae88896ed58b3e428
diff --git a/solr/licenses/spring-jcl-5.3.23.jar.sha1 b/solr/licenses/spring-jcl-5.3.23.jar.sha1
new file mode 100644
index 00000000000..402338e1b64
--- /dev/null
+++ b/solr/licenses/spring-jcl-5.3.23.jar.sha1
@@ -0,0 +1 @@
+3c7eb5fcca67b611065f73ff4325e398f8b051a3
diff --git a/solr/licenses/spring-jcl-5.3.26.jar.sha1 b/solr/licenses/spring-jcl-5.3.26.jar.sha1
deleted file mode 100644
index 753971313e0..00000000000
--- a/solr/licenses/spring-jcl-5.3.26.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2005accc2cf5212c614df3760b3a434e7dce807c
diff --git a/solr/licenses/spring-web-5.3.23.jar.sha1 b/solr/licenses/spring-web-5.3.23.jar.sha1
new file mode 100644
index 00000000000..9c7d6862d02
--- /dev/null
+++ b/solr/licenses/spring-web-5.3.23.jar.sha1
@@ -0,0 +1 @@
+0193f5276092d9cbe3222c63885b47ca7b2cce97
diff --git a/solr/licenses/spring-web-5.3.26.jar.sha1 b/solr/licenses/spring-web-5.3.26.jar.sha1
deleted file mode 100644
index a372d62c969..00000000000
--- a/solr/licenses/spring-web-5.3.26.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-479b988a36bcaa2d4bf7c50e53bc7cbcedbe645c
diff --git a/solr/licenses/spring-webmvc-5.3.23.jar.sha1 b/solr/licenses/spring-webmvc-5.3.23.jar.sha1
new file mode 100644
index 00000000000..5dc279b7ae2
--- /dev/null
+++ b/solr/licenses/spring-webmvc-5.3.23.jar.sha1
@@ -0,0 +1 @@
+b163527c275b0374371890c0b76c2a2a09f9804b
diff --git a/solr/licenses/spring-webmvc-5.3.26.jar.sha1 b/solr/licenses/spring-webmvc-5.3.26.jar.sha1
deleted file mode 100644
index f8e707ead45..00000000000
--- a/solr/licenses/spring-webmvc-5.3.26.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0539e1d03decbec523b7ad87fb786fd0b1cf29ce
diff --git a/solr/licenses/sts-2.17.63.jar.sha1 b/solr/licenses/sts-2.17.63.jar.sha1
new file mode 100644
index 00000000000..45055636a76
--- /dev/null
+++ b/solr/licenses/sts-2.17.63.jar.sha1
@@ -0,0 +1 @@
+754aafd124c5f081fb2a21eef862bedd10f0ef8a
diff --git a/solr/licenses/sts-2.19.1.jar.sha1 b/solr/licenses/sts-2.19.1.jar.sha1
deleted file mode 100644
index 82b7425c7ff..00000000000
--- a/solr/licenses/sts-2.19.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c442572e6e55a051f2bad687fc6e4794fcbe3abe
diff --git a/solr/licenses/third-party-jackson-core-2.17.63.jar.sha1 b/solr/licenses/third-party-jackson-core-2.17.63.jar.sha1
new file mode 100644
index 00000000000..0d68109491d
--- /dev/null
+++ b/solr/licenses/third-party-jackson-core-2.17.63.jar.sha1
@@ -0,0 +1 @@
+2bf16296795e79e4e97eb6c747c47e7437d69741
diff --git a/solr/licenses/third-party-jackson-core-2.19.1.jar.sha1 b/solr/licenses/third-party-jackson-core-2.19.1.jar.sha1
deleted file mode 100644
index 104cbf8bd03..00000000000
--- a/solr/licenses/third-party-jackson-core-2.19.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bbb24052e0c45ec60af7dfa5eba5cea8aae76fdf
diff --git a/solr/licenses/tomcat-embed-el-9.0.63.jar.sha1 b/solr/licenses/tomcat-embed-el-9.0.63.jar.sha1
new file mode 100644
index 00000000000..2242a4e69c2
--- /dev/null
+++ b/solr/licenses/tomcat-embed-el-9.0.63.jar.sha1
@@ -0,0 +1 @@
+b595f0bdae0392c8b3c8592fea10023956a3f619
diff --git a/solr/licenses/tomcat-embed-el-9.0.73.jar.sha1 b/solr/licenses/tomcat-embed-el-9.0.73.jar.sha1
deleted file mode 100644
index 24709d38d91..00000000000
--- a/solr/licenses/tomcat-embed-el-9.0.73.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bccf17a0a9e3dc239915114e6d6b74c6cc339c39
diff --git a/solr/licenses/txw2-2.3.5.jar.sha1 b/solr/licenses/txw2-2.3.5.jar.sha1
new file mode 100644
index 00000000000..793f9c8e802
--- /dev/null
+++ b/solr/licenses/txw2-2.3.5.jar.sha1
@@ -0,0 +1 @@
+ec8930fa62e7b1758b1664d135f50c7abe86a4a3
diff --git a/solr/licenses/txw2-2.3.7.jar.sha1 b/solr/licenses/txw2-2.3.7.jar.sha1
deleted file mode 100644
index a0079c18b7d..00000000000
--- a/solr/licenses/txw2-2.3.7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-55cddcac1945150e09b09b0f89d86799652eee82
diff --git a/solr/licenses/url-connection-client-2.17.63.jar.sha1 b/solr/licenses/url-connection-client-2.17.63.jar.sha1
new file mode 100644
index 00000000000..4113710c6da
--- /dev/null
+++ b/solr/licenses/url-connection-client-2.17.63.jar.sha1
@@ -0,0 +1 @@
+2bf1844b1ed514967a61643cba95433db4cacbd2
diff --git a/solr/licenses/url-connection-client-2.19.1.jar.sha1 b/solr/licenses/url-connection-client-2.19.1.jar.sha1
deleted file mode 100644
index aac2152447c..00000000000
--- a/solr/licenses/url-connection-client-2.19.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7c4a26c39b663bb24fbe97e0908e463f94c3279a
diff --git a/solr/licenses/utils-2.17.63.jar.sha1 b/solr/licenses/utils-2.17.63.jar.sha1
new file mode 100644
index 00000000000..11bc29caae7
--- /dev/null
+++ b/solr/licenses/utils-2.17.63.jar.sha1
@@ -0,0 +1 @@
+95d31e6c70180cb5b85713c51b1d5b945777db76
diff --git a/solr/licenses/utils-2.19.1.jar.sha1 b/solr/licenses/utils-2.19.1.jar.sha1
deleted file mode 100644
index ade9e6dd857..00000000000
--- a/solr/licenses/utils-2.19.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-80dfbfd820748406f89cf1a00811d4f994c6422f
diff --git a/solr/modules/s3-repository/src/java/org/apache/solr/s3/S3StorageClient.java b/solr/modules/s3-repository/src/java/org/apache/solr/s3/S3StorageClient.java
index 3d600899647..b13ab2a7bd9 100644
--- a/solr/modules/s3-repository/src/java/org/apache/solr/s3/S3StorageClient.java
+++ b/solr/modules/s3-repository/src/java/org/apache/solr/s3/S3StorageClient.java
@@ -346,9 +346,6 @@ public class S3StorageClient {
*/
long length(String path) throws S3Exception {
String s3Path = sanitizedFilePath(path);
- if (isDirectory(s3Path)) {
- throw new S3Exception("Path is Directory");
- }
try {
HeadObjectResponse objectMetadata =
s3Client.headObject(b -> b.bucket(bucketName).key(s3Path));
diff --git a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.java
index b7f35c574f0..6cc78f95e8d 100644
--- a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.java
+++ b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.java
@@ -104,13 +104,13 @@ public class S3BackupRepositoryTest extends AbstractBackupRepositoryTest {
public void testLocalDirectoryFunctions() throws Exception {
try (S3BackupRepository repo = getRepository()) {
- URI path = new URI("/test/");
+ URI path = new URI("/test");
repo.createDirectory(path);
assertTrue(repo.exists(path));
assertEquals(BackupRepository.PathType.DIRECTORY, repo.getPathType(path));
assertEquals("No files should exist in dir yet", repo.listAll(path).length, 0);
- URI subDir = new URI("/test/dir/");
+ URI subDir = new URI("/test/dir");
repo.createDirectory(subDir);
assertTrue(repo.exists(subDir));
assertEquals(BackupRepository.PathType.DIRECTORY, repo.getPathType(subDir));
diff --git a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3PathsTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3PathsTest.java
index d314855c3b1..4b3a0c9d3f2 100644
--- a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3PathsTest.java
+++ b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3PathsTest.java
@@ -48,7 +48,7 @@ public class S3PathsTest extends AbstractS3ClientTest {
public void testDirectory() throws S3Exception {
client.createDirectory("/simple-directory");
- assertFalse("Dir path needs a trailing slash", client.pathExists("/simple-directory"));
+ assertTrue(client.pathExists("/simple-directory"));
assertTrue("Dir should exist without a leading slash", client.pathExists("simple-directory/"));
assertTrue("Dir should exist with a leading slash", client.pathExists("/simple-directory/"));
assertTrue(
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractBackupRepositoryTest.java b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractBackupRepositoryTest.java
index 83ca613354c..3bfac1a08cf 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractBackupRepositoryTest.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractBackupRepositoryTest.java
@@ -78,8 +78,8 @@ public abstract class AbstractBackupRepositoryTest extends SolrTestCaseJ4 {
public void testCanDetermineWhetherFilesAndDirectoriesExist() throws Exception {
try (BackupRepository repo = getRepository()) {
// Create 'emptyDir/', 'nonEmptyDir/', and 'nonEmptyDir/file.txt'
- final URI emptyDirUri = repo.resolve(getBaseUri(), "emptyDir/");
- final URI nonEmptyDirUri = repo.resolve(getBaseUri(), "nonEmptyDir/");
+ final URI emptyDirUri = repo.resolve(getBaseUri(), "emptyDir");
+ final URI nonEmptyDirUri = repo.resolve(getBaseUri(), "nonEmptyDir");
final URI nestedFileUri = repo.resolve(nonEmptyDirUri, "file.txt");
repo.createDirectory(emptyDirUri);
repo.createDirectory(nonEmptyDirUri);
@@ -88,7 +88,7 @@ public abstract class AbstractBackupRepositoryTest extends SolrTestCaseJ4 {
assertTrue(repo.exists(emptyDirUri));
assertTrue(repo.exists(nonEmptyDirUri));
assertTrue(repo.exists(nestedFileUri));
- final URI nonexistedDirUri = repo.resolve(getBaseUri(), "nonexistentDir/");
+ final URI nonexistedDirUri = repo.resolve(getBaseUri(), "nonexistentDir");
assertFalse(repo.exists(nonexistedDirUri));
}
}
@@ -96,8 +96,8 @@ public abstract class AbstractBackupRepositoryTest extends SolrTestCaseJ4 {
@Test
public void testCanDistinguishBetweenFilesAndDirectories() throws Exception {
try (BackupRepository repo = getRepository()) {
- final URI emptyDirUri = repo.resolve(getBaseUri(), "emptyDir/");
- final URI nonEmptyDirUri = repo.resolve(getBaseUri(), "nonEmptyDir/");
+ final URI emptyDirUri = repo.resolve(getBaseUri(), "emptyDir");
+ final URI nonEmptyDirUri = repo.resolve(getBaseUri(), "nonEmptyDir");
final URI nestedFileUri = repo.resolve(nonEmptyDirUri, "file.txt");
repo.createDirectory(emptyDirUri);
repo.createDirectory(nonEmptyDirUri);
@@ -151,10 +151,10 @@ public abstract class AbstractBackupRepositoryTest extends SolrTestCaseJ4 {
assertFalse(repo.exists(fileUri));
// Delete the middle directory in a deeply nested structure (/nest1/nest2/nest3/nest4)
- final URI level1DeeplyNestedUri = repo.resolve(getBaseUri(), "nest1/");
- final URI level2DeeplyNestedUri = repo.resolve(level1DeeplyNestedUri, "nest2/");
- final URI level3DeeplyNestedUri = repo.resolve(level2DeeplyNestedUri, "nest3/");
- final URI level4DeeplyNestedUri = repo.resolve(level3DeeplyNestedUri, "nest4/");
+ final URI level1DeeplyNestedUri = repo.resolve(getBaseUri(), "nest1");
+ final URI level2DeeplyNestedUri = repo.resolve(level1DeeplyNestedUri, "nest2");
+ final URI level3DeeplyNestedUri = repo.resolve(level2DeeplyNestedUri, "nest3");
+ final URI level4DeeplyNestedUri = repo.resolve(level3DeeplyNestedUri, "nest4");
repo.createDirectory(level1DeeplyNestedUri);
repo.createDirectory(level2DeeplyNestedUri);
repo.createDirectory(level3DeeplyNestedUri);
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java
index 7a672dac127..d43fff4f38f 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java
@@ -577,7 +577,7 @@ public abstract class AbstractIncrementalBackupTest extends SolrCloudTestCase {
URI backupPropertiesFile =
repository.resolve(backupURI, "backup_" + numBackup + ".properties");
- URI zkBackupFolder = repository.resolveDirectory(backupURI, "zk_backup_" + numBackup);
+ URI zkBackupFolder = repository.resolve(backupURI, "zk_backup_" + numBackup);
assertTrue(repository.exists(backupPropertiesFile));
assertTrue(repository.exists(zkBackupFolder));
assertFolderAreSame(
diff --git a/versions.lock b/versions.lock
index 464f1a59ec8..0e95de38bc7 100644
--- a/versions.lock
+++ b/versions.lock
@@ -9,7 +9,7 @@ com.epam:parso:2.0.14 (1 constraints: 8e0c750e)
com.fasterxml.jackson:jackson-bom:2.14.2 (12 constraints: 42f8fc44)
com.fasterxml.jackson.core:jackson-annotations:2.14.2 (10 constraints: 95be250f)
com.fasterxml.jackson.core:jackson-core:2.14.2 (13 constraints: 3902ce18)
-com.fasterxml.jackson.core:jackson-databind:2.14.2 (18 constraints: 80633774)
+com.fasterxml.jackson.core:jackson-databind:2.14.2 (18 constraints: 78638fbe)
com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.14.2 (1 constraints: b90ea866)
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.14.2 (2 constraints: a52484e0)
com.fasterxml.woodstox:woodstox-core:6.5.0 (3 constraints: ab2868b8)
@@ -158,7 +158,7 @@ jakarta.ws.rs:jakarta.ws.rs-api:2.1.6 (10 constraints: c1cce3ec)
jakarta.xml.bind:jakarta.xml.bind-api:2.3.3 (5 constraints: c45d665e)
javax.measure:unit-api:1.0 (5 constraints: 8e3e2cc5)
joda-time:joda-time:2.8.1 (3 constraints: d61aef93)
-junit:junit:4.13.2 (9 constraints: d5aafc9f)
+junit:junit:4.13.2 (9 constraints: d4aa559e)
net.arnx:jsonic:1.2.7 (1 constraints: d00b47eb)
net.java.dev.jna:jna:5.12.1 (1 constraints: 900c8e0e)
net.sf.ehcache:ehcache-core:2.6.2 (1 constraints: 2706f94d)
@@ -188,7 +188,7 @@ org.apache.hadoop:hadoop-client-runtime:3.3.5 (2 constraints: 6d17a643)
org.apache.hadoop:hadoop-common:3.3.5 (1 constraints: 0d050836)
org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.1.1 (1 constraints: 0505f435)
org.apache.httpcomponents:httpclient:4.5.14 (11 constraints: f99f018d)
-org.apache.httpcomponents:httpcore:4.4.16 (10 constraints: be8c6893)
+org.apache.httpcomponents:httpcore:4.4.16 (10 constraints: bc8c6693)
org.apache.httpcomponents:httpmime:4.5.14 (3 constraints: eb1bfedc)
org.apache.httpcomponents.client5:httpclient5:5.1.3 (1 constraints: 6c10bcb3)
org.apache.httpcomponents.core5:httpcore5:5.1.3 (3 constraints: ff35b9e8)
@@ -308,8 +308,8 @@ org.glassfish.hk2:hk2-utils:2.6.1 (2 constraints: 21173277)
org.glassfish.hk2:osgi-resource-locator:1.0.3 (2 constraints: 7d23b265)
org.glassfish.hk2.external:aopalliance-repackaged:2.6.1 (2 constraints: 21173277)
org.glassfish.hk2.external:jakarta.inject:2.6.1 (11 constraints: 2cbae60f)
-org.glassfish.jaxb:jaxb-runtime:2.3.7 (2 constraints: 2217375b)
-org.glassfish.jaxb:txw2:2.3.7 (1 constraints: c10db935)
+org.glassfish.jaxb:jaxb-runtime:2.3.5 (1 constraints: 610cf401)
+org.glassfish.jaxb:txw2:2.3.5 (1 constraints: bf0db735)
org.glassfish.jersey.containers:jersey-container-jetty-http:2.35 (1 constraints: de04fe30)
org.glassfish.jersey.core:jersey-client:2.35 (1 constraints: d510c6b2)
org.glassfish.jersey.core:jersey-common:2.35 (11 constraints: d3ddca6a)
@@ -356,44 +356,43 @@ org.tallison.xmp:xmpcore-shaded:6.1.10 (1 constraints: 300e8d49)
org.threeten:threetenbp:1.6.5 (4 constraints: 9237a011)
org.tukaani:xz:1.9 (1 constraints: 030c5be9)
org.xerial.snappy:snappy-java:1.1.9.1 (4 constraints: 89386de0)
-software.amazon.awssdk:annotations:2.19.1 (19 constraints: d2182f05)
-software.amazon.awssdk:apache-client:2.19.1 (4 constraints: 35290257)
-software.amazon.awssdk:arns:2.19.1 (2 constraints: b5177c95)
-software.amazon.awssdk:auth:2.19.1 (5 constraints: 3e373c56)
-software.amazon.awssdk:aws-core:2.19.1 (6 constraints: ba4c2699)
-software.amazon.awssdk:aws-query-protocol:2.19.1 (3 constraints: b929276d)
-software.amazon.awssdk:aws-xml-protocol:2.19.1 (2 constraints: b5177c95)
-software.amazon.awssdk:bom:2.19.1 (1 constraints: 3f054b3b)
-software.amazon.awssdk:endpoints-spi:2.19.1 (4 constraints: da33b117)
-software.amazon.awssdk:http-client-spi:2.19.1 (11 constraints: 89a3fba4)
-software.amazon.awssdk:json-utils:2.19.1 (5 constraints: 703e7c31)
-software.amazon.awssdk:metrics-spi:2.19.1 (7 constraints: c3608ed1)
-software.amazon.awssdk:profiles:2.19.1 (7 constraints: 795a111b)
-software.amazon.awssdk:protocol-core:2.19.1 (5 constraints: 7c477d20)
-software.amazon.awssdk:regions:2.19.1 (7 constraints: ca4e3ce1)
-software.amazon.awssdk:s3:2.19.1 (3 constraints: 172400cb)
-software.amazon.awssdk:sdk-core:2.19.1 (10 constraints: 6c85de94)
-software.amazon.awssdk:sts:2.19.1 (2 constraints: 65114ff6)
-software.amazon.awssdk:third-party-jackson-core:2.19.1 (2 constraints: 271b1477)
-software.amazon.awssdk:utils:2.19.1 (18 constraints: 7606c0c4)
+software.amazon.awssdk:annotations:2.17.63 (18 constraints: 690ceab3)
+software.amazon.awssdk:apache-client:2.17.63 (4 constraints: 0d2a0ae3)
+software.amazon.awssdk:arns:2.17.63 (2 constraints: 21185ac1)
+software.amazon.awssdk:auth:2.17.63 (5 constraints: 4c38fb3f)
+software.amazon.awssdk:aws-core:2.17.63 (6 constraints: fe4df51e)
+software.amazon.awssdk:aws-query-protocol:2.17.63 (3 constraints: 5b2ab1dd)
+software.amazon.awssdk:aws-xml-protocol:2.17.63 (2 constraints: 21185ac1)
+software.amazon.awssdk:bom:2.17.63 (1 constraints: 7505bf40)
+software.amazon.awssdk:http-client-spi:2.17.63 (11 constraints: dba5da79)
+software.amazon.awssdk:json-utils:2.17.63 (3 constraints: 4227d652)
+software.amazon.awssdk:metrics-spi:2.17.63 (7 constraints: 3d62fd12)
+software.amazon.awssdk:profiles:2.17.63 (7 constraints: f35b2534)
+software.amazon.awssdk:protocol-core:2.17.63 (5 constraints: 8a48db59)
+software.amazon.awssdk:regions:2.17.63 (6 constraints: 1c45a6c5)
+software.amazon.awssdk:s3:2.17.63 (3 constraints: bb244128)
+software.amazon.awssdk:sdk-core:2.17.63 (10 constraints: 8887fee5)
+software.amazon.awssdk:sts:2.17.63 (2 constraints: d1113a15)
+software.amazon.awssdk:third-party-jackson-core:2.17.63 (2 constraints: 931b14a8)
+software.amazon.awssdk:utils:2.17.63 (17 constraints: 0bffaaab)
software.amazon.eventstream:eventstream:1.0.1 (2 constraints: 2e1ae62b)
ua.net.nlp:morfologik-ukrainian-search:4.9.1 (1 constraints: d5126e1e)
xerces:xercesImpl:2.12.2 (1 constraints: 8e0c7d0e)
[Test dependencies]
-com.adobe.testing:s3mock:2.11.0 (1 constraints: aa127e1d)
-com.adobe.testing:s3mock-junit4:2.11.0 (1 constraints: 3605323b)
-com.adobe.testing:s3mock-testsupport-common:2.11.0 (1 constraints: 750d8639)
-com.amazonaws:aws-java-sdk-core:1.12.369 (2 constraints: c81a3ab5)
-com.amazonaws:aws-java-sdk-kms:1.12.369 (1 constraints: 120dcb37)
-com.amazonaws:aws-java-sdk-s3:1.12.369 (1 constraints: 1c137d43)
-com.amazonaws:jmespath-java:1.12.369 (2 constraints: c81a3ab5)
-com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.14.2 (2 constraints: 621c97f1)
-com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.14.2 (2 constraints: a8192513)
-com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.14.2 (3 constraints: fa2eb1b3)
-com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.2 (4 constraints: 6b482734)
+com.adobe.testing:s3mock:2.1.34 (1 constraints: b012831d)
+com.adobe.testing:s3mock-junit4:2.1.34 (1 constraints: 3c05373b)
+com.adobe.testing:s3mock-testsupport-common:2.1.34 (1 constraints: 7b0d8b39)
+com.amazonaws:aws-java-sdk-core:1.12.15 (2 constraints: 501a5183)
+com.amazonaws:aws-java-sdk-kms:1.12.15 (1 constraints: d60cb42a)
+com.amazonaws:aws-java-sdk-s3:1.12.15 (1 constraints: e0125c30)
+com.amazonaws:jmespath-java:1.12.15 (2 constraints: 501a5183)
+com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.14.2 (2 constraints: 5f1c13f1)
+com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.14.2 (2 constraints: a619c912)
+com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.14.2 (2 constraints: 0b24ff81)
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.2 (3 constraints: 7c3ddb0f)
com.fasterxml.jackson.module:jackson-module-kotlin:2.14.2 (2 constraints: a51d0460)
-com.fasterxml.jackson.module:jackson-module-parameter-names:2.14.2 (2 constraints: 0b240182)
+com.fasterxml.jackson.module:jackson-module-parameter-names:2.14.2 (2 constraints: 0b24ff81)
com.google.cloud:google-cloud-nio:0.126.10 (1 constraints: c70e207b)
com.nimbusds:content-type:2.2 (1 constraints: d80b68eb)
com.nimbusds:lang-tag:1.5 (1 constraints: da0b68eb)
@@ -402,7 +401,7 @@ com.nimbusds:oauth2-oidc-sdk:9.22.2 (1 constraints: f50ebb71)
com.squareup.okhttp3:mockwebserver:4.9.3 (1 constraints: c60ebf62)
io.github.microutils:kotlin-logging:2.1.21 (1 constraints: ec0e8871)
io.github.microutils:kotlin-logging-jvm:2.1.21 (1 constraints: af0f358c)
-io.micrometer:micrometer-core:1.9.9 (1 constraints: d4163302)
+io.micrometer:micrometer-core:1.7.12 (1 constraints: fc162119)
io.opentracing:opentracing-mock:0.33.0 (1 constraints: 3805343b)
jakarta.servlet:jakarta.servlet-api:4.0.4 (4 constraints: 586e1f6a)
jakarta.websocket:jakarta.websocket-api:1.1.2 (1 constraints: 92155ab9)
@@ -420,7 +419,7 @@ org.apache.kerby:kerb-common:1.0.1 (2 constraints: a51841ca)
org.apache.kerby:kerb-identity:1.0.1 (1 constraints: 5f0cb602)
org.apache.kerby:kerb-server:1.0.1 (1 constraints: d10b65f2)
org.apache.kerby:kerb-simplekdc:1.0.1 (1 constraints: dc0d7e3e)
-org.apache.tomcat.embed:tomcat-embed-el:9.0.73 (1 constraints: d11555cf)
+org.apache.tomcat.embed:tomcat-embed-el:9.0.63 (1 constraints: d01553cf)
org.freemarker:freemarker:2.3.31 (1 constraints: ef0e9271)
org.glassfish.grizzly:grizzly-framework:2.4.4 (1 constraints: 670fe271)
org.glassfish.grizzly:grizzly-http:2.4.4 (1 constraints: 2b127cf5)
@@ -439,24 +438,24 @@ org.jetbrains.kotlin:kotlin-reflect:1.6.10 (2 constraints: 6224e0e2)
org.latencyutils:LatencyUtils:2.0.3 (1 constraints: 210dcd1b)
org.mockito:mockito-core:3.8.0 (1 constraints: 0d051236)
org.objenesis:objenesis:3.1 (1 constraints: b00a12bd)
-org.springframework:spring-aop:5.3.26 (2 constraints: da1e359a)
-org.springframework:spring-beans:5.3.26 (4 constraints: a83ac1c7)
-org.springframework:spring-context:5.3.26 (2 constraints: 6b1f6ed2)
-org.springframework:spring-core:5.3.26 (8 constraints: ff7dfbbd)
-org.springframework:spring-expression:5.3.26 (2 constraints: da1e359a)
-org.springframework:spring-jcl:5.3.26 (1 constraints: 520ea24f)
-org.springframework:spring-web:5.3.26 (3 constraints: 5f395f8d)
-org.springframework:spring-webmvc:5.3.26 (1 constraints: dc146e9e)
-org.springframework.boot:spring-boot:2.7.10 (4 constraints: 83569d42)
-org.springframework.boot:spring-boot-actuator:2.7.10 (1 constraints: 7119a0b8)
-org.springframework.boot:spring-boot-actuator-autoconfigure:2.7.10 (1 constraints: fb162519)
-org.springframework.boot:spring-boot-autoconfigure:2.7.10 (2 constraints: db2c235d)
-org.springframework.boot:spring-boot-starter:2.7.10 (3 constraints: 2141d4c3)
-org.springframework.boot:spring-boot-starter-actuator:2.7.10 (2 constraints: 14182ea6)
-org.springframework.boot:spring-boot-starter-jetty:2.7.10 (1 constraints: c50a4bcb)
-org.springframework.boot:spring-boot-starter-json:2.7.10 (1 constraints: d614649e)
-org.springframework.boot:spring-boot-starter-logging:2.7.10 (1 constraints: 6b138946)
-org.springframework.boot:spring-boot-starter-web:2.7.10 (1 constraints: c50a4bcb)
-org.yaml:snakeyaml:1.30 (1 constraints: 0713d91f)
-software.amazon.awssdk:url-connection-client:2.19.1 (2 constraints: d91e09bd)
+org.springframework:spring-aop:5.3.23 (2 constraints: d41eae99)
+org.springframework:spring-beans:5.3.23 (4 constraints: 9c3abec4)
+org.springframework:spring-context:5.3.23 (2 constraints: 621fdbd1)
+org.springframework:spring-core:5.3.23 (8 constraints: e17dffad)
+org.springframework:spring-expression:5.3.23 (2 constraints: d41eae99)
+org.springframework:spring-jcl:5.3.23 (1 constraints: 4f0e9f4f)
+org.springframework:spring-web:5.3.23 (3 constraints: 5039958a)
+org.springframework:spring-webmvc:5.3.23 (1 constraints: d614689e)
+org.springframework.boot:spring-boot:2.5.14 (4 constraints: 8b564b45)
+org.springframework.boot:spring-boot-actuator:2.5.14 (1 constraints: 73199cb8)
+org.springframework.boot:spring-boot-actuator-autoconfigure:2.5.14 (1 constraints: fd162119)
+org.springframework.boot:spring-boot-autoconfigure:2.5.14 (2 constraints: df2c875d)
+org.springframework.boot:spring-boot-starter:2.5.14 (3 constraints: 274126c5)
+org.springframework.boot:spring-boot-starter-actuator:2.5.14 (1 constraints: a80fdfae)
+org.springframework.boot:spring-boot-starter-jetty:2.5.14 (1 constraints: 1d0d3137)
+org.springframework.boot:spring-boot-starter-json:2.5.14 (1 constraints: d814609e)
+org.springframework.boot:spring-boot-starter-logging:2.5.14 (1 constraints: 6d138546)
+org.springframework.boot:spring-boot-starter-web:2.5.14 (1 constraints: 1d0d3137)
+org.yaml:snakeyaml:1.28 (1 constraints: 0e13df1f)
+software.amazon.awssdk:url-connection-client:2.17.63 (2 constraints: 471f19f7)
software.amazon.ion:ion-java:1.0.2 (1 constraints: 720db831)
diff --git a/versions.props b/versions.props
index a6ab17f06f0..12ba25c81bd 100644
--- a/versions.props
+++ b/versions.props
@@ -1,7 +1,7 @@
# The lines in this file needs to be lexicographically sorted.
# Please only add direct dependencies. Overrides of transitive versions should be called out in a comment.
biz.aQute.bnd:biz.aQute.bnd.annotation=6.4.0
-com.adobe.testing:s3mock-junit4=2.11.0
+com.adobe.testing:s3mock-junit4=2.1.34
com.carrotsearch.randomizedtesting:*=2.8.1
com.carrotsearch:hppc=0.9.1
com.cybozu.labs:langdetect=1.1-20120112
@@ -72,7 +72,7 @@ org.osgi:osgi.annotation=8.1.0
org.quicktheories:quicktheories=0.26
org.semver4j:semver4j=4.3.0
org.slf4j:*=2.0.7
-org.springframework.boot:spring-boot*=2.7.10
-org.springframework:spring*=5.3.26
+org.springframework.boot:spring-boot*=2.5.14
+org.springframework:spring*=5.3.23
org.xerial.snappy:snappy-java=1.1.9.1
-software.amazon.awssdk:*=2.19.1
+software.amazon.awssdk:*=2.17.63