Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-16627: Upgrade google-cloud-bom to 0.184.0, re2j to 1.6, and grpc to 1.51.0 (#1301)

Kevin Risden1fafbb55a538
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 3cc189e8815..16b26894cc0 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -234,6 +234,8 @@ Other Changes
* SOLR-16626: Upgrade to Netty 4.1.87.Final (Kevin Risden)
+* SOLR-16627: Upgrade google-cloud-bom to 0.184.0, re2j to 1.6, and grpc to 1.51.0 (Kevin Risden)
+
================== 9.1.1 ==================
Bug Fixes
diff --git a/solr/licenses/api-common-2.2.1.jar.sha1 b/solr/licenses/api-common-2.2.1.jar.sha1
deleted file mode 100644
index 08f5178a8f2..00000000000
--- a/solr/licenses/api-common-2.2.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9eb62c522f96befccfbd8c92bafc952eed4417a8
diff --git a/solr/licenses/api-common-2.2.2.jar.sha1 b/solr/licenses/api-common-2.2.2.jar.sha1
new file mode 100644
index 00000000000..d18f7eec324
--- /dev/null
+++ b/solr/licenses/api-common-2.2.2.jar.sha1
@@ -0,0 +1 @@
+10e72653c48ade84837eae0334dbd363d2acd1b9
diff --git a/solr/licenses/auto-value-annotations-1.10.1.jar.sha1 b/solr/licenses/auto-value-annotations-1.10.1.jar.sha1
new file mode 100644
index 00000000000..37b6969245f
--- /dev/null
+++ b/solr/licenses/auto-value-annotations-1.10.1.jar.sha1
@@ -0,0 +1 @@
+9e5162c15f6033c524134cba05a5e93dc1d37c4b
diff --git a/solr/licenses/auto-value-annotations-1.9.jar.sha1 b/solr/licenses/auto-value-annotations-1.9.jar.sha1
deleted file mode 100644
index 8154b8d5813..00000000000
--- a/solr/licenses/auto-value-annotations-1.9.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-25a0fcef915f663679fcdb447541c5d86a9be4ba
diff --git a/solr/licenses/checker-qual-3.27.0.jar.sha1 b/solr/licenses/checker-qual-3.27.0.jar.sha1
deleted file mode 100644
index 1d44d8f19db..00000000000
--- a/solr/licenses/checker-qual-3.27.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-331f93a364f95a05888419b4e138d27cd774206a
diff --git a/solr/licenses/checker-qual-3.28.0.jar.sha1 b/solr/licenses/checker-qual-3.28.0.jar.sha1
new file mode 100644
index 00000000000..ac99f020146
--- /dev/null
+++ b/solr/licenses/checker-qual-3.28.0.jar.sha1
@@ -0,0 +1 @@
+8d5b904e460c47bf22fa20f35da0f38de6bcacf6
diff --git a/solr/licenses/conscrypt-openjdk-uber-2.5.2.jar.sha1 b/solr/licenses/conscrypt-openjdk-uber-2.5.2.jar.sha1
new file mode 100644
index 00000000000..9c741827267
--- /dev/null
+++ b/solr/licenses/conscrypt-openjdk-uber-2.5.2.jar.sha1
@@ -0,0 +1 @@
+d858f142ea189c62771c505a6548d8606ac098fe
diff --git a/solr/licenses/opencensus-api-LICENSE-ASL.txt b/solr/licenses/conscrypt-openjdk-uber-LICENSE-ASL.txt
similarity index 100%
rename from solr/licenses/opencensus-api-LICENSE-ASL.txt
rename to solr/licenses/conscrypt-openjdk-uber-LICENSE-ASL.txt
diff --git a/solr/licenses/conscrypt-openjdk-uber-NOTICE.txt b/solr/licenses/conscrypt-openjdk-uber-NOTICE.txt
new file mode 100644
index 00000000000..2235cf0e0ef
--- /dev/null
+++ b/solr/licenses/conscrypt-openjdk-uber-NOTICE.txt
@@ -0,0 +1,30 @@
+Copyright 2016 The Android Open Source Project
+
+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.
+
+-----------------------------------------------------------------------
+This product contains a modified portion of `Netty`, a configurable network
+stack in Java, which can be obtained at:
+
+ * LICENSE:
+ * licenses/LICENSE.netty.txt (Apache License 2.0)
+ * HOMEPAGE:
+ * http://netty.io/
+
+This product contains a modified portion of `Apache Harmony`, modular Java runtime,
+which can be obtained at:
+
+ * LICENSE:
+ * licenses/LICENSE.harmony.txt (Apache License 2.0)
+ * HOMEPAGE:
+ * https://harmony.apache.org/
diff --git a/solr/licenses/gapic-google-cloud-storage-LICENSE-ASL.txt b/solr/licenses/gapic-google-cloud-storage-LICENSE-ASL.txt
new file mode 100644
index 00000000000..261eeb9e9f8
--- /dev/null
+++ b/solr/licenses/gapic-google-cloud-storage-LICENSE-ASL.txt
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/solr/licenses/opencensus-api-NOTICE.txt b/solr/licenses/gapic-google-cloud-storage-NOTICE.txt
similarity index 100%
rename from solr/licenses/opencensus-api-NOTICE.txt
rename to solr/licenses/gapic-google-cloud-storage-NOTICE.txt
diff --git a/solr/licenses/gapic-google-cloud-storage-v2-2.16.0-alpha.jar.sha1 b/solr/licenses/gapic-google-cloud-storage-v2-2.16.0-alpha.jar.sha1
new file mode 100644
index 00000000000..3c84245d777
--- /dev/null
+++ b/solr/licenses/gapic-google-cloud-storage-v2-2.16.0-alpha.jar.sha1
@@ -0,0 +1 @@
+8323ad236d8417bc7d250a29ee404eec7a8325ff
diff --git a/solr/licenses/gax-2.18.7.jar.sha1 b/solr/licenses/gax-2.18.7.jar.sha1
deleted file mode 100644
index 95cbb3978a5..00000000000
--- a/solr/licenses/gax-2.18.7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2da519c341dcc7942f7172c14a7220a5b2265821
diff --git a/solr/licenses/gax-2.20.1.jar.sha1 b/solr/licenses/gax-2.20.1.jar.sha1
new file mode 100644
index 00000000000..9d624127c9d
--- /dev/null
+++ b/solr/licenses/gax-2.20.1.jar.sha1
@@ -0,0 +1 @@
+eda8e75d05f772e497de7840f8ce6982c2fd0d2d
diff --git a/solr/licenses/gax-grpc-2.20.1.jar.sha1 b/solr/licenses/gax-grpc-2.20.1.jar.sha1
new file mode 100644
index 00000000000..265ffae9e48
--- /dev/null
+++ b/solr/licenses/gax-grpc-2.20.1.jar.sha1
@@ -0,0 +1 @@
+903832f94679af1553b885778860ae68028c05af
diff --git a/solr/licenses/gax-httpjson-0.103.7.jar.sha1 b/solr/licenses/gax-httpjson-0.103.7.jar.sha1
deleted file mode 100644
index 9b889d638c6..00000000000
--- a/solr/licenses/gax-httpjson-0.103.7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-47998a83b366c0dd7234fa512b8c468a88c90be2
diff --git a/solr/licenses/gax-httpjson-0.105.1.jar.sha1 b/solr/licenses/gax-httpjson-0.105.1.jar.sha1
new file mode 100644
index 00000000000..d9e434c782c
--- /dev/null
+++ b/solr/licenses/gax-httpjson-0.105.1.jar.sha1
@@ -0,0 +1 @@
+ed534fb7b62420c5430a950eb4915e3062d0d3d3
diff --git a/solr/licenses/google-api-client-2.0.0.jar.sha1 b/solr/licenses/google-api-client-2.0.0.jar.sha1
deleted file mode 100644
index b69f2e3b0c2..00000000000
--- a/solr/licenses/google-api-client-2.0.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c3daf5048a26a73182b5e6c81ad141fb859f0787
diff --git a/solr/licenses/google-api-client-2.1.1.jar.sha1 b/solr/licenses/google-api-client-2.1.1.jar.sha1
new file mode 100644
index 00000000000..d40b3202ffa
--- /dev/null
+++ b/solr/licenses/google-api-client-2.1.1.jar.sha1
@@ -0,0 +1 @@
+5f67f14c3fc386c7396323e8d43c32859bf82ad3
diff --git a/solr/licenses/google-auth-library-credentials-1.13.0.jar.sha1 b/solr/licenses/google-auth-library-credentials-1.13.0.jar.sha1
new file mode 100644
index 00000000000..88fd15d826e
--- /dev/null
+++ b/solr/licenses/google-auth-library-credentials-1.13.0.jar.sha1
@@ -0,0 +1 @@
+b97419885bbb5ec26cfe50cc40f84ff58af0478a
diff --git a/solr/licenses/google-auth-library-credentials-1.8.1.jar.sha1 b/solr/licenses/google-auth-library-credentials-1.8.1.jar.sha1
deleted file mode 100644
index 4962281892d..00000000000
--- a/solr/licenses/google-auth-library-credentials-1.8.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f5e0c6e72ce1c861a88a7f2f72cb10ca99a96758
diff --git a/solr/licenses/google-auth-library-oauth2-http-1.13.0.jar.sha1 b/solr/licenses/google-auth-library-oauth2-http-1.13.0.jar.sha1
new file mode 100644
index 00000000000..64d8fd16116
--- /dev/null
+++ b/solr/licenses/google-auth-library-oauth2-http-1.13.0.jar.sha1
@@ -0,0 +1 @@
+4b3d8026f57eea85214fe35b178dd266fec98eeb
diff --git a/solr/licenses/google-auth-library-oauth2-http-1.8.1.jar.sha1 b/solr/licenses/google-auth-library-oauth2-http-1.8.1.jar.sha1
deleted file mode 100644
index 6580a0512c9..00000000000
--- a/solr/licenses/google-auth-library-oauth2-http-1.8.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3a49c6af9162e90580f35253ffdd47eab7580f30
diff --git a/solr/licenses/google-cloud-core-2.8.6.jar.sha1 b/solr/licenses/google-cloud-core-2.8.6.jar.sha1
deleted file mode 100644
index a2355ca4887..00000000000
--- a/solr/licenses/google-cloud-core-2.8.6.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-72b5a9d56d1afc3d75df5e7a0dfc201eda15d2ce
diff --git a/solr/licenses/google-cloud-core-2.9.0.jar.sha1 b/solr/licenses/google-cloud-core-2.9.0.jar.sha1
new file mode 100644
index 00000000000..cf939a1f3ba
--- /dev/null
+++ b/solr/licenses/google-cloud-core-2.9.0.jar.sha1
@@ -0,0 +1 @@
+ad71930c40e6670317118c987db1d4568addfbc6
diff --git a/solr/licenses/google-cloud-core-grpc-2.9.0.jar.sha1 b/solr/licenses/google-cloud-core-grpc-2.9.0.jar.sha1
new file mode 100644
index 00000000000..2536e6ce070
--- /dev/null
+++ b/solr/licenses/google-cloud-core-grpc-2.9.0.jar.sha1
@@ -0,0 +1 @@
+cded78b0535f2a69bf84b0f24389915b65d04a0f
diff --git a/solr/licenses/google-cloud-core-http-2.8.6.jar.sha1 b/solr/licenses/google-cloud-core-http-2.8.6.jar.sha1
deleted file mode 100644
index ae3e699ad3f..00000000000
--- a/solr/licenses/google-cloud-core-http-2.8.6.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-51b31548319cbcae62cd24b05db9709e67e87a7c
diff --git a/solr/licenses/google-cloud-core-http-2.9.0.jar.sha1 b/solr/licenses/google-cloud-core-http-2.9.0.jar.sha1
new file mode 100644
index 00000000000..dbe942b8b7d
--- /dev/null
+++ b/solr/licenses/google-cloud-core-http-2.9.0.jar.sha1
@@ -0,0 +1 @@
+083cc1251398711421699c8ce33c3b22be26fb2a
diff --git a/solr/licenses/google-cloud-nio-0.124.14.jar.sha1 b/solr/licenses/google-cloud-nio-0.124.14.jar.sha1
deleted file mode 100644
index 0e6e41eabfa..00000000000
--- a/solr/licenses/google-cloud-nio-0.124.14.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-febb6a89f3ae62ac8a4446e5332ab36adaa06aa2
diff --git a/solr/licenses/google-cloud-nio-0.126.0.jar.sha1 b/solr/licenses/google-cloud-nio-0.126.0.jar.sha1
new file mode 100644
index 00000000000..0482921c001
--- /dev/null
+++ b/solr/licenses/google-cloud-nio-0.126.0.jar.sha1
@@ -0,0 +1 @@
+894171a1abd4daa1a4110b244c4088d5cee2247c
diff --git a/solr/licenses/google-cloud-storage-2.11.3.jar.sha1 b/solr/licenses/google-cloud-storage-2.11.3.jar.sha1
deleted file mode 100644
index 5c652ab0760..00000000000
--- a/solr/licenses/google-cloud-storage-2.11.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a571a04d50e18f6a0a8d296d3f0a79c34327af08
diff --git a/solr/licenses/google-cloud-storage-2.16.0.jar.sha1 b/solr/licenses/google-cloud-storage-2.16.0.jar.sha1
new file mode 100644
index 00000000000..4cd935fb8c3
--- /dev/null
+++ b/solr/licenses/google-cloud-storage-2.16.0.jar.sha1
@@ -0,0 +1 @@
+174fe5ba4b586fc095d5de13f47ebdfbab912ddc
diff --git a/solr/licenses/google-http-client-1.42.2.jar.sha1 b/solr/licenses/google-http-client-1.42.2.jar.sha1
deleted file mode 100644
index 82a185314eb..00000000000
--- a/solr/licenses/google-http-client-1.42.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6d6ab266972f0afc6987fe3b88ce321179515fa3
diff --git a/solr/licenses/google-http-client-1.42.3.jar.sha1 b/solr/licenses/google-http-client-1.42.3.jar.sha1
new file mode 100644
index 00000000000..48fec1a1128
--- /dev/null
+++ b/solr/licenses/google-http-client-1.42.3.jar.sha1
@@ -0,0 +1 @@
+e0feb1bd93ad9fb1e064706cff96e32b41a57b9c
diff --git a/solr/licenses/google-http-client-apache-v2-1.42.2.jar.sha1 b/solr/licenses/google-http-client-apache-v2-1.42.2.jar.sha1
deleted file mode 100644
index faff8ab4277..00000000000
--- a/solr/licenses/google-http-client-apache-v2-1.42.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d89fc070f427f8200b7401cda1ed4ce3004ec58d
diff --git a/solr/licenses/google-http-client-apache-v2-1.42.3.jar.sha1 b/solr/licenses/google-http-client-apache-v2-1.42.3.jar.sha1
new file mode 100644
index 00000000000..6b1c29a68d5
--- /dev/null
+++ b/solr/licenses/google-http-client-apache-v2-1.42.3.jar.sha1
@@ -0,0 +1 @@
+3dc8cea436c52d0d248abe9648b0e4f1d02bd500
diff --git a/solr/licenses/google-http-client-appengine-1.42.2.jar.sha1 b/solr/licenses/google-http-client-appengine-1.42.2.jar.sha1
deleted file mode 100644
index e3991e4b1fe..00000000000
--- a/solr/licenses/google-http-client-appengine-1.42.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d79bd2db2d608243124b53585d92d2be118f7fa7
diff --git a/solr/licenses/google-http-client-appengine-1.42.3.jar.sha1 b/solr/licenses/google-http-client-appengine-1.42.3.jar.sha1
new file mode 100644
index 00000000000..3f6873dcdb4
--- /dev/null
+++ b/solr/licenses/google-http-client-appengine-1.42.3.jar.sha1
@@ -0,0 +1 @@
+d7fd2d3e42af1c7f1d1bf59e1798dbbf02328912
diff --git a/solr/licenses/google-http-client-gson-1.42.2.jar.sha1 b/solr/licenses/google-http-client-gson-1.42.2.jar.sha1
deleted file mode 100644
index 4cca69c5aa8..00000000000
--- a/solr/licenses/google-http-client-gson-1.42.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-863fbfbdb35c203c43cefd9e3cc1e3a7c8e9f51e
diff --git a/solr/licenses/google-http-client-gson-1.42.3.jar.sha1 b/solr/licenses/google-http-client-gson-1.42.3.jar.sha1
new file mode 100644
index 00000000000..b8c665a6e62
--- /dev/null
+++ b/solr/licenses/google-http-client-gson-1.42.3.jar.sha1
@@ -0,0 +1 @@
+3251b36ee9e9c3effe3293f8d7094aa3841cad55
diff --git a/solr/licenses/google-http-client-jackson2-1.42.2.jar.sha1 b/solr/licenses/google-http-client-jackson2-1.42.2.jar.sha1
deleted file mode 100644
index 16efe68ee1e..00000000000
--- a/solr/licenses/google-http-client-jackson2-1.42.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e8f81a0b9de2cfc8b9ab8f8a2a7b678608afc4b5
diff --git a/solr/licenses/google-http-client-jackson2-1.42.3.jar.sha1 b/solr/licenses/google-http-client-jackson2-1.42.3.jar.sha1
new file mode 100644
index 00000000000..41ba0943a12
--- /dev/null
+++ b/solr/licenses/google-http-client-jackson2-1.42.3.jar.sha1
@@ -0,0 +1 @@
+789cafde696403b429026bf19071caf46d8c8934
diff --git a/solr/licenses/grpc-alts-1.51.0.jar.sha1 b/solr/licenses/grpc-alts-1.51.0.jar.sha1
new file mode 100644
index 00000000000..263f831b0d3
--- /dev/null
+++ b/solr/licenses/grpc-alts-1.51.0.jar.sha1
@@ -0,0 +1 @@
+9bed503f2d919703b86d16bbdd76887db1580423
diff --git a/solr/licenses/grpc-api-1.50.2.jar.sha1 b/solr/licenses/grpc-api-1.50.2.jar.sha1
deleted file mode 100644
index 159166cfae2..00000000000
--- a/solr/licenses/grpc-api-1.50.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8840eef194d786b8d97d820b8ad4efd219553b59
diff --git a/solr/licenses/grpc-api-1.51.0.jar.sha1 b/solr/licenses/grpc-api-1.51.0.jar.sha1
new file mode 100644
index 00000000000..a1d6979580c
--- /dev/null
+++ b/solr/licenses/grpc-api-1.51.0.jar.sha1
@@ -0,0 +1 @@
+97fcc953ca765070bccc9cbad9b867396d35bbba
diff --git a/solr/licenses/grpc-auth-1.51.0.jar.sha1 b/solr/licenses/grpc-auth-1.51.0.jar.sha1
new file mode 100644
index 00000000000..3fe776369dd
--- /dev/null
+++ b/solr/licenses/grpc-auth-1.51.0.jar.sha1
@@ -0,0 +1 @@
+a794d3a59f2237cdd84813e492c73e8e50167d6c
diff --git a/solr/licenses/grpc-context-1.50.2.jar.sha1 b/solr/licenses/grpc-context-1.50.2.jar.sha1
deleted file mode 100644
index 51eee9c868b..00000000000
--- a/solr/licenses/grpc-context-1.50.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ad433a34210e1d02e1e208c32b6a69886b64c8cb
diff --git a/solr/licenses/grpc-context-1.51.0.jar.sha1 b/solr/licenses/grpc-context-1.51.0.jar.sha1
new file mode 100644
index 00000000000..a2c6116dc34
--- /dev/null
+++ b/solr/licenses/grpc-context-1.51.0.jar.sha1
@@ -0,0 +1 @@
+9e4bffc8ae0d67f1f3b900f5f8ad9c32a3a4f69e
diff --git a/solr/licenses/grpc-core-1.50.2.jar.sha1 b/solr/licenses/grpc-core-1.50.2.jar.sha1
deleted file mode 100644
index dba2086554d..00000000000
--- a/solr/licenses/grpc-core-1.50.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-848c5243dc4a69553953faf1cb1de4d01f87b602
diff --git a/solr/licenses/grpc-core-1.51.0.jar.sha1 b/solr/licenses/grpc-core-1.51.0.jar.sha1
new file mode 100644
index 00000000000..2fa5b4766d7
--- /dev/null
+++ b/solr/licenses/grpc-core-1.51.0.jar.sha1
@@ -0,0 +1 @@
+d7fc6af4183d7d21f22f800326c8b25b0387a763
diff --git a/solr/licenses/grpc-google-cloud-storage-v2-2.16.0-alpha.jar.sha1 b/solr/licenses/grpc-google-cloud-storage-v2-2.16.0-alpha.jar.sha1
new file mode 100644
index 00000000000..0308ba25836
--- /dev/null
+++ b/solr/licenses/grpc-google-cloud-storage-v2-2.16.0-alpha.jar.sha1
@@ -0,0 +1 @@
+eb20b975d17b47dfbe37a17edadfe531e2bd97e1
diff --git a/solr/licenses/grpc-google-iam-v1-1.6.22.jar.sha1 b/solr/licenses/grpc-google-iam-v1-1.6.22.jar.sha1
new file mode 100644
index 00000000000..8a89a725e87
--- /dev/null
+++ b/solr/licenses/grpc-google-iam-v1-1.6.22.jar.sha1
@@ -0,0 +1 @@
+625fe75c8b04b36fbdb9361ce5e9b523c9097688
diff --git a/solr/licenses/grpc-googleapis-1.51.0.jar.sha1 b/solr/licenses/grpc-googleapis-1.51.0.jar.sha1
new file mode 100644
index 00000000000..0bceee5e951
--- /dev/null
+++ b/solr/licenses/grpc-googleapis-1.51.0.jar.sha1
@@ -0,0 +1 @@
+6c4ea4c7a1bca38b71d53b1dfdee7b0c98643c4a
diff --git a/solr/licenses/grpc-grpclb-1.51.0.jar.sha1 b/solr/licenses/grpc-grpclb-1.51.0.jar.sha1
new file mode 100644
index 00000000000..69762b42e3a
--- /dev/null
+++ b/solr/licenses/grpc-grpclb-1.51.0.jar.sha1
@@ -0,0 +1 @@
+2ad3754ca495c3cd46c375ebf8a25696cd41d897
diff --git a/solr/licenses/grpc-netty-1.50.2.jar.sha1 b/solr/licenses/grpc-netty-1.50.2.jar.sha1
deleted file mode 100644
index de7352509a3..00000000000
--- a/solr/licenses/grpc-netty-1.50.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5079c023b7f914f6af6f624ee60333442d7cd7a2
diff --git a/solr/licenses/grpc-netty-1.51.0.jar.sha1 b/solr/licenses/grpc-netty-1.51.0.jar.sha1
new file mode 100644
index 00000000000..e18cd7ac17a
--- /dev/null
+++ b/solr/licenses/grpc-netty-1.51.0.jar.sha1
@@ -0,0 +1 @@
+98c8f3b78abb3c41634896a3da9cd0633f0dddbe
diff --git a/solr/licenses/grpc-netty-shaded-1.51.0.jar.sha1 b/solr/licenses/grpc-netty-shaded-1.51.0.jar.sha1
new file mode 100644
index 00000000000..2075175bb79
--- /dev/null
+++ b/solr/licenses/grpc-netty-shaded-1.51.0.jar.sha1
@@ -0,0 +1 @@
+edeab7f3692cdf0d9ab5efff15bbd971fe408751
diff --git a/solr/licenses/grpc-protobuf-1.50.2.jar.sha1 b/solr/licenses/grpc-protobuf-1.50.2.jar.sha1
deleted file mode 100644
index aea7ddf832a..00000000000
--- a/solr/licenses/grpc-protobuf-1.50.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3e8b75be934471c20d76e85e4c411d164d07b219
diff --git a/solr/licenses/grpc-protobuf-1.51.0.jar.sha1 b/solr/licenses/grpc-protobuf-1.51.0.jar.sha1
new file mode 100644
index 00000000000..a13a656151c
--- /dev/null
+++ b/solr/licenses/grpc-protobuf-1.51.0.jar.sha1
@@ -0,0 +1 @@
+01715f4a4607e66ed862f0ae26b355e28a15dba8
diff --git a/solr/licenses/grpc-protobuf-lite-1.50.2.jar.sha1 b/solr/licenses/grpc-protobuf-lite-1.50.2.jar.sha1
deleted file mode 100644
index 5c9602137a9..00000000000
--- a/solr/licenses/grpc-protobuf-lite-1.50.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1cdfb6ec3de18836c00175e81607b57122757d48
diff --git a/solr/licenses/grpc-protobuf-lite-1.51.0.jar.sha1 b/solr/licenses/grpc-protobuf-lite-1.51.0.jar.sha1
new file mode 100644
index 00000000000..2c0b8a65241
--- /dev/null
+++ b/solr/licenses/grpc-protobuf-lite-1.51.0.jar.sha1
@@ -0,0 +1 @@
+061912a12180e46eca64942056a74830c384769c
diff --git a/solr/licenses/grpc-services-1.51.0.jar.sha1 b/solr/licenses/grpc-services-1.51.0.jar.sha1
new file mode 100644
index 00000000000..ab3fd29dc0e
--- /dev/null
+++ b/solr/licenses/grpc-services-1.51.0.jar.sha1
@@ -0,0 +1 @@
+fcd20b41786975ac13a5bd0cfbccee02824565a0
diff --git a/solr/licenses/grpc-stub-1.50.2.jar.sha1 b/solr/licenses/grpc-stub-1.50.2.jar.sha1
deleted file mode 100644
index 3855e7d72aa..00000000000
--- a/solr/licenses/grpc-stub-1.50.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5b114195e7f426b9df1b093a618b80a8a8711b19
diff --git a/solr/licenses/grpc-stub-1.51.0.jar.sha1 b/solr/licenses/grpc-stub-1.51.0.jar.sha1
new file mode 100644
index 00000000000..12257fbd32c
--- /dev/null
+++ b/solr/licenses/grpc-stub-1.51.0.jar.sha1
@@ -0,0 +1 @@
+8ddb5be39478adbc0d6109ceeae7c7c3afd671ee
diff --git a/solr/licenses/grpc-xds-1.51.0.jar.sha1 b/solr/licenses/grpc-xds-1.51.0.jar.sha1
new file mode 100644
index 00000000000..ce2454e70e2
--- /dev/null
+++ b/solr/licenses/grpc-xds-1.51.0.jar.sha1
@@ -0,0 +1 @@
+4861823f55c9c2e2a466e42b17c20a463e0f2f6f
diff --git a/solr/licenses/gson-2.10.jar.sha1 b/solr/licenses/gson-2.10.jar.sha1
new file mode 100644
index 00000000000..ac70b96df7f
--- /dev/null
+++ b/solr/licenses/gson-2.10.jar.sha1
@@ -0,0 +1 @@
+dd9b193aef96e973d5a11ab13cd17430c2e4306b
diff --git a/solr/licenses/gson-2.9.1.jar.sha1 b/solr/licenses/gson-2.9.1.jar.sha1
deleted file mode 100644
index 17a305d13a7..00000000000
--- a/solr/licenses/gson-2.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-02cc2131b98ebfb04e2b2c7dfb84431f4045096b
diff --git a/solr/licenses/opencensus-contrib-http-util-LICENSE-ASL.txt b/solr/licenses/opencensus-LICENSE-ASL.txt
similarity index 100%
rename from solr/licenses/opencensus-contrib-http-util-LICENSE-ASL.txt
rename to solr/licenses/opencensus-LICENSE-ASL.txt
diff --git a/solr/licenses/opencensus-contrib-http-util-NOTICE.txt b/solr/licenses/opencensus-NOTICE.txt
similarity index 100%
rename from solr/licenses/opencensus-contrib-http-util-NOTICE.txt
rename to solr/licenses/opencensus-NOTICE.txt
diff --git a/solr/licenses/opencensus-proto-0.2.0.jar.sha1 b/solr/licenses/opencensus-proto-0.2.0.jar.sha1
new file mode 100644
index 00000000000..831b07ea11f
--- /dev/null
+++ b/solr/licenses/opencensus-proto-0.2.0.jar.sha1
@@ -0,0 +1 @@
+c05b6b32b69d5d9144087ea0ebc6fab183fb9151
diff --git a/solr/licenses/perfmark-api-0.25.0.jar.sha1 b/solr/licenses/perfmark-api-0.25.0.jar.sha1
deleted file mode 100644
index d5dfe856ad5..00000000000
--- a/solr/licenses/perfmark-api-0.25.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-340a0c3d81cdcd9ecd7dc2ae00fb2633b469b157
diff --git a/solr/licenses/perfmark-api-0.26.0.jar.sha1 b/solr/licenses/perfmark-api-0.26.0.jar.sha1
new file mode 100644
index 00000000000..3190779e10a
--- /dev/null
+++ b/solr/licenses/perfmark-api-0.26.0.jar.sha1
@@ -0,0 +1 @@
+ef65452adaf20bf7d12ef55913aba24037b82738
diff --git a/solr/licenses/proto-google-cloud-storage-v2-2.16.0-alpha.jar.sha1 b/solr/licenses/proto-google-cloud-storage-v2-2.16.0-alpha.jar.sha1
new file mode 100644
index 00000000000..9ba6a874f6c
--- /dev/null
+++ b/solr/licenses/proto-google-cloud-storage-v2-2.16.0-alpha.jar.sha1
@@ -0,0 +1 @@
+ba0fdf51730eeaa07419280bc7f152c8fa6366f4
diff --git a/solr/licenses/proto-google-cloud-storage-v2-LICENSE-ASL.txt b/solr/licenses/proto-google-cloud-storage-v2-LICENSE-ASL.txt
new file mode 100644
index 00000000000..261eeb9e9f8
--- /dev/null
+++ b/solr/licenses/proto-google-cloud-storage-v2-LICENSE-ASL.txt
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/solr/licenses/proto-google-cloud-storage-v2-NOTICE.txt b/solr/licenses/proto-google-cloud-storage-v2-NOTICE.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/solr/licenses/proto-google-common-protos-2.11.0.jar.sha1 b/solr/licenses/proto-google-common-protos-2.11.0.jar.sha1
new file mode 100644
index 00000000000..de856a27940
--- /dev/null
+++ b/solr/licenses/proto-google-common-protos-2.11.0.jar.sha1
@@ -0,0 +1 @@
+7c35d59614deed60e7c8330e1d0666dafd5fc7b2
diff --git a/solr/licenses/proto-google-common-protos-2.9.2.jar.sha1 b/solr/licenses/proto-google-common-protos-2.9.2.jar.sha1
deleted file mode 100644
index ac3f0f42dee..00000000000
--- a/solr/licenses/proto-google-common-protos-2.9.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e59de564686b050b1a292e6c2d6786e55f113f55
diff --git a/solr/licenses/proto-google-iam-v1-1.5.2.jar.sha1 b/solr/licenses/proto-google-iam-v1-1.5.2.jar.sha1
deleted file mode 100644
index f6c7870dd07..00000000000
--- a/solr/licenses/proto-google-iam-v1-1.5.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-68007f27c0b06db5b1d0b1f8a3d90501a217c2a4
diff --git a/solr/licenses/proto-google-iam-v1-1.6.22.jar.sha1 b/solr/licenses/proto-google-iam-v1-1.6.22.jar.sha1
new file mode 100644
index 00000000000..c9952e8fa2b
--- /dev/null
+++ b/solr/licenses/proto-google-iam-v1-1.6.22.jar.sha1
@@ -0,0 +1 @@
+b863fd2789f860e4b15250e2c5f7d76bc7ae77c2
diff --git a/solr/licenses/protobuf-java-3.21.10.jar.sha1 b/solr/licenses/protobuf-java-3.21.10.jar.sha1
new file mode 100644
index 00000000000..6f24ebced8b
--- /dev/null
+++ b/solr/licenses/protobuf-java-3.21.10.jar.sha1
@@ -0,0 +1 @@
+de8fbd96b217ae8b6d707a15a7419ed469ea10d9
diff --git a/solr/licenses/protobuf-java-3.21.12.jar.sha1 b/solr/licenses/protobuf-java-3.21.12.jar.sha1
deleted file mode 100644
index 7757be40e25..00000000000
--- a/solr/licenses/protobuf-java-3.21.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5589e79a33cb6509f7e681d7cf4fc59d47c51c71
diff --git a/solr/licenses/protobuf-java-util-3.21.10.jar.sha1 b/solr/licenses/protobuf-java-util-3.21.10.jar.sha1
new file mode 100644
index 00000000000..37bda54cfcf
--- /dev/null
+++ b/solr/licenses/protobuf-java-util-3.21.10.jar.sha1
@@ -0,0 +1 @@
+2323504500127eb60f21bf23ccb987798c992983
diff --git a/solr/licenses/protobuf-java-util-3.21.12.jar.sha1 b/solr/licenses/protobuf-java-util-3.21.12.jar.sha1
deleted file mode 100644
index c23f066d1a2..00000000000
--- a/solr/licenses/protobuf-java-util-3.21.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1a800bf7976d939217c8d91ed9a17d7a78bf2187
diff --git a/solr/licenses/re2j-1.2.jar.sha1 b/solr/licenses/re2j-1.2.jar.sha1
deleted file mode 100644
index 7103441f03d..00000000000
--- a/solr/licenses/re2j-1.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4361eed4abe6f84d982cbb26749825f285996dd2
diff --git a/solr/licenses/re2j-1.6.jar.sha1 b/solr/licenses/re2j-1.6.jar.sha1
new file mode 100644
index 00000000000..feaedf5902f
--- /dev/null
+++ b/solr/licenses/re2j-1.6.jar.sha1
@@ -0,0 +1 @@
+a13e879fd7971738d06020fefeb108cc14e14169
diff --git a/solr/licenses/threetenbp-1.6.0.jar.sha1 b/solr/licenses/threetenbp-1.6.0.jar.sha1
deleted file mode 100644
index 9d99241549b..00000000000
--- a/solr/licenses/threetenbp-1.6.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-146819e1d5a2145828fd7b5fa8338decc8c1fa5e
diff --git a/solr/licenses/threetenbp-1.6.4.jar.sha1 b/solr/licenses/threetenbp-1.6.4.jar.sha1
new file mode 100644
index 00000000000..96843a780f3
--- /dev/null
+++ b/solr/licenses/threetenbp-1.6.4.jar.sha1
@@ -0,0 +1 @@
+0c6ecd57818d6ca280a1681f3f95f339f12c38ae
diff --git a/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/ConcurrentDelegatingStorage.java b/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/ConcurrentDelegatingStorage.java
index 6c6d9b2ade8..5d34759b565 100644
--- a/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/ConcurrentDelegatingStorage.java
+++ b/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/ConcurrentDelegatingStorage.java
@@ -56,6 +56,7 @@ import java.util.concurrent.TimeUnit;
* synchronization across all instance methods. This allows google-cloud-nio's in-memory fake to be
* used from multiple threads simultaneously as our tests require.
*/
+@SuppressWarnings("try")
public class ConcurrentDelegatingStorage implements Storage {
private final Storage delegate;
diff --git a/versions.lock b/versions.lock
index 3a65cb124e8..2c1868920c7 100644
--- a/versions.lock
+++ b/versions.lock
@@ -8,7 +8,7 @@ com.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e)
com.epam:parso:2.0.14 (1 constraints: 8e0c750e)
com.fasterxml.jackson:jackson-bom:2.14.1 (13 constraints: 7208a870)
com.fasterxml.jackson.core:jackson-annotations:2.14.1 (10 constraints: 89beae04)
-com.fasterxml.jackson.core:jackson-core:2.14.1 (13 constraints: 2a028008)
+com.fasterxml.jackson.core:jackson-core:2.14.1 (13 constraints: 29020108)
com.fasterxml.jackson.core:jackson-databind:2.14.1 (18 constraints: c863ae0d)
com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.14.1 (1 constraints: b80ea766)
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.14.1 (2 constraints: a42445e0)
@@ -19,36 +19,42 @@ com.github.junrar:junrar:7.5.2 (1 constraints: 650c1002)
com.github.openjson:openjson:1.0.12 (1 constraints: 8b0c6d0e)
com.github.spotbugs:spotbugs-annotations:4.7.2 (1 constraints: 0f051636)
com.github.virtuald:curvesapi:1.07 (1 constraints: 9e0ac7c0)
-com.google.android:annotations:4.1.1.4 (1 constraints: 6e08d68b)
-com.google.api:api-common:2.2.1 (5 constraints: 8543fda1)
-com.google.api:gax:2.18.7 (5 constraints: 874a5ca6)
-com.google.api:gax-httpjson:0.103.7 (2 constraints: 3e21a5bc)
-com.google.api-client:google-api-client:2.0.0 (3 constraints: 9b3281f9)
-com.google.api.grpc:proto-google-common-protos:2.9.2 (6 constraints: 0e4db113)
-com.google.api.grpc:proto-google-iam-v1:1.5.2 (2 constraints: 8b1ed196)
+com.google.android:annotations:4.1.1.4 (2 constraints: b918820a)
+com.google.api:api-common:2.2.2 (5 constraints: 8a43c4a3)
+com.google.api:gax:2.20.1 (5 constraints: 464a8b8e)
+com.google.api:gax-grpc:2.20.1 (1 constraints: 1910faa5)
+com.google.api:gax-httpjson:0.105.1 (2 constraints: 3621e5bb)
+com.google.api-client:google-api-client:2.1.1 (3 constraints: 9f32e5f9)
+com.google.api.grpc:gapic-google-cloud-storage-v2:2.16.0-alpha (2 constraints: e822f038)
+com.google.api.grpc:grpc-google-cloud-storage-v2:2.16.0-alpha (2 constraints: e822f038)
+com.google.api.grpc:grpc-google-iam-v1:1.6.22 (1 constraints: 1f1007a6)
+com.google.api.grpc:proto-google-cloud-storage-v2:2.16.0-alpha (2 constraints: e822f038)
+com.google.api.grpc:proto-google-common-protos:2.11.0 (6 constraints: d64dc52b)
+com.google.api.grpc:proto-google-iam-v1:1.6.22 (2 constraints: f11ec5cd)
com.google.apis:google-api-services-storage:v1-rev20220705-2.0.0 (2 constraints: dc259c49)
-com.google.auth:google-auth-library-credentials:1.8.1 (6 constraints: 2a5788f4)
-com.google.auth:google-auth-library-oauth2-http:1.8.1 (5 constraints: 9a4394a8)
-com.google.auto.value:auto-value-annotations:1.9 (5 constraints: 9c494bcf)
-com.google.cloud:google-cloud-bom:0.178.0 (1 constraints: 7205bc40)
-com.google.cloud:google-cloud-core:2.8.6 (3 constraints: cc2e39e1)
-com.google.cloud:google-cloud-core-http:2.8.6 (1 constraints: f40ff795)
-com.google.cloud:google-cloud-storage:2.11.3 (2 constraints: cf1cb826)
-com.google.code.gson:gson:2.9.1 (6 constraints: 6d543cd0)
-com.google.errorprone:error_prone_annotations:2.16 (8 constraints: 4f591a61)
+com.google.auth:google-auth-library-credentials:1.13.0 (6 constraints: 3058ba8a)
+com.google.auth:google-auth-library-oauth2-http:1.13.0 (5 constraints: 75444eb0)
+com.google.auto.value:auto-value-annotations:1.10.1 (5 constraints: 594b905c)
+com.google.cloud:google-cloud-bom:0.184.0 (1 constraints: 6f05b440)
+com.google.cloud:google-cloud-core:2.9.0 (3 constraints: bd2e92de)
+com.google.cloud:google-cloud-core-grpc:2.9.0 (1 constraints: ef0ff495)
+com.google.cloud:google-cloud-core-http:2.9.0 (1 constraints: ef0ff495)
+com.google.cloud:google-cloud-storage:2.16.0 (2 constraints: d31c2627)
+com.google.code.gson:gson:2.10 (6 constraints: c553f00d)
+com.google.errorprone:error_prone_annotations:2.16 (10 constraints: 537a23c0)
com.google.guava:failureaccess:1.0.1 (2 constraints: f9199e37)
com.google.guava:guava:31.1-jre (25 constraints: 756fc917)
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 4b35b0a0)
-com.google.http-client:google-http-client:1.42.2 (11 constraints: 28bfcf97)
-com.google.http-client:google-http-client-apache-v2:1.42.2 (2 constraints: b4208375)
-com.google.http-client:google-http-client-appengine:1.42.2 (2 constraints: da206d81)
-com.google.http-client:google-http-client-gson:1.42.2 (6 constraints: e6619899)
-com.google.http-client:google-http-client-jackson2:1.42.2 (1 constraints: 1d1003a6)
+com.google.http-client:google-http-client:1.42.3 (11 constraints: 37bf7aac)
+com.google.http-client:google-http-client-apache-v2:1.42.3 (2 constraints: b720e475)
+com.google.http-client:google-http-client-appengine:1.42.3 (2 constraints: dc209e81)
+com.google.http-client:google-http-client-gson:1.42.3 (6 constraints: f0616ba0)
+com.google.http-client:google-http-client-jackson2:1.42.3 (1 constraints: 1e1004a6)
com.google.j2objc:j2objc-annotations:1.3 (4 constraints: 7d3ab454)
com.google.oauth-client:google-oauth-client:1.34.1 (2 constraints: b520b575)
-com.google.protobuf:protobuf-java:3.21.12 (11 constraints: 9d9d18cf)
-com.google.protobuf:protobuf-java-util:3.21.12 (4 constraints: 9d303921)
-com.google.re2j:re2j:1.2 (1 constraints: a7041c2c)
+com.google.protobuf:protobuf-java:3.21.10 (12 constraints: fba64736)
+com.google.protobuf:protobuf-java-util:3.21.10 (3 constraints: ba2b3997)
+com.google.re2j:re2j:1.6 (2 constraints: 3714a76f)
com.googlecode.json-simple:json-simple:1.1.1 (2 constraints: 321c78d2)
com.googlecode.juniversalchardet:juniversalchardet:1.0.3 (1 constraints: 5b0ce401)
com.googlecode.plist:dd-plist:1.23 (1 constraints: 2f0c83f5)
@@ -70,7 +76,7 @@ com.sun.istack:istack-commons-runtime:3.0.12 (1 constraints: eb0d9a43)
com.tdunning:t-digest:3.1 (1 constraints: a804212c)
com.zaxxer:SparseBitSet:1.2 (1 constraints: 0d081e75)
commons-cli:commons-cli:1.4 (1 constraints: a9041e2c)
-commons-codec:commons-codec:1.15 (8 constraints: bd67e40b)
+commons-codec:commons-codec:1.15 (10 constraints: b187a061)
commons-collections:commons-collections:3.2.2 (1 constraints: 09050236)
commons-io:commons-io:2.11.0 (9 constraints: 9d65151d)
de.l3s.boilerpipe:boilerpipe:1.1.0 (1 constraints: 590ce401)
@@ -85,13 +91,20 @@ io.dropwizard.metrics:metrics-graphite:4.2.12 (1 constraints: 3b05413b)
io.dropwizard.metrics:metrics-jetty10:4.2.12 (1 constraints: 3b05413b)
io.dropwizard.metrics:metrics-jmx:4.2.12 (1 constraints: 3b05413b)
io.dropwizard.metrics:metrics-jvm:4.2.12 (1 constraints: 3b05413b)
-io.grpc:grpc-api:1.50.2 (4 constraints: 7526366f)
-io.grpc:grpc-context:1.50.2 (4 constraints: 282afae9)
-io.grpc:grpc-core:1.50.2 (1 constraints: c908f38f)
-io.grpc:grpc-netty:1.50.2 (1 constraints: 3a053b3b)
-io.grpc:grpc-protobuf:1.50.2 (1 constraints: 3a053b3b)
-io.grpc:grpc-protobuf-lite:1.50.2 (1 constraints: 060adeb3)
-io.grpc:grpc-stub:1.50.2 (1 constraints: 3a053b3b)
+io.grpc:grpc-alts:1.51.0 (1 constraints: 1b1002a6)
+io.grpc:grpc-api:1.51.0 (5 constraints: 8b3646b1)
+io.grpc:grpc-auth:1.51.0 (1 constraints: 1b1002a6)
+io.grpc:grpc-context:1.51.0 (4 constraints: 202ad6e7)
+io.grpc:grpc-core:1.51.0 (2 constraints: e218ecf8)
+io.grpc:grpc-googleapis:1.51.0 (1 constraints: 1b1002a6)
+io.grpc:grpc-grpclb:1.51.0 (1 constraints: 1b1002a6)
+io.grpc:grpc-netty:1.51.0 (1 constraints: 39053c3b)
+io.grpc:grpc-netty-shaded:1.51.0 (1 constraints: 1b1002a6)
+io.grpc:grpc-protobuf:1.51.0 (2 constraints: 531595d6)
+io.grpc:grpc-protobuf-lite:1.51.0 (2 constraints: 1f1a344d)
+io.grpc:grpc-services:1.51.0 (1 constraints: 1b1002a6)
+io.grpc:grpc-stub:1.51.0 (2 constraints: 531595d6)
+io.grpc:grpc-xds:1.51.0 (1 constraints: 1b1002a6)
io.netty:netty-buffer:4.1.87.Final (10 constraints: c0990502)
io.netty:netty-codec:4.1.87.Final (5 constraints: 6a45d783)
io.netty:netty-codec-http:4.1.87.Final (3 constraints: 582433ee)
@@ -107,8 +120,9 @@ io.netty:netty-transport:4.1.87.Final (9 constraints: 0b8c663f)
io.netty:netty-transport-classes-epoll:4.1.87.Final (1 constraints: b312051f)
io.netty:netty-transport-native-epoll:4.1.87.Final (1 constraints: d70ffb8e)
io.netty:netty-transport-native-unix-common:4.1.87.Final (4 constraints: 5f3dad97)
-io.opencensus:opencensus-api:0.31.1 (5 constraints: 974d3996)
+io.opencensus:opencensus-api:0.31.1 (5 constraints: 924d4692)
io.opencensus:opencensus-contrib-http-util:0.31.1 (3 constraints: 7232a9fc)
+io.opencensus:opencensus-proto:0.2.0 (1 constraints: e60fd595)
io.opentelemetry:opentelemetry-api:1.21.0 (9 constraints: fda10c96)
io.opentelemetry:opentelemetry-api-logs:1.21.0-alpha (2 constraints: a0279d00)
io.opentelemetry:opentelemetry-bom:1.21.0 (1 constraints: c411a7f3)
@@ -129,7 +143,7 @@ io.opentelemetry:opentelemetry-semconv:1.21.0-alpha (5 constraints: ed6e375b)
io.opentracing:opentracing-api:0.33.0 (5 constraints: 7244331d)
io.opentracing:opentracing-noop:0.33.0 (4 constraints: 48361e21)
io.opentracing:opentracing-util:0.33.0 (2 constraints: 5013be5a)
-io.perfmark:perfmark-api:0.25.0 (2 constraints: 0411f2f9)
+io.perfmark:perfmark-api:0.26.0 (3 constraints: 1f210916)
io.prometheus:simpleclient:0.2.0 (3 constraints: fe242db8)
io.prometheus:simpleclient_common:0.2.0 (1 constraints: e51014af)
io.prometheus:simpleclient_httpserver:0.2.0 (1 constraints: 0405f135)
@@ -255,11 +269,12 @@ org.carrot2:morfologik-fsa:2.1.9 (1 constraints: db0d9c36)
org.carrot2:morfologik-polish:2.1.9 (1 constraints: d312541e)
org.carrot2:morfologik-stemming:2.1.9 (2 constraints: d81fb300)
org.ccil.cowan.tagsoup:tagsoup:1.2.1 (1 constraints: 5b0ce801)
-org.checkerframework:checker-qual:3.27.0 (5 constraints: 574674eb)
+org.checkerframework:checker-qual:3.28.0 (5 constraints: 5c46c7ed)
org.codehaus.janino:commons-compiler:3.1.8 (2 constraints: 2f1983ec)
org.codehaus.janino:janino:3.1.8 (1 constraints: 640dbc2c)
org.codehaus.woodstox:stax2-api:4.2.1 (2 constraints: 36152eaf)
org.codelibs:jhighlight:1.1.0 (1 constraints: 590ce401)
+org.conscrypt:conscrypt-openjdk-uber:2.5.2 (1 constraints: ed0fea95)
org.eclipse.jetty:jetty-alpn-client:10.0.13 (3 constraints: eb2e065f)
org.eclipse.jetty:jetty-alpn-java-client:10.0.13 (2 constraints: 1b1b136e)
org.eclipse.jetty:jetty-alpn-java-server:10.0.13 (1 constraints: 67058f40)
@@ -337,7 +352,7 @@ org.tallison:isoparser:1.9.41.7 (1 constraints: fb0c5528)
org.tallison:jmatio:1.5 (1 constraints: ff0b57e9)
org.tallison:metadata-extractor:2.17.1.0 (1 constraints: f00c3b28)
org.tallison.xmp:xmpcore-shaded:6.1.10 (1 constraints: 300e8d49)
-org.threeten:threetenbp:1.6.0 (4 constraints: 0433a25f)
+org.threeten:threetenbp:1.6.4 (4 constraints: 1433c263)
org.tukaani:xz:1.9 (1 constraints: 030c5be9)
org.xerial.snappy:snappy-java:1.1.8.2 (4 constraints: 8c382ee2)
software.amazon.awssdk:annotations:2.17.63 (18 constraints: 690ceab3)
@@ -378,7 +393,7 @@ com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.1 (3 constraints: 7b
com.fasterxml.jackson.module:jackson-module-kotlin:2.14.1 (2 constraints: a41dd75f)
com.fasterxml.jackson.module:jackson-module-parameter-names:2.14.1 (2 constraints: 0a24c381)
com.github.stephenc.jcip:jcip-annotations:1.0-1 (2 constraints: c5188bde)
-com.google.cloud:google-cloud-nio:0.124.14 (1 constraints: c90e1c7b)
+com.google.cloud:google-cloud-nio:0.126.0 (1 constraints: 960e586c)
com.nimbusds:content-type:2.2 (1 constraints: d80b68eb)
com.nimbusds:lang-tag:1.5 (1 constraints: da0b68eb)
com.nimbusds:nimbus-jose-jwt:9.16.1 (1 constraints: 730c5410)
diff --git a/versions.props b/versions.props
index c096d884da1..9bcd23e2a95 100644
--- a/versions.props
+++ b/versions.props
@@ -7,11 +7,10 @@ com.fasterxml.jackson:jackson-bom=2.14.1
com.fasterxml.woodstox:woodstox-core=6.4.0
com.github.ben-manes.caffeine:caffeine=3.1.2
com.github.spotbugs:*=4.7.2
-com.google.cloud:google-cloud-bom=0.178.0
+com.google.cloud:google-cloud-bom=0.184.0
com.google.errorprone:*=2.16
com.google.guava:guava=31.1-jre
-com.google.protobuf:protobuf-java-util=3.21.12
-com.google.re2j:re2j=1.2
+com.google.re2j:re2j=1.6
com.jayway.jsonpath:json-path=2.7.0
com.lmax:disruptor=3.4.2
com.tdunning:t-digest=3.1
@@ -20,7 +19,7 @@ commons-codec:commons-codec=1.15
commons-collections:commons-collections=3.2.2
commons-io:commons-io=2.11.0
io.dropwizard.metrics:*=4.2.12
-io.grpc:grpc-*=1.50.2
+io.grpc:grpc-*=1.51.0
io.netty:*=4.1.87.Final
io.opentelemetry:opentelemetry-bom-alpha=1.21.0-alpha
io.opentracing:*=0.33.0