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 2022/09/21 11:50:55 UTC
[solr] 01/02: SOLR-16421: Upgrade Apache Calcite to 1.32.0 and Avatica to 1.22.0 (#1030)
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
commit 49505e7ec74d7757c0e50900da81416efd478205
Author: Kevin Risden <ri...@users.noreply.github.com>
AuthorDate: Wed Sep 21 07:44:51 2022 -0400
SOLR-16421: Upgrade Apache Calcite to 1.32.0 and Avatica to 1.22.0 (#1030)
---
solr/CHANGES.txt | 2 +
solr/licenses/apiguardian-api-1.1.0.jar.sha1 | 1 -
solr/licenses/apiguardian-api-1.1.2.jar.sha1 | 1 +
...ore-LICENSE-ASL.txt => avatica-LICENSE-ASL.txt} | 0
...{avatica-core-NOTICE.txt => avatica-NOTICE.txt} | 0
solr/licenses/avatica-core-1.18.0.jar.sha1 | 1 -
solr/licenses/avatica-core-1.22.0.jar.sha1 | 1 +
solr/licenses/avatica-metrics-1.22.0.jar.sha1 | 1 +
solr/licenses/calcite-core-1.27.0.jar.sha1 | 1 -
solr/licenses/calcite-core-1.32.0.jar.sha1 | 1 +
solr/licenses/calcite-linq4j-1.27.0.jar.sha1 | 1 -
solr/licenses/calcite-linq4j-1.32.0.jar.sha1 | 1 +
solr/licenses/commons-compiler-3.0.11.jar.sha1 | 1 -
solr/licenses/commons-compiler-3.1.8.jar.sha1 | 1 +
solr/licenses/esri-geometry-api-2.2.0.jar.sha1 | 1 -
solr/licenses/esri-geometry-api-NOTICE.txt | 0
solr/licenses/httpclient5-5.1.3.jar.sha1 | 1 +
solr/licenses/httpclient5-LICENSE-ASL.txt | 558 +++++++++++++++++++++
...tica-core-NOTICE.txt => httpclient5-NOTICE.txt} | 5 +-
solr/licenses/httpcore5-5.1.3.jar.sha1 | 1 +
...i-LICENSE-ASL.txt => httpcore5-LICENSE-ASL.txt} | 24 -
...vatica-core-NOTICE.txt => httpcore5-NOTICE.txt} | 4 +-
solr/licenses/httpcore5-h2-5.1.3.jar.sha1 | 1 +
solr/licenses/janino-3.0.11.jar.sha1 | 1 -
solr/licenses/janino-3.1.8.jar.sha1 | 1 +
solr/licenses/json-path-2.4.0.jar.sha1 | 1 -
solr/licenses/json-path-2.7.0.jar.sha1 | 1 +
solr/licenses/jts-LICENSE-EPL.txt | 277 ++++++++++
solr/licenses/jts-NOTICE.txt | 15 +
solr/licenses/jts-core-1.19.0.jar.sha1 | 1 +
solr/licenses/jts-io-common-1.19.0.jar.sha1 | 1 +
solr/licenses/proj4j-1.1.5.jar.sha1 | 1 +
solr/licenses/proj4j-LICENSE-ASL.txt | 39 ++
solr/licenses/proj4j-NOTICE.txt | 108 ++++
solr/licenses/value-annotations-2.9.2.jar.sha1 | 1 +
...E-ASL.txt => value-annotations-LICENSE-ASL.txt} | 9 +-
solr/licenses/value-annotations-NOTICE.txt | 13 +
solr/modules/sql/build.gradle | 7 +-
.../solr/handler/sql/functions/ArrayContains.java | 3 +-
versions.lock | 49 +-
versions.props | 7 +-
41 files changed, 1072 insertions(+), 71 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index e17b1d1387f..77850a30c50 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -186,6 +186,8 @@ Other Changes
* SOLR-16424: Upgrade Netty to 4.1.82.Final (Kevin Risden)
+* SOLR-16421: Upgrade Apache Calcite to 1.32.0 and Avatica to 1.22.0 (Kevin Risden)
+
Build
---------------------
* SOLR-16204: Change Lucene dependency to Lucene 9.1.0 (Elia Porciani via Alessandro Benedetti)
diff --git a/solr/licenses/apiguardian-api-1.1.0.jar.sha1 b/solr/licenses/apiguardian-api-1.1.0.jar.sha1
deleted file mode 100644
index 317eb80f20e..00000000000
--- a/solr/licenses/apiguardian-api-1.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fc9dff4bb36d627bdc553de77e1f17efd790876c
diff --git a/solr/licenses/apiguardian-api-1.1.2.jar.sha1 b/solr/licenses/apiguardian-api-1.1.2.jar.sha1
new file mode 100644
index 00000000000..4fb58e602aa
--- /dev/null
+++ b/solr/licenses/apiguardian-api-1.1.2.jar.sha1
@@ -0,0 +1 @@
+a231e0d844d2721b0fa1b238006d15c6ded6842a
diff --git a/solr/licenses/avatica-core-LICENSE-ASL.txt b/solr/licenses/avatica-LICENSE-ASL.txt
similarity index 100%
rename from solr/licenses/avatica-core-LICENSE-ASL.txt
rename to solr/licenses/avatica-LICENSE-ASL.txt
diff --git a/solr/licenses/avatica-core-NOTICE.txt b/solr/licenses/avatica-NOTICE.txt
similarity index 100%
copy from solr/licenses/avatica-core-NOTICE.txt
copy to solr/licenses/avatica-NOTICE.txt
diff --git a/solr/licenses/avatica-core-1.18.0.jar.sha1 b/solr/licenses/avatica-core-1.18.0.jar.sha1
deleted file mode 100644
index 2f58f323a50..00000000000
--- a/solr/licenses/avatica-core-1.18.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-20473b293f417358ba48f8391a10927d4f9dbae9
diff --git a/solr/licenses/avatica-core-1.22.0.jar.sha1 b/solr/licenses/avatica-core-1.22.0.jar.sha1
new file mode 100644
index 00000000000..0a92d9b195a
--- /dev/null
+++ b/solr/licenses/avatica-core-1.22.0.jar.sha1
@@ -0,0 +1 @@
+bc9b74c057f16201262e7c3cceb66e9e60e41cb9
diff --git a/solr/licenses/avatica-metrics-1.22.0.jar.sha1 b/solr/licenses/avatica-metrics-1.22.0.jar.sha1
new file mode 100644
index 00000000000..6362d50ec63
--- /dev/null
+++ b/solr/licenses/avatica-metrics-1.22.0.jar.sha1
@@ -0,0 +1 @@
+98a5c7ff9a867796deb6bca268d206b15d09c1e6
diff --git a/solr/licenses/calcite-core-1.27.0.jar.sha1 b/solr/licenses/calcite-core-1.27.0.jar.sha1
deleted file mode 100644
index 738dc64b6ad..00000000000
--- a/solr/licenses/calcite-core-1.27.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-17ab2daa23e28fbd5ac704d03f8d2df693dcf2d3
diff --git a/solr/licenses/calcite-core-1.32.0.jar.sha1 b/solr/licenses/calcite-core-1.32.0.jar.sha1
new file mode 100644
index 00000000000..2dae5723372
--- /dev/null
+++ b/solr/licenses/calcite-core-1.32.0.jar.sha1
@@ -0,0 +1 @@
+984545fa6d4c4d141a6f488d170df55ad1312be1
diff --git a/solr/licenses/calcite-linq4j-1.27.0.jar.sha1 b/solr/licenses/calcite-linq4j-1.27.0.jar.sha1
deleted file mode 100644
index 774ca5c4c05..00000000000
--- a/solr/licenses/calcite-linq4j-1.27.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0cc428cae2b9927f46575a59006dffd6806f8a14
diff --git a/solr/licenses/calcite-linq4j-1.32.0.jar.sha1 b/solr/licenses/calcite-linq4j-1.32.0.jar.sha1
new file mode 100644
index 00000000000..cafde3fca6e
--- /dev/null
+++ b/solr/licenses/calcite-linq4j-1.32.0.jar.sha1
@@ -0,0 +1 @@
+fdf36eb703ed957959efe0ae2f6385bbe9f0d270
diff --git a/solr/licenses/commons-compiler-3.0.11.jar.sha1 b/solr/licenses/commons-compiler-3.0.11.jar.sha1
deleted file mode 100644
index 16ac6e22f92..00000000000
--- a/solr/licenses/commons-compiler-3.0.11.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f2a6ec7fbc929c9fc87ff8bb486c0574951c5b09
diff --git a/solr/licenses/commons-compiler-3.1.8.jar.sha1 b/solr/licenses/commons-compiler-3.1.8.jar.sha1
new file mode 100644
index 00000000000..4b5f44e7699
--- /dev/null
+++ b/solr/licenses/commons-compiler-3.1.8.jar.sha1
@@ -0,0 +1 @@
+93a17483c93f7a5f6ca5c2af7173c9c0841294b2
diff --git a/solr/licenses/esri-geometry-api-2.2.0.jar.sha1 b/solr/licenses/esri-geometry-api-2.2.0.jar.sha1
deleted file mode 100644
index 8c2829f692d..00000000000
--- a/solr/licenses/esri-geometry-api-2.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2663f80d28c2470630a996464d6130b2809c9dbe
diff --git a/solr/licenses/esri-geometry-api-NOTICE.txt b/solr/licenses/esri-geometry-api-NOTICE.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/solr/licenses/httpclient5-5.1.3.jar.sha1 b/solr/licenses/httpclient5-5.1.3.jar.sha1
new file mode 100644
index 00000000000..48f5bb6e6f5
--- /dev/null
+++ b/solr/licenses/httpclient5-5.1.3.jar.sha1
@@ -0,0 +1 @@
+13c984b7b881afcff3a7f0bb95878724a48a4b66
diff --git a/solr/licenses/httpclient5-LICENSE-ASL.txt b/solr/licenses/httpclient5-LICENSE-ASL.txt
new file mode 100644
index 00000000000..32f01eda18f
--- /dev/null
+++ b/solr/licenses/httpclient5-LICENSE-ASL.txt
@@ -0,0 +1,558 @@
+ 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
+
+=========================================================================
+
+This project includes Public Suffix List copied from
+<https://publicsuffix.org/list/effective_tld_names.dat>
+licensed under the terms of the Mozilla Public License, v. 2.0
+
+Full license text: <http://mozilla.org/MPL/2.0/>
+
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+ means each individual or legal entity that creates, contributes to
+ the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+ means the combination of the Contributions of others (if any) used
+ by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+ means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+ means Source Code Form to which the initial Contributor has attached
+ the notice in Exhibit A, the Executable Form of such Source Code
+ Form, and Modifications of such Source Code Form, in each case
+ including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+ means
+
+ (a) that the initial Contributor has attached the notice described
+ in Exhibit B to the Covered Software; or
+
+ (b) that the Covered Software was made available under the terms of
+ version 1.1 or earlier of the License, but not also under the
+ terms of a Secondary License.
+
+1.6. "Executable Form"
+ means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+ means a work that combines Covered Software with other material, in
+ a separate file or files, that is not Covered Software.
+
+1.8. "License"
+ means this document.
+
+1.9. "Licensable"
+ means having the right to grant, to the maximum extent possible,
+ whether at the time of the initial grant or subsequently, any and
+ all of the rights conveyed by this License.
+
+1.10. "Modifications"
+ means any of the following:
+
+ (a) any file in Source Code Form that results from an addition to,
+ deletion from, or modification of the contents of Covered
+ Software; or
+
+ (b) any new file in Source Code Form that contains any Covered
+ Software.
+
+1.11. "Patent Claims" of a Contributor
+ means any patent claim(s), including without limitation, method,
+ process, and apparatus claims, in any patent Licensable by such
+ Contributor that would be infringed, but for the grant of the
+ License, by the making, using, selling, offering for sale, having
+ made, import, or transfer of either its Contributions or its
+ Contributor Version.
+
+1.12. "Secondary License"
+ means either the GNU General Public License, Version 2.0, the GNU
+ Lesser General Public License, Version 2.1, the GNU Affero General
+ Public License, Version 3.0, or any later versions of those
+ licenses.
+
+1.13. "Source Code Form"
+ means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+ means an individual or a legal entity exercising rights under this
+ License. For legal entities, "You" includes any entity that
+ controls, is controlled by, or is under common control with You. For
+ purposes of this definition, "control" means (a) the power, direct
+ or indirect, to cause the direction or management of such entity,
+ whether by contract or otherwise, or (b) ownership of more than
+ fifty percent (50%) of the outstanding shares or beneficial
+ ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+ Licensable by such Contributor to use, reproduce, make available,
+ modify, display, perform, distribute, and otherwise exploit its
+ Contributions, either on an unmodified basis, with Modifications, or
+ as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+ for sale, have made, import, and otherwise transfer either its
+ Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+ or
+
+(b) for infringements caused by: (i) Your and any other third party's
+ modifications of Covered Software, or (ii) the combination of its
+ Contributions with other software (except as part of its Contributor
+ Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+ its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+ Form, as described in Section 3.1, and You must inform recipients of
+ the Executable Form how they can obtain a copy of such Source Code
+ Form by reasonable means in a timely manner, at a charge no more
+ than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+ License, or sublicense it under different terms, provided that the
+ license for the Executable Form does not attempt to limit or alter
+ the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+* *
+* 6. Disclaimer of Warranty *
+* ------------------------- *
+* *
+* Covered Software is provided under this License on an "as is" *
+* basis, without warranty of any kind, either expressed, implied, or *
+* statutory, including, without limitation, warranties that the *
+* Covered Software is free of defects, merchantable, fit for a *
+* particular purpose or non-infringing. The entire risk as to the *
+* quality and performance of the Covered Software is with You. *
+* Should any Covered Software prove defective in any respect, You *
+* (not any Contributor) assume the cost of any necessary servicing, *
+* repair, or correction. This disclaimer of warranty constitutes an *
+* essential part of this License. No use of any Covered Software is *
+* authorized under this License except under this disclaimer. *
+* *
+************************************************************************
+
+************************************************************************
+* *
+* 7. Limitation of Liability *
+* -------------------------- *
+* *
+* Under no circumstances and under no legal theory, whether tort *
+* (including negligence), contract, or otherwise, shall any *
+* Contributor, or anyone who distributes Covered Software as *
+* permitted above, be liable to You for any direct, indirect, *
+* special, incidental, or consequential damages of any character *
+* including, without limitation, damages for lost profits, loss of *
+* goodwill, work stoppage, computer failure or malfunction, or any *
+* and all other commercial damages or losses, even if such party *
+* shall have been informed of the possibility of such damages. This *
+* limitation of liability shall not apply to liability for death or *
+* personal injury resulting from such party's negligence to the *
+* extent applicable law prohibits such limitation. Some *
+* jurisdictions do not allow the exclusion or limitation of *
+* incidental or consequential damages, so this exclusion and *
+* limitation may not apply to You. *
+* *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+ This Source Code Form is "Incompatible With Secondary Licenses", as
+ defined by the Mozilla Public License, v. 2.0.
diff --git a/solr/licenses/avatica-core-NOTICE.txt b/solr/licenses/httpclient5-NOTICE.txt
similarity index 55%
copy from solr/licenses/avatica-core-NOTICE.txt
copy to solr/licenses/httpclient5-NOTICE.txt
index 506738bcae5..afee7c6e688 100644
--- a/solr/licenses/avatica-core-NOTICE.txt
+++ b/solr/licenses/httpclient5-NOTICE.txt
@@ -1,5 +1,6 @@
-Apache Calcite
-Copyright 2012-2016 The Apache Software Foundation
+Apache HttpComponents Client
+Copyright 1999-2022 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+
diff --git a/solr/licenses/httpcore5-5.1.3.jar.sha1 b/solr/licenses/httpcore5-5.1.3.jar.sha1
new file mode 100644
index 00000000000..8416ae8502d
--- /dev/null
+++ b/solr/licenses/httpcore5-5.1.3.jar.sha1
@@ -0,0 +1 @@
+d1638d1e5f2793f187d4144c702a93524ba6fd3b
diff --git a/solr/licenses/esri-geometry-api-LICENSE-ASL.txt b/solr/licenses/httpcore5-LICENSE-ASL.txt
similarity index 89%
copy from solr/licenses/esri-geometry-api-LICENSE-ASL.txt
copy to solr/licenses/httpcore5-LICENSE-ASL.txt
index 7a4a3ea2424..e454a52586f 100644
--- a/solr/licenses/esri-geometry-api-LICENSE-ASL.txt
+++ b/solr/licenses/httpcore5-LICENSE-ASL.txt
@@ -176,27 +176,3 @@
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.
\ No newline at end of file
diff --git a/solr/licenses/avatica-core-NOTICE.txt b/solr/licenses/httpcore5-NOTICE.txt
similarity index 56%
rename from solr/licenses/avatica-core-NOTICE.txt
rename to solr/licenses/httpcore5-NOTICE.txt
index 506738bcae5..26704763874 100644
--- a/solr/licenses/avatica-core-NOTICE.txt
+++ b/solr/licenses/httpcore5-NOTICE.txt
@@ -1,5 +1,5 @@
-Apache Calcite
-Copyright 2012-2016 The Apache Software Foundation
+Apache HttpComponents Core
+Copyright 2005-2022 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/solr/licenses/httpcore5-h2-5.1.3.jar.sha1 b/solr/licenses/httpcore5-h2-5.1.3.jar.sha1
new file mode 100644
index 00000000000..4635cae14f4
--- /dev/null
+++ b/solr/licenses/httpcore5-h2-5.1.3.jar.sha1
@@ -0,0 +1 @@
+4664b59b09f5ee008e37a963bbb92f4068e91696
diff --git a/solr/licenses/janino-3.0.11.jar.sha1 b/solr/licenses/janino-3.0.11.jar.sha1
deleted file mode 100644
index dfbc384051f..00000000000
--- a/solr/licenses/janino-3.0.11.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e699e368095379ba0402ea1780a87fcaea16e68f
diff --git a/solr/licenses/janino-3.1.8.jar.sha1 b/solr/licenses/janino-3.1.8.jar.sha1
new file mode 100644
index 00000000000..09e48c471f2
--- /dev/null
+++ b/solr/licenses/janino-3.1.8.jar.sha1
@@ -0,0 +1 @@
+8dd648976fe0ea36918756b2257b183157d6e543
diff --git a/solr/licenses/json-path-2.4.0.jar.sha1 b/solr/licenses/json-path-2.4.0.jar.sha1
deleted file mode 100644
index 2edbec9053d..00000000000
--- a/solr/licenses/json-path-2.4.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-765a4401ceb2dc8d40553c2075eb80a8fa35c2ae
diff --git a/solr/licenses/json-path-2.7.0.jar.sha1 b/solr/licenses/json-path-2.7.0.jar.sha1
new file mode 100644
index 00000000000..72c09e3b7a0
--- /dev/null
+++ b/solr/licenses/json-path-2.7.0.jar.sha1
@@ -0,0 +1 @@
+f9d7d9659f2694e61142046ff8a216c047f263e8
diff --git a/solr/licenses/jts-LICENSE-EPL.txt b/solr/licenses/jts-LICENSE-EPL.txt
new file mode 100644
index 00000000000..d3087e4c540
--- /dev/null
+++ b/solr/licenses/jts-LICENSE-EPL.txt
@@ -0,0 +1,277 @@
+Eclipse Public License - v 2.0
+
+ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+ PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
+ OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+ a) in the case of the initial Contributor, the initial content
+ Distributed under this Agreement, and
+
+ b) in the case of each subsequent Contributor:
+ i) changes to the Program, and
+ ii) additions to the Program;
+ where such changes and/or additions to the Program originate from
+ and are Distributed by that particular Contributor. A Contribution
+ "originates" from a Contributor if it was added to the Program by
+ such Contributor itself or anyone acting on such Contributor's behalf.
+ Contributions do not include changes or additions to the Program that
+ are not Modified Works.
+
+"Contributor" means any person or entity that Distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which
+are necessarily infringed by the use or sale of its Contribution alone
+or when combined with the Program.
+
+"Program" means the Contributions Distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement
+or any Secondary License (as applicable), including Contributors.
+
+"Derivative Works" shall mean any work, whether in Source Code or other
+form, that is based on (or derived from) the Program and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship.
+
+"Modified Works" shall mean any work in Source Code or other form that
+results from an addition to, deletion from, or modification of the
+contents of the Program, including, for purposes of clarity any new file
+in Source Code form that contains any contents of the Program. Modified
+Works shall not include works that contain only declarations,
+interfaces, types, classes, structures, or files of the Program solely
+in each case in order to link to, bind by name, or subclass the Program
+or Modified Works thereof.
+
+"Distribute" means the acts of a) distributing or b) making available
+in any manner that enables the transfer of a copy.
+
+"Source Code" means the form of a Program preferred for making
+modifications, including but not limited to software source code,
+documentation source, and configuration files.
+
+"Secondary License" means either the GNU General Public License,
+Version 2.0, or any later versions of that license, including any
+exceptions or additional permissions as identified by the initial
+Contributor.
+
+2. GRANT OF RIGHTS
+
+ a) Subject to the terms of this Agreement, each Contributor hereby
+ grants Recipient a non-exclusive, worldwide, royalty-free copyright
+ license to reproduce, prepare Derivative Works of, publicly display,
+ publicly perform, Distribute and sublicense the Contribution of such
+ Contributor, if any, and such Derivative Works.
+
+ b) Subject to the terms of this Agreement, each Contributor hereby
+ grants Recipient a non-exclusive, worldwide, royalty-free patent
+ license under Licensed Patents to make, use, sell, offer to sell,
+ import and otherwise transfer the Contribution of such Contributor,
+ if any, in Source Code or other form. This patent license shall
+ apply to the combination of the Contribution and the Program if, at
+ the time the Contribution is added by the Contributor, such addition
+ of the Contribution causes such combination to be covered by the
+ Licensed Patents. The patent license shall not apply to any other
+ combinations which include the Contribution. No hardware per se is
+ licensed hereunder.
+
+ c) Recipient understands that although each Contributor grants the
+ licenses to its Contributions set forth herein, no assurances are
+ provided by any Contributor that the Program does not infringe the
+ patent or other intellectual property rights of any other entity.
+ Each Contributor disclaims any liability to Recipient for claims
+ brought by any other entity based on infringement of intellectual
+ property rights or otherwise. As a condition to exercising the
+ rights and licenses granted hereunder, each Recipient hereby
+ assumes sole responsibility to secure any other intellectual
+ property rights needed, if any. For example, if a third party
+ patent license is required to allow Recipient to Distribute the
+ Program, it is Recipient's responsibility to acquire that license
+ before distributing the Program.
+
+ d) Each Contributor represents that to its knowledge it has
+ sufficient copyright rights in its Contribution, if any, to grant
+ the copyright license set forth in this Agreement.
+
+ e) Notwithstanding the terms of any Secondary License, no
+ Contributor makes additional grants to any Recipient (other than
+ those set forth in this Agreement) as a result of such Recipient's
+ receipt of the Program under the terms of a Secondary License
+ (if permitted under the terms of Section 3).
+
+3. REQUIREMENTS
+
+3.1 If a Contributor Distributes the Program in any form, then:
+
+ a) the Program must also be made available as Source Code, in
+ accordance with section 3.2, and the Contributor must accompany
+ the Program with a statement that the Source Code for the Program
+ is available under this Agreement, and informs Recipients how to
+ obtain it in a reasonable manner on or through a medium customarily
+ used for software exchange; and
+
+ b) the Contributor may Distribute the Program under a license
+ different than this Agreement, provided that such license:
+ i) effectively disclaims on behalf of all other Contributors all
+ warranties and conditions, express and implied, including
+ warranties or conditions of title and non-infringement, and
+ implied warranties or conditions of merchantability and fitness
+ for a particular purpose;
+
+ ii) effectively excludes on behalf of all other Contributors all
+ liability for damages, including direct, indirect, special,
+ incidental and consequential damages, such as lost profits;
+
+ iii) does not attempt to limit or alter the recipients' rights
+ in the Source Code under section 3.2; and
+
+ iv) requires any subsequent distribution of the Program by any
+ party to be under a license that satisfies the requirements
+ of this section 3.
+
+3.2 When the Program is Distributed as Source Code:
+
+ a) it must be made available under this Agreement, or if the
+ Program (i) is combined with other material in a separate file or
+ files made available under a Secondary License, and (ii) the initial
+ Contributor attached to the Source Code the notice described in
+ Exhibit A of this Agreement, then the Program may be made available
+ under the terms of such Secondary Licenses, and
+
+ b) a copy of this Agreement must be included with each copy of
+ the Program.
+
+3.3 Contributors may not remove or alter any copyright, patent,
+trademark, attribution notices, disclaimers of warranty, or limitations
+of liability ("notices") contained within the Program from any copy of
+the Program which they Distribute, provided that Contributors may add
+their own appropriate notices.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities
+with respect to end users, business partners and the like. While this
+license is intended to facilitate the commercial use of the Program,
+the Contributor who includes the Program in a commercial product
+offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes
+the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and indemnify every
+other Contributor ("Indemnified Contributor") against any losses,
+damages and costs (collectively "Losses") arising from claims, lawsuits
+and other legal actions brought by a third party against the Indemnified
+Contributor to the extent caused by the acts or omissions of such
+Commercial Contributor in connection with its distribution of the Program
+in a commercial product offering. The obligations in this section do not
+apply to any claims or Losses relating to any actual or alleged
+intellectual property infringement. In order to qualify, an Indemnified
+Contributor must: a) promptly notify the Commercial Contributor in
+writing of such claim, and b) allow the Commercial Contributor to control,
+and cooperate with the Commercial Contributor in, the defense and any
+related settlement negotiations. The Indemnified Contributor may
+participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those performance
+claims and warranties, and if a court requires any other Contributor to
+pay any damages as a result, the Commercial Contributor must pay
+those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED 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. Each Recipient is solely responsible for determining the
+appropriateness of using and distributing the Program and assumes all
+risks associated with its exercise of rights under this Agreement,
+including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs
+or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
+SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further
+action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other software
+or hardware) infringes such Recipient's patent(s), then such Recipient's
+rights granted under Section 2(b) shall terminate as of the date such
+litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of
+time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use
+and distribution of the Program as soon as reasonably practicable.
+However, Recipient's obligations under this Agreement and any licenses
+granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement,
+but in order to avoid inconsistency the Agreement is copyrighted and
+may only be modified in the following manner. The Agreement Steward
+reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement
+Steward has the right to modify this Agreement. The Eclipse Foundation
+is the initial Agreement Steward. The Eclipse Foundation may assign the
+responsibility to serve as the Agreement Steward to a suitable separate
+entity. Each new version of the Agreement will be given a distinguishing
+version number. The Program (including Contributions) may always be
+Distributed subject to the version of the Agreement under which it was
+received. In addition, after a new version of the Agreement is published,
+Contributor may elect to Distribute the Program (including its
+Contributions) under the new version.
+
+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+receives no rights or licenses to the intellectual property of any
+Contributor under this Agreement, whether expressly, by implication,
+estoppel or otherwise. All rights in the Program not expressly granted
+under this Agreement are reserved. Nothing in this Agreement is intended
+to be enforceable by any entity that is not a Contributor or Recipient.
+No third-party beneficiary rights are created under this Agreement.
+
+Exhibit A - Form of Secondary Licenses Notice
+
+"This Source Code may also be made available under the following
+Secondary Licenses when the conditions for such availability set forth
+in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+version(s), and exceptions or additional permissions here}."
+
+ Simply including a copy of this Agreement, including this Exhibit A
+ is not sufficient to license the Source Code under Secondary Licenses.
+
+ If it is not possible or desirable to put the notice in a particular
+ file, then You may include the notice in a location (such as a LICENSE
+ file in a relevant directory) where a recipient would be likely to
+ look for such a notice.
+
+ You may add additional accurate notices of copyright ownership.
diff --git a/solr/licenses/jts-NOTICE.txt b/solr/licenses/jts-NOTICE.txt
new file mode 100644
index 00000000000..cc57f7696d2
--- /dev/null
+++ b/solr/licenses/jts-NOTICE.txt
@@ -0,0 +1,15 @@
+JTS Topology Suite Licensing
+May 30th, 2017
+
+Project Licenses
+The Eclipse Foundation makes available all content in this project ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of either the Eclipse Public License 2.0 ("EPL") or the Eclipse Distribution License 1.0 (a BSD Style License). For purposes of the EPL, "Program" will mean the Content.
+
+If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source [...]
+
+Third Party Content
+The Content includes items that have been sourced from third parties as set out below. If you did not receive this Content directly from the Eclipse Foundation, the following is provided for informational purposes only, and you should look to the Redistributor's license for terms and conditions of use.
+
+GeoTools
+JTS includes some code from the GeoTools project. This code has been licensed to the JTS project under the OSGeo BSD License [2] by the GeoTools PSC [3,4].
+
+[2] https://www.osgeo.org/sites/osgeo.org/files/Page/osgeo-bsd-license.txt [3] https://github.com/geotools/geotools/wiki/JTS-ORA-Contribution [4] https://github.com/geotools/geotools/wiki/JTS-Shapefile-Contribution
diff --git a/solr/licenses/jts-core-1.19.0.jar.sha1 b/solr/licenses/jts-core-1.19.0.jar.sha1
new file mode 100644
index 00000000000..ba3c3effe97
--- /dev/null
+++ b/solr/licenses/jts-core-1.19.0.jar.sha1
@@ -0,0 +1 @@
+3ff3baa0074445384f9e0068df81fbd0a168395a
diff --git a/solr/licenses/jts-io-common-1.19.0.jar.sha1 b/solr/licenses/jts-io-common-1.19.0.jar.sha1
new file mode 100644
index 00000000000..29c9bd5edbb
--- /dev/null
+++ b/solr/licenses/jts-io-common-1.19.0.jar.sha1
@@ -0,0 +1 @@
+4c7018119aeb66335746e6748456c821e304d3a2
diff --git a/solr/licenses/proj4j-1.1.5.jar.sha1 b/solr/licenses/proj4j-1.1.5.jar.sha1
new file mode 100644
index 00000000000..1509048b44e
--- /dev/null
+++ b/solr/licenses/proj4j-1.1.5.jar.sha1
@@ -0,0 +1 @@
+a494a0e5e85eac03c0d5d0f95ed0eee4f520fb58
diff --git a/solr/licenses/proj4j-LICENSE-ASL.txt b/solr/licenses/proj4j-LICENSE-ASL.txt
new file mode 100644
index 00000000000..6c16d67fb2f
--- /dev/null
+++ b/solr/licenses/proj4j-LICENSE-ASL.txt
@@ -0,0 +1,39 @@
+This software is licensed under the Apache 2 license, quoted below.
+
+Copyright 2011-2016 Azavea [http://www.azavea.com]
+
+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 software uses code from proj.4 [https://github.com/osgeo/proj.4],
+which is distributed under the MIT license:
+
+Copyright (c) 2000, Frank Warmerdam
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff --git a/solr/licenses/proj4j-NOTICE.txt b/solr/licenses/proj4j-NOTICE.txt
new file mode 100644
index 00000000000..82a2bb39700
--- /dev/null
+++ b/solr/licenses/proj4j-NOTICE.txt
@@ -0,0 +1,108 @@
+## Eclipse Foundation Software User Agreement
+
+April 9, 2014
+
+### Usage Of Content
+
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE
+PROJECTS (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR
+THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE
+THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT
+AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY
+NOT USE THE CONTENT.
+
+### Applicable Licenses
+
+Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and
+conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this Content and is
+also available at [http://www.eclipse.org/legal/epl-v10.html](http://www.eclipse.org/legal/epl-v10.html). For purposes
+of the EPL, "Program" will mean the Content.
+
+Content includes, but is not limited to, source code, object code, documentation and other files maintained in the
+Eclipse Foundation source code repository ("Repository") in software modules ("Modules") and made available as
+downloadable archives ("Downloads").
+
+* Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.
+ Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
+* Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
+* A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged
+ as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list
+ of the names and version numbers of the Plug-ins and/or Fragments associated with that Feature.
+* Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may
+ contain a list of the names and version numbers of Included Features.
+
+The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts").
+The terms and conditions governing Features and Included Features should be contained in files named "license.html"
+("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but
+not limited to the following locations:
+
+* The top-level (root) directory
+* Plug-in and Fragment directories
+* Inside Plug-ins and Fragments packaged as JARs
+* Sub-directories of the directory named "src" of certain Plug-ins
+* Feature directories
+
+Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined
+below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains
+Included Features, the Feature Update License should either provide you with the terms and conditions governing the
+Included Features or inform you where you can locate them. Feature Update Licenses may be found in the "license"
+property of files named "feature.properties" found within a Feature. Such Abouts, Feature Licenses, and Feature Update
+Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the
+associated Content in that directory.
+
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR
+TERMS AND CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
+
+* Eclipse Distribution License Version 1.0 (available at
+ [http://www.eclipse.org/licenses/edl-v1.0.html](http://www.eclipse.org/licenses/edl-v10.html))
+* Common Public License Version 1.0 (available at
+ [http://www.eclipse.org/legal/cpl-v10.html](http://www.eclipse.org/legal/cpl-v10.html))
+* Apache Software License 1.1 (available at
+ [http://www.apache.org/licenses/LICENSE](http://www.apache.org/licenses/LICENSE))
+* Apache Software License 2.0 (available at
+ [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0))
+* Mozilla Public License Version 1.1 (available at
+ [http://www.mozilla.org/MPL/MPL-1.1.html](http://www.mozilla.org/MPL/MPL-1.1.html))
+
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature
+License, or Feature Update License is provided, please contact the Eclipse Foundation to determine what terms and
+conditions govern that particular Content.
+
+### Use of Provisioning Technology
+
+The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and
+the Eclipse Update Manager ("Provisioning Technology") for the purpose of allowing users to install software,
+documentation, information and/or other materials (collectively "Installable Software"). This capability is provided
+with the intent of allowing such users to install, extend and update Eclipse-based products. Information about packaging
+Installable Software is available at
+[http://eclipse.org/equinox/p2/repository_packaging.html](http://eclipse.org/equinox/p2/repository_packaging.html)
+("Specification").
+
+You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for
+enabling the applicable license agreements relating to the Installable Software to be presented to, and accepted by, the
+users of the Provisioning Technology in accordance with the Specification. By using Provisioning Technology in such a
+manner and making it available in accordance with the Specification, you further acknowledge your agreement to, and the
+acquisition of all necessary rights to permit the following:
+
+1. A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology on a
+ machine ("Target Machine") with the intent of installing, extending or updating the functionality of an
+ Eclipse-based product.
+2. During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion
+ thereof to be accessed and copied to the Target Machine.
+3. Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the
+ Installable Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed
+ from the Target Machine in accordance with the Specification. Such Installable Software Agreement must inform the
+ user of the terms and conditions that govern the Installable Software and must solicit acceptance by the end user in
+ the manner prescribed in such Installable Software Agreement. Upon such indication of agreement by the user, the
+ provisioning Technology will complete installation of the Installable Software.
+
+### Cryptography
+
+Content may contain encryption software. The country in which you are currently may have restrictions on the import,
+possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software,
+please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of
+encryption software, to see if this is permitted.
+
+<small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries,
+or both.</small>
diff --git a/solr/licenses/value-annotations-2.9.2.jar.sha1 b/solr/licenses/value-annotations-2.9.2.jar.sha1
new file mode 100644
index 00000000000..a689dce6a90
--- /dev/null
+++ b/solr/licenses/value-annotations-2.9.2.jar.sha1
@@ -0,0 +1 @@
+e2983908ee1d400c73447b6fda9cf3c9fce342bc
diff --git a/solr/licenses/esri-geometry-api-LICENSE-ASL.txt b/solr/licenses/value-annotations-LICENSE-ASL.txt
similarity index 98%
rename from solr/licenses/esri-geometry-api-LICENSE-ASL.txt
rename to solr/licenses/value-annotations-LICENSE-ASL.txt
index 7a4a3ea2424..5c304d1a4a7 100644
--- a/solr/licenses/esri-geometry-api-LICENSE-ASL.txt
+++ b/solr/licenses/value-annotations-LICENSE-ASL.txt
@@ -1,5 +1,4 @@
-
- Apache License
+Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -179,7 +178,7 @@
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 "[]"
+ 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
@@ -187,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.
- Copyright [yyyy] [name of copyright owner]
+ 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.
@@ -199,4 +198,4 @@
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.
\ No newline at end of file
+ limitations under the License.
diff --git a/solr/licenses/value-annotations-NOTICE.txt b/solr/licenses/value-annotations-NOTICE.txt
new file mode 100644
index 00000000000..c0d6d164fec
--- /dev/null
+++ b/solr/licenses/value-annotations-NOTICE.txt
@@ -0,0 +1,13 @@
+Copyright 2013-2021 Immutables Authors and Contributors
+
+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/modules/sql/build.gradle b/solr/modules/sql/build.gradle
index 7b0bc20c253..4cbfe402eb5 100644
--- a/solr/modules/sql/build.gradle
+++ b/solr/modules/sql/build.gradle
@@ -30,8 +30,6 @@ dependencies {
// SQL Parser via Calcite
implementation ('org.apache.calcite:calcite-core', {
- exclude group: 'org.apache.calcite.avatica', module: 'avatica-metrics'
- exclude group: 'com.google.guava', module: 'guava' // TODO remove this to keep versions in sync
exclude group: 'com.fasterxml.jackson.dataformat', module: 'jackson-dataformat-yaml'
exclude group: 'com.google.uzaygezen', module: 'uzaygezen-core'
exclude group: 'com.yahoo.datasketches', module: 'sketches-core'
@@ -39,9 +37,10 @@ dependencies {
exclude group: 'net.minidev', module: 'json-smart'
exclude group: 'net.hydromatic', module: 'aggdesigner-algorithm'
})
+ compileOnly 'org.immutables:value-annotations' // needed due to Calcite requiring this CALCITE-4787
// sub-deps of calcite-core that we reference directly
- implementation ('org.apache.calcite:calcite-linq4j') { transitive = false }
- implementation ('org.apache.calcite.avatica:avatica-core') { transitive = false }
+ implementation 'org.apache.calcite:calcite-linq4j'
+ implementation 'org.apache.calcite.avatica:avatica-core'
permitUnusedDeclared 'org.apache.calcite.avatica:avatica-core'
testImplementation project(':solr:test-framework')
diff --git a/solr/modules/sql/src/java/org/apache/solr/handler/sql/functions/ArrayContains.java b/solr/modules/sql/src/java/org/apache/solr/handler/sql/functions/ArrayContains.java
index deb0ecf05a2..3d2f47c834d 100644
--- a/solr/modules/sql/src/java/org/apache/solr/handler/sql/functions/ArrayContains.java
+++ b/solr/modules/sql/src/java/org/apache/solr/handler/sql/functions/ArrayContains.java
@@ -17,7 +17,6 @@
package org.apache.solr.handler.sql.functions;
-import java.util.Arrays;
import java.util.List;
import org.apache.calcite.rel.type.RelDataType;
import org.apache.calcite.sql.SqlBasicCall;
@@ -61,7 +60,7 @@ public abstract class ArrayContains extends SqlFunction {
} else if (operand2.getKind() == SqlKind.ROW) {
SqlBasicCall valuesCall = (SqlBasicCall) operand2;
boolean literalMatch =
- Arrays.stream(valuesCall.getOperands()).allMatch(op -> op.getKind() == SqlKind.LITERAL);
+ valuesCall.getOperandList().stream().allMatch(op -> op.getKind() == SqlKind.LITERAL);
if (literalMatch) {
return true;
}
diff --git a/versions.lock b/versions.lock
index 8ae09e77a13..360c6fe9cfa 100644
--- a/versions.lock
+++ b/versions.lock
@@ -5,11 +5,10 @@ com.carrotsearch:hppc:0.9.1 (2 constraints: ad0fc9a6)
com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1 (2 constraints: ce1500e2)
com.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e)
com.epam:parso:2.0.14 (1 constraints: 8e0c750e)
-com.esri.geometry:esri-geometry-api:2.2.0 (1 constraints: 5c0db22c)
com.fasterxml.jackson:jackson-bom:2.13.3 (11 constraints: e1de7271)
-com.fasterxml.jackson.core:jackson-annotations:2.13.3 (8 constraints: 3d8f1f41)
-com.fasterxml.jackson.core:jackson-core:2.13.3 (13 constraints: 0df8f78d)
-com.fasterxml.jackson.core:jackson-databind:2.13.3 (16 constraints: 5c33baf6)
+com.fasterxml.jackson.core:jackson-annotations:2.13.3 (8 constraints: 428fdd42)
+com.fasterxml.jackson.core:jackson-core:2.13.3 (12 constraints: c3e84d61)
+com.fasterxml.jackson.core:jackson-databind:2.13.3 (16 constraints: c0335d1a)
com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.13.3 (1 constraints: b90ea666)
com.fasterxml.woodstox:woodstox-core:6.2.8 (3 constraints: ba28f6ba)
com.github.ben-manes.caffeine:caffeine:3.1.1 (1 constraints: 0705fe35)
@@ -34,9 +33,9 @@ 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: de586bc0)
-com.google.errorprone:error_prone_annotations:2.15.0 (4 constraints: 5e3861e5)
+com.google.errorprone:error_prone_annotations:2.15.0 (4 constraints: 8a38f11d)
com.google.guava:failureaccess:1.0.1 (2 constraints: f9199e37)
-com.google.guava:guava:31.1-jre (17 constraints: 7c0afe78)
+com.google.guava:guava:31.1-jre (19 constraints: 5d28985f)
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)
@@ -45,16 +44,16 @@ 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.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.4 (9 constraints: ff82c80a)
+com.google.protobuf:protobuf-java:3.21.4 (9 constraints: 3183ce88)
com.google.protobuf:protobuf-java-util:3.21.4 (3 constraints: 332b642b)
com.google.re2j:re2j:1.2 (1 constraints: a7041c2c)
-com.googlecode.json-simple:json-simple:1.1.1 (1 constraints: 5a0ce501)
+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)
com.healthmarketscience.jackcess:jackcess:4.0.1 (1 constraints: 5c0cf101)
com.healthmarketscience.jackcess:jackcess-encrypt:4.0.1 (1 constraints: 5c0cf101)
com.ibm.icu:icu4j:70.1 (1 constraints: a90f1784)
-com.jayway.jsonpath:json-path:2.4.0 (2 constraints: 6512e02b)
+com.jayway.jsonpath:json-path:2.7.0 (2 constraints: 6b126a2c)
com.lmax:disruptor:3.4.2 (1 constraints: 0b050836)
com.mchange:c3p0:0.9.5.5 (1 constraints: c80c571b)
com.mchange:mchange-commons-java:0.2.19 (1 constraints: 84075b75)
@@ -66,9 +65,9 @@ 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 (7 constraints: b1547bc3)
+commons-codec:commons-codec:1.15 (8 constraints: bd67e40b)
commons-collections:commons-collections:3.2.2 (1 constraints: 09050236)
-commons-io:commons-io:2.11.0 (8 constraints: 5e57db7e)
+commons-io:commons-io:2.11.0 (8 constraints: ea57002a)
de.l3s.boilerpipe:boilerpipe:1.1.0 (1 constraints: 590ce401)
edu.ucar:cdm:4.5.5 (3 constraints: 9d1abd7d)
edu.ucar:grib:4.5.5 (1 constraints: 650c0402)
@@ -116,9 +115,10 @@ net.sf.jopt-simple:jopt-simple:4.6 (1 constraints: 610a91b7)
net.sourceforge.argparse4j:argparse4j:0.8.1 (1 constraints: 0b050436)
net.thisptr:jackson-jq:0.0.8 (1 constraints: 0a05f335)
org.antlr:antlr4-runtime:4.5.1-1 (1 constraints: 2810eea6)
-org.apache.calcite:calcite-core:1.27.0 (1 constraints: 3c05423b)
-org.apache.calcite:calcite-linq4j:1.27.0 (2 constraints: cd12134c)
-org.apache.calcite.avatica:avatica-core:1.18.0 (3 constraints: 0721eacd)
+org.apache.calcite:calcite-core:1.32.0 (1 constraints: 3805373b)
+org.apache.calcite:calcite-linq4j:1.32.0 (2 constraints: c512594b)
+org.apache.calcite.avatica:avatica-core:1.22.0 (3 constraints: f82045cb)
+org.apache.calcite.avatica:avatica-metrics:1.22.0 (1 constraints: 981046c4)
org.apache.commons:commons-collections4:4.4 (3 constraints: 2a172a57)
org.apache.commons:commons-compress:1.21 (3 constraints: 9d1b16ae)
org.apache.commons:commons-configuration2:2.8.0 (1 constraints: 0c050d36)
@@ -136,9 +136,12 @@ org.apache.hadoop:hadoop-client-api:3.3.2 (3 constraints: 1928ac5e)
org.apache.hadoop:hadoop-client-runtime:3.3.2 (2 constraints: 67170443)
org.apache.hadoop:hadoop-common:3.3.2 (1 constraints: 0a050536)
org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.1.1 (1 constraints: 0505f435)
-org.apache.httpcomponents:httpclient:4.5.13 (10 constraints: d1907cfc)
-org.apache.httpcomponents:httpcore:4.4.15 (9 constraints: b87d9f84)
+org.apache.httpcomponents:httpclient:4.5.13 (9 constraints: 5d801b3e)
+org.apache.httpcomponents:httpcore:4.4.15 (8 constraints: 1c6d2913)
org.apache.httpcomponents:httpmime:4.5.13 (3 constraints: ea1bb9dc)
+org.apache.httpcomponents.client5:httpclient5:5.1.3 (1 constraints: 6c10bcb3)
+org.apache.httpcomponents.core5:httpcore5:5.1.3 (3 constraints: ff35b9e8)
+org.apache.httpcomponents.core5:httpcore5-h2:5.1.3 (1 constraints: 3d13093c)
org.apache.james:apache-mime4j-core:0.8.4 (2 constraints: 981a0d67)
org.apache.james:apache-mime4j-dom:0.8.4 (1 constraints: 630cf801)
org.apache.kerby:kerb-core:1.0.1 (5 constraints: 683677dd)
@@ -204,7 +207,7 @@ org.apache.tika:tika-parsers:1.28.4 (1 constraints: 4105493b)
org.apache.xmlbeans:xmlbeans:5.0.3 (2 constraints: 72173075)
org.apache.zookeeper:zookeeper:3.7.0 (2 constraints: 9e13f45e)
org.apache.zookeeper:zookeeper-jute:3.7.0 (2 constraints: 95120523)
-org.apiguardian:apiguardian-api:1.1.0 (2 constraints: 5c1b7da8)
+org.apiguardian:apiguardian-api:1.1.2 (2 constraints: 601bd5a8)
org.bitbucket.b_c:jose4j:0.7.9 (1 constraints: 12050936)
org.bouncycastle:bcmail-jdk15on:1.70 (1 constraints: 310c8af5)
org.bouncycastle:bcpkix-jdk15on:1.70 (2 constraints: ce1b11b3)
@@ -216,9 +219,9 @@ 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.23.0 (5 constraints: 4e46d4e7)
-org.codehaus.janino:commons-compiler:3.0.11 (2 constraints: 81192719)
-org.codehaus.janino:janino:3.0.11 (1 constraints: 8d0d3f3a)
+org.checkerframework:checker-qual:3.23.0 (5 constraints: 524636e8)
+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.eclipse.jetty:jetty-alpn-client:9.4.48.v20220622 (2 constraints: 5025331d)
@@ -251,10 +254,14 @@ org.glassfish.jaxb:jaxb-runtime:2.3.5 (1 constraints: 610cf401)
org.glassfish.jaxb:txw2:2.3.5 (1 constraints: bf0db735)
org.hamcrest:hamcrest:2.2 (3 constraints: 7620ce25)
org.hamcrest:hamcrest-core:2.2 (1 constraints: cc05fe3f)
+org.immutables:value-annotations:2.9.2 (1 constraints: 0f051236)
org.itadaki:bzip2:0.9.1 (2 constraints: bd0c4b2c)
org.jctools:jctools-core:3.3.0 (1 constraints: 08050336)
org.jdom:jdom2:2.0.6.1 (1 constraints: be0c371b)
org.junit:junit-bom:5.9.0 (1 constraints: c7116dde)
+org.locationtech.jts:jts-core:1.19.0 (2 constraints: a31de760)
+org.locationtech.jts.io:jts-io-common:1.19.0 (1 constraints: 930d513a)
+org.locationtech.proj4j:proj4j:1.1.5 (1 constraints: 5f0daf2c)
org.locationtech.spatial4j:spatial4j:0.8 (1 constraints: 59105498)
org.opengis:geoapi:3.0.1 (7 constraints: 1361d046)
org.openjdk.jmh:jmh-core:1.32 (1 constraints: da04f730)
@@ -266,7 +273,7 @@ org.quicktheories:quicktheories:0.26 (1 constraints: dc04f530)
org.reactivestreams:reactive-streams:1.0.3 (3 constraints: 3c2b02fd)
org.slf4j:jcl-over-slf4j:1.7.36 (3 constraints: 05188eb8)
org.slf4j:jul-to-slf4j:1.7.36 (3 constraints: 5928c263)
-org.slf4j:slf4j-api:1.7.36 (38 constraints: a3d39dcb)
+org.slf4j:slf4j-api:1.7.36 (40 constraints: 02f92fa3)
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)
diff --git a/versions.props b/versions.props
index 497a7bb5dc5..0e2e3a0d5c6 100644
--- a/versions.props
+++ b/versions.props
@@ -11,7 +11,7 @@ com.google.cloud:google-cloud-bom=0.178.0
com.google.errorprone:*=2.15.0
com.google.guava:guava=31.1-jre
com.google.re2j:re2j=1.2
-com.jayway.jsonpath:json-path=2.4.0
+com.jayway.jsonpath:json-path=2.7.0
com.lmax:disruptor=3.4.2
com.tdunning:t-digest=3.1
commons-cli:commons-cli=1.4
@@ -31,8 +31,8 @@ net.bytebuddy:byte-buddy=1.9.3
net.sourceforge.argparse4j:argparse4j=0.8.1
net.thisptr:jackson-jq=0.0.8
no.nav.security:mock-oauth2-server=0.4.3
-org.apache.calcite.avatica:avatica-core=1.18.0
-org.apache.calcite:*=1.27.0
+org.apache.calcite.avatica:avatica-core=1.22.0
+org.apache.calcite:*=1.32.0
org.apache.commons:commons-collections4=4.4
org.apache.commons:commons-compress=1.21
org.apache.commons:commons-configuration2=2.8.0
@@ -58,6 +58,7 @@ org.codehaus.woodstox:stax2-api=4.2.1
org.eclipse.jetty*:*=9.4.48.v20220622
org.hamcrest:*=2.2
org.hsqldb:hsqldb=2.4.0
+org.immutables:value-annotations=2.9.2
org.jctools:jctools-core=3.3.0
org.mockito:mockito-core=3.8.0
org.openjdk.jmh:*=1.32