Apache Solr open-source search software
SOLR-15461: Upgrade Apache Calcite to latest release. (#177)
Mark Robert Millere89593cfca11
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 7a56e32da33..3c9269fe750 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -335,6 +335,8 @@ Other Changescollections/collectionName into its state.json. For many-collection clusters, this is anoptimization when the cluster status is fetched. (Nazerke Seidan, David Smiley)+* SOLR-15461: SOLR-15461: Upgrade Apache Calcite to 1.27.0. (Mark Miller, Timothy Potter)+Bug Fixes---------------------* SOLR-14546: Fix for a relatively hard to hit issue in OverseerTaskProcessor that could lead to out of order executiondiff --git a/solr/core/build.gradle b/solr/core/build.gradleindex 0201665d22f..14f96e58b82 100644--- a/solr/core/build.gradle+++ b/solr/core/build.gradle@@ -102,6 +102,9 @@ dependencies {implementation ('org.apache.calcite.avatica:avatica-core') { transitive = false }implementation ('org.apache.calcite:calcite-core') { transitive = false }+ implementation ('org.checkerframework:checker-qual') { transitive = false }+ implementation ('com.esri.geometry:esri-geometry-api') { transitive = false }+ implementation ('org.apiguardian:apiguardian-api') { transitive = false }implementation ('org.apache.calcite:calcite-linq4j') { transitive = false }implementation ('org.apache.curator:curator-client') { transitive = false }implementation ('org.apache.curator:curator-framework') { transitive = false }diff --git a/solr/core/src/java/org/apache/solr/handler/sql/SolrAggregate.java b/solr/core/src/java/org/apache/solr/handler/sql/SolrAggregate.javaindex 3d6215d2b99..6ae02e084e1 100644--- a/solr/core/src/java/org/apache/solr/handler/sql/SolrAggregate.java+++ b/solr/core/src/java/org/apache/solr/handler/sql/SolrAggregate.java@@ -21,6 +21,7 @@ import org.apache.calcite.plan.RelTraitSet;import org.apache.calcite.rel.RelNode;import org.apache.calcite.rel.core.Aggregate;import org.apache.calcite.rel.core.AggregateCall;+import org.apache.calcite.rel.hint.RelHint;import org.apache.calcite.sql.SqlAggFunction;import org.apache.calcite.sql.fun.SqlStdOperatorTable;import org.apache.calcite.util.ImmutableBitSet;@@ -44,21 +45,27 @@ class SolrAggregate extends Aggregate implements SolrRel {SolrAggregate(RelOptCluster cluster,RelTraitSet traitSet,+ List<RelHint> hints,RelNode child,- boolean indicator,ImmutableBitSet groupSet,List<ImmutableBitSet> groupSets,List<AggregateCall> aggCalls) {- super(cluster, traitSet, child, indicator, groupSet, groupSets, aggCalls);+ super(cluster, traitSet, hints, child, groupSet, groupSets, aggCalls);assert getConvention() == SolrRel.CONVENTION;assert getConvention() == child.getConvention();}+ @Override+ public Aggregate copy(RelTraitSet traitSet, RelNode input, ImmutableBitSet groupSet, List<ImmutableBitSet> groupSets,+ List<AggregateCall> aggCalls) {+ return new SolrAggregate(getCluster(), traitSet, hints,input, groupSet, groupSets, aggCalls);+ }+@Overridepublic Aggregate copy(RelTraitSet traitSet, RelNode input,boolean indicator, ImmutableBitSet groupSet,List<ImmutableBitSet> groupSets, List<AggregateCall> aggCalls) {- return new SolrAggregate(getCluster(), traitSet, input, indicator, groupSet, groupSets, aggCalls);+ return new SolrAggregate(getCluster(), traitSet, hints, input, groupSet, groupSets, aggCalls);}public void implement(Implementor implementor) {diff --git a/solr/core/src/java/org/apache/solr/handler/sql/SolrFilter.java b/solr/core/src/java/org/apache/solr/handler/sql/SolrFilter.javaindex a04cdaca2de..1c01b21ef3e 100644--- a/solr/core/src/java/org/apache/solr/handler/sql/SolrFilter.java+++ b/solr/core/src/java/org/apache/solr/handler/sql/SolrFilter.java@@ -16,6 +16,7 @@*/package org.apache.solr.handler.sql;+import java.lang.invoke.MethodHandles;import java.time.Instant;import java.util.ArrayList;import java.util.List;@@ -30,20 +31,22 @@ import org.apache.calcite.plan.RelTraitSet;import org.apache.calcite.rel.RelNode;import org.apache.calcite.rel.core.Filter;import org.apache.calcite.rel.metadata.RelMetadataQuery;-import org.apache.calcite.rex.RexCall;-import org.apache.calcite.rex.RexInputRef;-import org.apache.calcite.rex.RexLiteral;-import org.apache.calcite.rex.RexNode;+import org.apache.calcite.rex.*;import org.apache.calcite.sql.SqlKind;import org.apache.calcite.sql.type.SqlTypeName;import org.apache.calcite.util.Pair;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;/*** Implementation of a {@link org.apache.calcite.rel.core.Filter} relational expression in Solr.*/class SolrFilter extends Filter implements SolrRel {+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());+private static final Pattern CALCITE_TIMESTAMP_REGEX = Pattern.compile("^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}$");+ private final RexBuilder builder;SolrFilter(RelOptCluster cluster,@@ -53,6 +56,7 @@ class SolrFilter extends Filter implements SolrRel {super(cluster, traitSet, child, condition);assert getConvention() == SolrRel.CONVENTION;assert getConvention() == child.getConvention();+ builder = child.getCluster().getRexBuilder();}@Override@@ -67,11 +71,11 @@ class SolrFilter extends Filter implements SolrRel {public void implement(Implementor implementor) {implementor.visitChild(0, getInput());if (getInput() instanceof SolrAggregate) {- HavingTranslator translator = new HavingTranslator(SolrRules.solrFieldNames(getRowType()), implementor.reverseAggMappings);+ HavingTranslator translator = new HavingTranslator(SolrRules.solrFieldNames(getRowType()), implementor.reverseAggMappings, builder);String havingPredicate = translator.translateMatch(condition);implementor.setHavingPredicate(havingPredicate);} else {- Translator translator = new Translator(SolrRules.solrFieldNames(getRowType()));+ Translator translator = new Translator(SolrRules.solrFieldNames(getRowType()), builder);String query = translator.translateMatch(condition);implementor.addQuery(query);implementor.setNegativeQuery(translator.negativeQuery);@@ -81,14 +85,26 @@ class SolrFilter extends Filter implements SolrRel {private static class Translator {protected final List<String> fieldNames;+ private final RexBuilder builder;public boolean negativeQuery = true;- Translator(List<String> fieldNames) {+ Translator(List<String> fieldNames, RexBuilder builder) {this.fieldNames = fieldNames;+ this.builder = builder;}protected String translateMatch(RexNode condition) {+ if (log.isDebugEnabled()) {+ log.debug("translateMatch condition={} {}", condition.getKind(), condition.getClass().getName());+ }+final SqlKind kind = condition.getKind();++ if (condition.isA(SqlKind.SEARCH)) {++ return translateMatch(RexUtil.expandSearch(builder, null, condition));+ }+if (kind.belongsTo(SqlKind.COMPARISON) || kind == SqlKind.NOT) {return translateComparison(condition);} else if (condition.isA(SqlKind.AND)) {@@ -107,7 +123,11 @@ class SolrFilter extends Filter implements SolrRel {query = translateBetween(rhs, lhs);}}- return query != null ? query : "(" + translateAnd(condition) + ")";+ query = query != null ? query : "(" + translateAnd(condition) + ")";+ if (log.isDebugEnabled()) {+ log.debug("translated query match={}", query);+ }+ return query;} else if (condition.isA(SqlKind.OR)) {return "(" + translateOr(condition) + ")";} else if (kind == SqlKind.LIKE) {@@ -323,6 +343,11 @@ class SolrFilter extends Filter implements SolrRel {if (b != null) {return b;}++ if (left.getKind() == SqlKind.CAST && right.getKind() == SqlKind.CAST) {+ return translateBinary2(((RexCall)left).operands.get(0), ((RexCall)right).operands.get(0));+ }+throw new AssertionError("cannot translate call " + call);}@@ -330,7 +355,13 @@ class SolrFilter extends Filter implements SolrRel {* Translates a call to a binary operator. Returns whether successful.*/protected Pair<String, RexLiteral> translateBinary2(RexNode left, RexNode right) {+ if (log.isDebugEnabled()) {+ log.debug("translateBinary2 left={} right={}", left, right);+ }if (right.getKind() != SqlKind.LITERAL) {+ if (log.isDebugEnabled()) {+ log.debug("right != SqlKind.LITERAL, return null");+ }return null;}@@ -357,8 +388,8 @@ class SolrFilter extends Filter implements SolrRel {private final Map<String, String> reverseAggMappings;- HavingTranslator(List<String> fieldNames, Map<String, String> reverseAggMappings) {- super(fieldNames);+ HavingTranslator(List<String> fieldNames, Map<String, String> reverseAggMappings, RexBuilder builder) {+ super(fieldNames, builder);this.reverseAggMappings = reverseAggMappings;}@@ -474,7 +505,7 @@ class SolrFilter extends Filter implements SolrRel {Pair<String, RexLiteral> binaryTranslated = getFieldValuePair(node);switch (node.getKind()) {case EQUALS:- String terms = binaryTranslated.getValue().toString().trim();+ String terms = binaryTranslated.getValue().getValue2().toString().trim();return "eq(" + binaryTranslated.getKey() + "," + terms + ")";case NOT_EQUALS:return "not(eq(" + binaryTranslated.getKey() + "," + binaryTranslated.getValue() + "))";diff --git a/solr/core/src/java/org/apache/solr/handler/sql/SolrRules.java b/solr/core/src/java/org/apache/solr/handler/sql/SolrRules.javaindex bbc4eb7ac58..8f5f3c53012 100644--- a/solr/core/src/java/org/apache/solr/handler/sql/SolrRules.java+++ b/solr/core/src/java/org/apache/solr/handler/sql/SolrRules.java@@ -26,9 +26,6 @@ import org.apache.calcite.rel.logical.LogicalAggregate;import org.apache.calcite.rel.logical.LogicalFilter;import org.apache.calcite.rel.logical.LogicalProject;import org.apache.calcite.rel.logical.LogicalSort;-import org.apache.calcite.rel.rules.AggregateValuesRule;-import org.apache.calcite.rel.rules.ReduceExpressionsRule;-import org.apache.calcite.rel.rules.ValuesReduceRule;import org.apache.calcite.rel.type.RelDataType;import org.apache.calcite.rex.RexCall;import org.apache.calcite.rex.RexInputRef;@@ -55,17 +52,6 @@ class SolrRules {SolrAggregateRule.AGGREGATE_RULE,};- static final RelOptRule[] CONSTANT_REDUCTION_RULES = {- ReduceExpressionsRule.PROJECT_INSTANCE,- ReduceExpressionsRule.FILTER_INSTANCE,- ReduceExpressionsRule.CALC_INSTANCE,- ReduceExpressionsRule.JOIN_INSTANCE,- ValuesReduceRule.FILTER_INSTANCE,- ValuesReduceRule.PROJECT_FILTER_INSTANCE,- ValuesReduceRule.PROJECT_INSTANCE,- AggregateValuesRule.INSTANCE- };-static List<String> solrFieldNames(final RelDataType rowType) {return SqlValidatorUtil.uniquify(new AbstractList<String>() {@@ -238,8 +224,8 @@ class SolrRules {return new SolrAggregate(rel.getCluster(),traitSet,+ agg.getHints(),convert(agg.getInput(), traitSet.simplify()),- agg.indicator,agg.getGroupSet(),agg.getGroupSets(),agg.getAggCallList());diff --git a/solr/core/src/java/org/apache/solr/handler/sql/SolrTableScan.java b/solr/core/src/java/org/apache/solr/handler/sql/SolrTableScan.javaindex 5363d59bbf3..e8a71d4a248 100644--- a/solr/core/src/java/org/apache/solr/handler/sql/SolrTableScan.java+++ b/solr/core/src/java/org/apache/solr/handler/sql/SolrTableScan.java@@ -20,6 +20,7 @@ import org.apache.calcite.plan.*;import org.apache.calcite.rel.RelNode;import org.apache.calcite.rel.core.TableScan;import org.apache.calcite.rel.metadata.RelMetadataQuery;+import org.apache.calcite.rel.rules.CoreRules;import org.apache.calcite.rel.type.RelDataType;import java.util.List;@@ -73,9 +74,7 @@ class SolrTableScan extends TableScan implements SolrRel {planner.addRule(rule);}- for (RelOptRule rule : SolrRules.CONSTANT_REDUCTION_RULES) {- planner.addRule(rule);- }+ planner.removeRule(CoreRules.FILTER_REDUCE_EXPRESSIONS); // prevent AND NOT from being reduced away, see SOLR-15461}public void implement(Implementor implementor) {diff --git a/solr/core/src/test-files/log4j2.xml b/solr/core/src/test-files/log4j2.xmlindex de7954e3929..d2e2dfa41b4 100644--- a/solr/core/src/test-files/log4j2.xml+++ b/solr/core/src/test-files/log4j2.xml@@ -34,6 +34,7 @@<Logger name="org.apache.directory" level="WARN"/><Logger name="org.apache.solr.hadoop" level="INFO"/><Logger name="org.eclipse.jetty" level="INFO"/>+ <Logger name="org.apache.calcite" level="DEBUG"/><Root level="INFO"><AppenderRef ref="STDERR"/>diff --git a/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java b/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.javaindex 9df32797025..60990c07e19 100644--- a/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java+++ b/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java@@ -36,6 +36,7 @@ import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.params.SolrParams;+import org.junit.Assert;import org.junit.Before;import org.junit.BeforeClass;import org.junit.Test;@@ -474,7 +475,7 @@ public class TestSQLHandler extends SolrCloudTestCase {List<Tuple> tuples = getTuples(sParams, baseUrl);- assert (tuples.size() == 8);+ assertEquals(tuples.toString(), 8, tuples.size());Tuple tuple;@@ -525,7 +526,8 @@ public class TestSQLHandler extends SolrCloudTestCase {tuples = getTuples(sParams, baseUrl);- assert (tuples.size() == 2);++ assertEquals(tuples.toString(), 2, tuples.size());tuple = tuples.get(0);assert (tuple.get("Str_s").equals("c"));@@ -902,8 +904,7 @@ public class TestSQLHandler extends SolrCloudTestCase {"stmt", "select distinct str_s, field_i from collection1 where str_s = 'a'");tuples = getTuples(sParams, baseUrl);-- assert (tuples.size() == 2);+ Assert.assertEquals (tuples.toString(), 2, tuples.size());tuple = tuples.get(0);assert (tuple.get("str_s").equals("a"));@@ -1174,7 +1175,7 @@ public class TestSQLHandler extends SolrCloudTestCase {// The sort by and order by match and no limit is applied. All the Tuples should be returned in// this scenario.- assert (tuples.size() == 3);+ assertEquals(tuples.toString(), 3, tuples.size());tuple = tuples.get(0);assert (tuple.get("str_s").equals("c"));@@ -2054,10 +2055,10 @@ public class TestSQLHandler extends SolrCloudTestCase {expectResults("SELECT id, pdatex FROM $ALIAS WHERE pdatex IS NOT NULL", 8);expectResults("SELECT id, pdatex FROM $ALIAS WHERE pdatex > '2021-06-02'", 6);expectResults("SELECT id, pdatex FROM $ALIAS WHERE pdatex <= '2021-06-01'", 1);- expectResults("SELECT id, pdatex FROM $ALIAS WHERE pdatex BETWEEN '2021-06-03' AND '2021-06-05'", 4);expectResults("SELECT id, pdatex FROM $ALIAS WHERE pdatex > '2021-06-04 04:00:00'", 1);expectResults("SELECT id, pdatex FROM $ALIAS WHERE pdatex = '2021-06-04 04:00:00'", 1);expectResults("SELECT id, pdatex FROM $ALIAS WHERE pdatex = CAST('2021-06-04 04:04:00' as TIMESTAMP)", 1);+ expectResults("SELECT id, pdatex FROM $ALIAS WHERE pdatex BETWEEN '2021-06-03' AND '2021-06-05'", 4);}@Testdiff --git a/solr/licenses/apiguardian-api-1.1.0.jar.sha1 b/solr/licenses/apiguardian-api-1.1.0.jar.sha1new file mode 100644index 00000000000..317eb80f20e--- /dev/null+++ b/solr/licenses/apiguardian-api-1.1.0.jar.sha1@@ -0,0 +1 @@+fc9dff4bb36d627bdc553de77e1f17efd790876cdiff --git a/solr/licenses/apiguardian-api-LICENSE-ASL.txt b/solr/licenses/apiguardian-api-LICENSE-ASL.txtnew file mode 100644index 00000000000..9c8f3ea0871--- /dev/null+++ b/solr/licenses/apiguardian-api-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.\ No newline at end of filediff --git a/solr/licenses/apiguardian-api-NOTICE.txt b/solr/licenses/apiguardian-api-NOTICE.txtnew file mode 100644index 00000000000..e69de29bb2ddiff --git a/solr/licenses/avatica-core-1.13.0.jar.sha1 b/solr/licenses/avatica-core-1.13.0.jar.sha1deleted file mode 100644index ca67cb9d0b9..00000000000--- a/solr/licenses/avatica-core-1.13.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-bae68362b6020d6da93ad9abfa6a44edffb2b952diff --git a/solr/licenses/avatica-core-1.18.0.jar.sha1 b/solr/licenses/avatica-core-1.18.0.jar.sha1new file mode 100644index 00000000000..2f58f323a50--- /dev/null+++ b/solr/licenses/avatica-core-1.18.0.jar.sha1@@ -0,0 +1 @@+20473b293f417358ba48f8391a10927d4f9dbae9diff --git a/solr/licenses/calcite-core-1.18.0.jar.sha1 b/solr/licenses/calcite-core-1.18.0.jar.sha1deleted file mode 100644index 1cc0be0b570..00000000000--- a/solr/licenses/calcite-core-1.18.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-814f5395cb0af71d6d7eb304a94a2c5365e4929cdiff --git a/solr/licenses/calcite-core-1.27.0.jar.sha1 b/solr/licenses/calcite-core-1.27.0.jar.sha1new file mode 100644index 00000000000..738dc64b6ad--- /dev/null+++ b/solr/licenses/calcite-core-1.27.0.jar.sha1@@ -0,0 +1 @@+17ab2daa23e28fbd5ac704d03f8d2df693dcf2d3diff --git a/solr/licenses/calcite-linq4j-1.18.0.jar.sha1 b/solr/licenses/calcite-linq4j-1.18.0.jar.sha1deleted file mode 100644index 130f9e55a13..00000000000--- a/solr/licenses/calcite-linq4j-1.18.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-bc7d7a74b2e5ead39ee3688f107bece3ad13eca6diff --git a/solr/licenses/calcite-linq4j-1.27.0.jar.sha1 b/solr/licenses/calcite-linq4j-1.27.0.jar.sha1new file mode 100644index 00000000000..774ca5c4c05--- /dev/null+++ b/solr/licenses/calcite-linq4j-1.27.0.jar.sha1@@ -0,0 +1 @@+0cc428cae2b9927f46575a59006dffd6806f8a14diff --git a/solr/licenses/checker-qual-3.10.0.jar.sha1 b/solr/licenses/checker-qual-3.10.0.jar.sha1new file mode 100644index 00000000000..30969364cbe--- /dev/null+++ b/solr/licenses/checker-qual-3.10.0.jar.sha1@@ -0,0 +1 @@+710fd6abff4b26b40dc0917050dc4c67efcf60b6diff --git a/solr/licenses/checker-qual-LICENSE-MIT.txt b/solr/licenses/checker-qual-LICENSE-MIT.txtnew file mode 100644index 00000000000..d542ab3ec3e--- /dev/null+++ b/solr/licenses/checker-qual-LICENSE-MIT.txt@@ -0,0 +1,413 @@+The Checker Framework+Copyright 2004-present by the Checker Framework developers+++Most of the Checker Framework is licensed under the GNU General Public+License, version 2 (GPL2), with the classpath exception. The text of this+license appears below. This is the same license used for OpenJDK.++A few parts of the Checker Framework have more permissive licenses, notably+the parts that you might want to include with your own program.++ * The annotations and utility files are licensed under the MIT License.+ (The text of this license also appears below.) This applies to+ checker-qual*.jar and checker-util.jar and all the files that appear in+ them, which is all files in checker-qual and checker-util directories.+ It also applies to the cleanroom implementations of+ third-party annotations (in checker/src/testannotations/,+ framework/src/main/java/org/jmlspecs/, and+ framework/src/main/java/com/google/).++The Checker Framework includes annotations for some libraries. Those in+.astub files use the MIT License. Those in https://github.com/typetools/jdk+(which appears in the annotated-jdk directory of file checker.jar) use the+GPL2 license.++Some external libraries that are included with the Checker Framework+distribution have different licenses. Here are some examples.++ * JavaParser is dual licensed under the LGPL or the Apache license -- you+ may use it under whichever one you want. (The JavaParser source code+ contains a file with the text of the GPL, but it is not clear why, since+ JavaParser does not use the GPL.) See+ https://github.com/typetools/stubparser .++ * Annotation Tools (https://github.com/typetools/annotation-tools) uses+ the MIT license.++ * Libraries in plume-lib (https://github.com/plume-lib/) are licensed+ under the MIT License.++===========================================================================++The GNU General Public License (GPL)++Version 2, June 1991++Copyright (C) 1989, 1991 Free Software Foundation, Inc.+59 Temple Place, Suite 330, Boston, MA 02111-1307 USA++Everyone is permitted to copy and distribute verbatim copies of this license+document, but changing it is not allowed.++Preamble++The licenses for most software are designed to take away your freedom to share+and change it. By contrast, the GNU General Public License is intended to+guarantee your freedom to share and change free software--to make sure the+software is free for all its users. This General Public License applies to+most of the Free Software Foundation's software and to any other program whose+authors commit to using it. (Some other Free Software Foundation software is+covered by the GNU Library General Public License instead.) You can apply it to+your programs, too.++When we speak of free software, we are referring to freedom, not price. Our+General Public Licenses are designed to make sure that you have the freedom to+distribute copies of free software (and charge for this service if you wish),+that you receive source code or can get it if you want it, that you can change+the software or use pieces of it in new free programs; and that you know you+can do these things.++To protect your rights, we need to make restrictions that forbid anyone to deny+you these rights or to ask you to surrender the rights. These restrictions+translate to certain responsibilities for you if you distribute copies of the+software, or if you modify it.++For example, if you distribute copies of such a program, whether gratis or for+a fee, you must give the recipients all the rights that you have. You must+make sure that they, too, receive or can get the source code. And you must+show them these terms so they know their rights.++We protect your rights with two steps: (1) copyright the software, and (2)+offer you this license which gives you legal permission to copy, distribute+and/or modify the software.++Also, for each author's protection and ours, we want to make certain that+everyone understands that there is no warranty for this free software. If the+software is modified by someone else and passed on, we want its recipients to+know that what they have is not the original, so that any problems introduced+by others will not reflect on the original authors' reputations.++Finally, any free program is threatened constantly by software patents. We+wish to avoid the danger that redistributors of a free program will+individually obtain patent licenses, in effect making the program proprietary.+To prevent this, we have made it clear that any patent must be licensed for+everyone's free use or not licensed at all.++The precise terms and conditions for copying, distribution and modification+follow.++TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION++0. This License applies to any program or other work which contains a notice+placed by the copyright holder saying it may be distributed under the terms of+this General Public License. The "Program", below, refers to any such program+or work, and a "work based on the Program" means either the Program or any+derivative work under copyright law: that is to say, a work containing the+Program or a portion of it, either verbatim or with modifications and/or+translated into another language. (Hereinafter, translation is included+without limitation in the term "modification".) Each licensee is addressed as+"you".++Activities other than copying, distribution and modification are not covered by+this License; they are outside its scope. The act of running the Program is+not restricted, and the output from the Program is covered only if its contents+constitute a work based on the Program (independent of having been made by+running the Program). Whether that is true depends on what the Program does.++1. You may copy and distribute verbatim copies of the Program's source code as+you receive it, in any medium, provided that you conspicuously and+appropriately publish on each copy an appropriate copyright notice and+disclaimer of warranty; keep intact all the notices that refer to this License+and to the absence of any warranty; and give any other recipients of the+Program a copy of this License along with the Program.++You may charge a fee for the physical act of transferring a copy, and you may+at your option offer warranty protection in exchange for a fee.++2. You may modify your copy or copies of the Program or any portion of it, thus+forming a work based on the Program, and copy and distribute such modifications+or work under the terms of Section 1 above, provided that you also meet all of+these conditions:++ a) You must cause the modified files to carry prominent notices stating+ that you changed the files and the date of any change.++ b) You must cause any work that you distribute or publish, that in whole or+ in part contains or is derived from the Program or any part thereof, to be+ licensed as a whole at no charge to all third parties under the terms of+ this License.++ c) If the modified program normally reads commands interactively when run,+ you must cause it, when started running for such interactive use in the+ most ordinary way, to print or display an announcement including an+ appropriate copyright notice and a notice that there is no warranty (or+ else, saying that you provide a warranty) and that users may redistribute+ the program under these conditions, and telling the user how to view a copy+ of this License. (Exception: if the Program itself is interactive but does+ not normally print such an announcement, your work based on the Program is+ not required to print an announcement.)++These requirements apply to the modified work as a whole. If identifiable+sections of that work are not derived from the Program, and can be reasonably+considered independent and separate works in themselves, then this License, and+its terms, do not apply to those sections when you distribute them as separate+works. But when you distribute the same sections as part of a whole which is a+work based on the Program, the distribution of the whole must be on the terms+of this License, whose permissions for other licensees extend to the entire+whole, and thus to each and every part regardless of who wrote it.++Thus, it is not the intent of this section to claim rights or contest your+rights to work written entirely by you; rather, the intent is to exercise the+right to control the distribution of derivative or collective works based on+the Program.++In addition, mere aggregation of another work not based on the Program with the+Program (or with a work based on the Program) on a volume of a storage or+distribution medium does not bring the other work under the scope of this+License.++3. You may copy and distribute the Program (or a work based on it, under+Section 2) in object code or executable form under the terms of Sections 1 and+2 above provided that you also do one of the following:++ a) Accompany it with the complete corresponding machine-readable source+ code, which must be distributed under the terms of Sections 1 and 2 above+ on a medium customarily used for software interchange; or,++ b) Accompany it with a written offer, valid for at least three years, to+ give any third party, for a charge no more than your cost of physically+ performing source distribution, a complete machine-readable copy of the+ corresponding source code, to be distributed under the terms of Sections 1+ and 2 above on a medium customarily used for software interchange; or,++ c) Accompany it with the information you received as to the offer to+ distribute corresponding source code. (This alternative is allowed only+ for noncommercial distribution and only if you received the program in+ object code or executable form with such an offer, in accord with+ Subsection b above.)++The source code for a work means the preferred form of the work for making+modifications to it. For an executable work, complete source code means all+the source code for all modules it contains, plus any associated interface+definition files, plus the scripts used to control compilation and installation+of the executable. However, as a special exception, the source code+distributed need not include anything that is normally distributed (in either+source or binary form) with the major components (compiler, kernel, and so on)+of the operating system on which the executable runs, unless that component+itself accompanies the executable.++If distribution of executable or object code is made by offering access to copy+from a designated place, then offering equivalent access to copy the source+code from the same place counts as distribution of the source code, even though+third parties are not compelled to copy the source along with the object code.++4. You may not copy, modify, sublicense, or distribute the Program except as+expressly provided under this License. Any attempt otherwise to copy, modify,+sublicense or distribute the Program is void, and will automatically terminate+your rights under this License. However, parties who have received copies, or+rights, from you under this License will not have their licenses terminated so+long as such parties remain in full compliance.++5. You are not required to accept this License, since you have not signed it.+However, nothing else grants you permission to modify or distribute the Program+or its derivative works. These actions are prohibited by law if you do not+accept this License. Therefore, by modifying or distributing the Program (or+any work based on the Program), you indicate your acceptance of this License to+do so, and all its terms and conditions for copying, distributing or modifying+the Program or works based on it.++6. Each time you redistribute the Program (or any work based on the Program),+the recipient automatically receives a license from the original licensor to+copy, distribute or modify the Program subject to these terms and conditions.+You may not impose any further restrictions on the recipients' exercise of the+rights granted herein. You are not responsible for enforcing compliance by+third parties to this License.++7. If, as a consequence of a court judgment or allegation of patent+infringement or for any other reason (not limited to patent issues), conditions+are imposed on you (whether by court order, agreement or otherwise) that+contradict the conditions of this License, they do not excuse you from the+conditions of this License. If you cannot distribute so as to satisfy+simultaneously your obligations under this License and any other pertinent+obligations, then as a consequence you may not distribute the Program at all.+For example, if a patent license would not permit royalty-free redistribution+of the Program by all those who receive copies directly or indirectly through+you, then the only way you could satisfy both it and this License would be to+refrain entirely from distribution of the Program.++If any portion of this section is held invalid or unenforceable under any+particular circumstance, the balance of the section is intended to apply and+the section as a whole is intended to apply in other circumstances.++It is not the purpose of this section to induce you to infringe any patents or+other property right claims or to contest validity of any such claims; this+section has the sole purpose of protecting the integrity of the free software+distribution system, which is implemented by public license practices. Many+people have made generous contributions to the wide range of software+distributed through that system in reliance on consistent application of that+system; it is up to the author/donor to decide if he or she is willing to+distribute software through any other system and a licensee cannot impose that+choice.++This section is intended to make thoroughly clear what is believed to be a+consequence of the rest of this License.++8. If the distribution and/or use of the Program is restricted in certain+countries either by patents or by copyrighted interfaces, the original+copyright holder who places the Program under this License may add an explicit+geographical distribution limitation excluding those countries, so that+distribution is permitted only in or among countries not thus excluded. In+such case, this License incorporates the limitation as if written in the body+of this License.++9. The Free Software Foundation may publish revised and/or new versions of the+General Public License from time to time. Such new versions will be similar in+spirit to the present version, but may differ in detail to address new problems+or concerns.++Each version is given a distinguishing version number. If the Program+specifies a version number of this License which applies to it and "any later+version", you have the option of following the terms and conditions either of+that version or of any later version published by the Free Software Foundation.+If the Program does not specify a version number of this License, you may+choose any version ever published by the Free Software Foundation.++10. If you wish to incorporate parts of the Program into other free programs+whose distribution conditions are different, write to the author to ask for+permission. For software which is copyrighted by the Free Software Foundation,+write to the Free Software Foundation; we sometimes make exceptions for this.+Our decision will be guided by the two goals of preserving the free status of+all derivatives of our free software and of promoting the sharing and reuse of+software generally.++NO WARRANTY++11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR+THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE+STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE+PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND+FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND+PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE,+YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.++12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL+ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE+PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR+INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA+BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A+FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER+OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.++END OF TERMS AND CONDITIONS++How to Apply These Terms to Your New Programs++If you develop a new program, and you want it to be of the greatest possible+use to the public, the best way to achieve this is to make it free software+which everyone can redistribute and change under these terms.++To do so, attach the following notices to the program. It is safest to attach+them to the start of each source file to most effectively convey the exclusion+of warranty; and each file should have at least the "copyright" line and a+pointer to where the full notice is found.++ One line to give the program's name and a brief idea of what it does.++ Copyright (C) <year> <name of author>++ This program is free software; you can redistribute it and/or modify it+ under the terms of the GNU General Public License as published by the Free+ Software Foundation; either version 2 of the License, or (at your option)+ any later version.++ This program is distributed in the hope that it will be useful, but WITHOUT+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for+ more details.++ You should have received a copy of the GNU General Public License along+ with this program; if not, write to the Free Software Foundation, Inc., 59+ Temple Place, Suite 330, Boston, MA 02111-1307 USA++Also add information on how to contact you by electronic and paper mail.++If the program is interactive, make it output a short notice like this when it+starts in an interactive mode:++ Gnomovision version 69, Copyright (C) year name of author Gnomovision comes+ with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free+ software, and you are welcome to redistribute it under certain conditions;+ type 'show c' for details.++The hypothetical commands 'show w' and 'show c' should show the appropriate+parts of the General Public License. Of course, the commands you use may be+called something other than 'show w' and 'show c'; they could even be+mouse-clicks or menu items--whatever suits your program.++You should also get your employer (if you work as a programmer) or your school,+if any, to sign a "copyright disclaimer" for the program, if necessary. Here+is a sample; alter the names:++ Yoyodyne, Inc., hereby disclaims all copyright interest in the program+ 'Gnomovision' (which makes passes at compilers) written by James Hacker.++ signature of Ty Coon, 1 April 1989++ Ty Coon, President of Vice++This General Public License does not permit incorporating your program into+proprietary programs. If your program is a subroutine library, you may+consider it more useful to permit linking proprietary applications with the+library. If this is what you want to do, use the GNU Library General Public+License instead of this License.+++"CLASSPATH" EXCEPTION TO THE GPL++Certain source files distributed by Oracle America and/or its affiliates are+subject to the following clarification and special exception to the GPL, but+only where Oracle has expressly included in the particular source file's header+the words "Oracle designates this particular file as subject to the "Classpath"+exception as provided by Oracle in the LICENSE file that accompanied this code."++ Linking this library statically or dynamically with other modules is making+ a combined work based on this library. Thus, the terms and conditions of+ the GNU General Public License cover the whole combination.++ As a special exception, the copyright holders of this library give you+ permission to link this library with independent modules to produce an+ executable, regardless of the license terms of these independent modules,+ and to copy and distribute the resulting executable under terms of your+ choice, provided that you also meet, for each linked independent module,+ the terms and conditions of the license of that module. An independent+ module is a module which is not derived from or based on this library. If+ you modify this library, you may extend this exception to your version of+ the library, but you are not obligated to do so. If you do not wish to do+ so, delete this exception statement from your version.++===========================================================================++MIT License:++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.++===========================================================================\ No newline at end of filediff --git a/solr/licenses/esri-geometry-api-2.2.0.jar.sha1 b/solr/licenses/esri-geometry-api-2.2.0.jar.sha1new file mode 100644index 00000000000..8c2829f692d--- /dev/null+++ b/solr/licenses/esri-geometry-api-2.2.0.jar.sha1@@ -0,0 +1 @@+2663f80d28c2470630a996464d6130b2809c9dbediff --git a/solr/licenses/esri-geometry-api-LICENSE-ASL.txt b/solr/licenses/esri-geometry-api-LICENSE-ASL.txtnew file mode 100644index 00000000000..7a4a3ea2424--- /dev/null+++ b/solr/licenses/esri-geometry-api-LICENSE-ASL.txt@@ -0,0 +1,202 @@++ Apache License+ Version 2.0, January 2004+ http://www.apache.org/licenses/++ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION++ 1. Definitions.++ "License" shall mean the terms and conditions for use, reproduction,+ and distribution as defined by Sections 1 through 9 of this document.++ "Licensor" shall mean the copyright owner or entity authorized by+ the copyright owner that is granting the License.++ "Legal Entity" shall mean the union of the acting entity and all+ other entities that control, are controlled by, or are under common+ control with that entity. For the purposes of this definition,+ "control" means (i) the power, direct or indirect, to cause the+ direction or management of such entity, whether by contract or+ otherwise, or (ii) ownership of fifty percent (50%) or more of the+ outstanding shares, or (iii) beneficial ownership of such entity.++ "You" (or "Your") shall mean an individual or Legal Entity+ exercising permissions granted by this License.++ "Source" form shall mean the preferred form for making modifications,+ including but not limited to software source code, documentation+ source, and configuration files.++ "Object" form shall mean any form resulting from mechanical+ transformation or translation of a Source form, including but+ not limited to compiled object code, generated documentation,+ and conversions to other media types.++ "Work" shall mean the work of authorship, whether in Source or+ Object form, made available under the License, as indicated by a+ copyright notice that is included in or attached to the work+ (an example is provided in the Appendix below).++ "Derivative Works" shall mean any work, whether in Source or Object+ form, that is based on (or derived from) the Work and for which the+ editorial revisions, annotations, elaborations, or other modifications+ represent, as a whole, an original work of authorship. For the purposes+ of this License, Derivative Works shall not include works that remain+ separable from, or merely link (or bind by name) to the interfaces of,+ the Work and Derivative Works thereof.++ "Contribution" shall mean any work of authorship, including+ the original version of the Work and any modifications or additions+ to that Work or Derivative Works thereof, that is intentionally+ submitted to Licensor for inclusion in the Work by the copyright owner+ or by an individual or Legal Entity authorized to submit on behalf of+ the copyright owner. For the purposes of this definition, "submitted"+ means any form of electronic, verbal, or written communication sent+ to the Licensor or its representatives, including but not limited to+ communication on electronic mailing lists, source code control systems,+ and issue tracking systems that are managed by, or on behalf of, the+ Licensor for the purpose of discussing and improving the Work, but+ excluding communication that is conspicuously marked or otherwise+ designated in writing by the copyright owner as "Not a Contribution."++ "Contributor" shall mean Licensor and any individual or Legal Entity+ on behalf of whom a Contribution has been received by Licensor and+ subsequently incorporated within the Work.++ 2. Grant of Copyright License. Subject to the terms and conditions of+ this License, each Contributor hereby grants to You a perpetual,+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable+ copyright license to reproduce, prepare Derivative Works of,+ publicly display, publicly perform, sublicense, and distribute the+ Work and such Derivative Works in Source or Object form.++ 3. Grant of Patent License. Subject to the terms and conditions of+ this License, each Contributor hereby grants to You a perpetual,+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable+ (except as stated in this section) patent license to make, have made,+ use, offer to sell, sell, import, and otherwise transfer the Work,+ where such license applies only to those patent claims licensable+ by such Contributor that are necessarily infringed by their+ Contribution(s) alone or by combination of their Contribution(s)+ with the Work to which such Contribution(s) was submitted. If You+ institute patent litigation against any entity (including a+ cross-claim or counterclaim in a lawsuit) alleging that the Work+ or a Contribution incorporated within the Work constitutes direct+ or contributory patent infringement, then any patent licenses+ granted to You under this License for that Work shall terminate+ as of the date such litigation is filed.++ 4. Redistribution. You may reproduce and distribute copies of the+ Work or Derivative Works thereof in any medium, with or without+ modifications, and in Source or Object form, provided that You+ meet the following conditions:++ (a) You must give any other recipients of the Work or+ Derivative Works a copy of this License; and++ (b) You must cause any modified files to carry prominent notices+ stating that You changed the files; and++ (c) You must retain, in the Source form of any Derivative Works+ that You distribute, all copyright, patent, trademark, and+ attribution notices from the Source form of the Work,+ excluding those notices that do not pertain to any part of+ the Derivative Works; and++ (d) If the Work includes a "NOTICE" text file as part of its+ distribution, then any Derivative Works that You distribute must+ include a readable copy of the attribution notices contained+ within such NOTICE file, excluding those notices that do not+ pertain to any part of the Derivative Works, in at least one+ of the following places: within a NOTICE text file distributed+ as part of the Derivative Works; within the Source form or+ documentation, if provided along with the Derivative Works; or,+ within a display generated by the Derivative Works, if and+ wherever such third-party notices normally appear. The contents+ of the NOTICE file are for informational purposes only and+ do not modify the License. You may add Your own attribution+ notices within Derivative Works that You distribute, alongside+ or as an addendum to the NOTICE text from the Work, provided+ that such additional attribution notices cannot be construed+ as modifying the License.++ You may add Your own copyright statement to Your modifications and+ may provide additional or different license terms and conditions+ for use, reproduction, or distribution of Your modifications, or+ for any such Derivative Works as a whole, provided Your use,+ reproduction, and distribution of the Work otherwise complies with+ the conditions stated in this License.++ 5. Submission of Contributions. Unless You explicitly state otherwise,+ any Contribution intentionally submitted for inclusion in the Work+ by You to the Licensor shall be under the terms and conditions of+ this License, without any additional terms or conditions.+ Notwithstanding the above, nothing herein shall supersede or modify+ the terms of any separate license agreement you may have executed+ with Licensor regarding such Contributions.++ 6. Trademarks. This License does not grant permission to use the trade+ names, trademarks, service marks, or product names of the Licensor,+ except as required for reasonable and customary use in describing the+ origin of the Work and reproducing the content of the NOTICE file.++ 7. Disclaimer of Warranty. Unless required by applicable law or+ agreed to in writing, Licensor provides the Work (and each+ Contributor provides its Contributions) on an "AS IS" BASIS,+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or+ implied, including, without limitation, any warranties or conditions+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A+ PARTICULAR PURPOSE. You are solely responsible for determining the+ appropriateness of using or redistributing the Work and assume any+ risks associated with Your exercise of permissions under this License.++ 8. Limitation of Liability. In no event and under no legal theory,+ whether in tort (including negligence), contract, or otherwise,+ unless required by applicable law (such as deliberate and grossly+ negligent acts) or agreed to in writing, shall any Contributor be+ liable to You for damages, including any direct, indirect, special,+ incidental, or consequential damages of any character arising as a+ result of this License or out of the use or inability to use the+ Work (including but not limited to damages for loss of goodwill,+ work stoppage, computer failure or malfunction, or any and all+ other commercial damages or losses), even if such Contributor+ has been advised of the possibility of such damages.++ 9. Accepting Warranty or Additional Liability. While redistributing+ the Work or Derivative Works thereof, You may choose to offer,+ and charge a fee for, acceptance of support, warranty, indemnity,+ or other liability obligations and/or rights consistent with this+ License. However, in accepting such obligations, You may act only+ on Your own behalf and on Your sole responsibility, not on behalf+ of any other Contributor, and only if You agree to indemnify,+ defend, and hold each Contributor harmless for any liability+ incurred by, or claims asserted against, such Contributor by reason+ of your accepting any such warranty or additional liability.++ END OF TERMS AND CONDITIONS++ APPENDIX: How to apply the Apache License to your work.++ To apply the Apache License to your work, attach the following+ boilerplate notice, with the fields enclosed by brackets "[]"+ replaced with your own identifying information. (Don't include+ the brackets!) The text should be enclosed in the appropriate+ comment syntax for the file format. We also recommend that a+ file or class name and description of purpose be included on the+ same "printed page" as the copyright notice for easier+ identification within third-party archives.++ Copyright [yyyy] [name of copyright owner]++ Licensed under the Apache License, Version 2.0 (the "License");+ you may not use this file except in compliance with the License.+ You may obtain a copy of the License at++ http://www.apache.org/licenses/LICENSE-2.0++ Unless required by applicable law or agreed to in writing, software+ distributed under the License is distributed on an "AS IS" BASIS,+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ See the License for the specific language governing permissions and+ limitations under the License.\ No newline at end of filediff --git a/solr/licenses/esri-geometry-api-NOTICE.txt b/solr/licenses/esri-geometry-api-NOTICE.txtnew file mode 100644index 00000000000..e69de29bb2ddiff --git a/versions.lock b/versions.lockindex 7eb859b37c2..c50a475d4b4 100644--- a/versions.lock+++ b/versions.lock@@ -5,6 +5,7 @@ com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.7.6 (1 constraintscom.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e)com.drewnoakes:metadata-extractor:2.11.0 (1 constraints: 3605323b)com.epam:parso:2.0.11 (1 constraints: 36052c3b)+com.esri.geometry:esri-geometry-api:2.2.0 (1 constraints: 0605fb35)com.fasterxml.jackson:jackson-bom:2.12.2 (5 constraints: 1f65043a)com.fasterxml.jackson.core:jackson-annotations:2.12.2 (3 constraints: ad36611f)com.fasterxml.jackson.core:jackson-core:2.12.2 (4 constraints: 8a49beea)@@ -95,9 +96,9 @@ net.jcip:jcip-annotations:1.0 (1 constraints: 560ff165)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 (2 constraints: 9115f6e5)-org.apache.calcite:calcite-core:1.18.0 (1 constraints: 3c05413b)-org.apache.calcite:calcite-linq4j:1.18.0 (1 constraints: 3c05413b)-org.apache.calcite.avatica:avatica-core:1.13.0 (1 constraints: 3705323b)+org.apache.calcite:calcite-core:1.27.0 (1 constraints: 3c05423b)+org.apache.calcite:calcite-linq4j:1.27.0 (1 constraints: 3c05423b)+org.apache.calcite.avatica:avatica-core:1.18.0 (1 constraints: 3c05413b)org.apache.commons:commons-collections4:4.4 (1 constraints: ac04272c)org.apache.commons:commons-compress:1.19 (1 constraints: df04fa30)org.apache.commons:commons-configuration2:2.1.1 (1 constraints: 0605f935)@@ -172,6 +173,7 @@ org.apache.tika:tika-xmp:1.24 (1 constraints: db04f730)org.apache.xmlbeans:xmlbeans:3.1.0 (1 constraints: 0605fd35)org.apache.zookeeper:zookeeper:3.7.0 (1 constraints: 0c050f36)org.apache.zookeeper:zookeeper-jute:3.7.0 (1 constraints: 8a0d3a28)+org.apiguardian:apiguardian-api:1.1.0 (1 constraints: 0405f335)org.aspectj:aspectjrt:1.8.0 (1 constraints: 0b050836)org.bitbucket.b_c:jose4j:0.7.7 (1 constraints: 10050736)org.bouncycastle:bcmail-jdk15on:1.64 (1 constraints: df04ff30)@@ -184,7 +186,7 @@ org.carrot2:morfologik-polish:2.1.5 (1 constraints: cf12501e)org.carrot2:morfologik-stemming:2.1.5 (2 constraints: d01f1300)org.ccil.cowan.tagsoup:tagsoup:1.2.1 (1 constraints: 0605f735)org.checkerframework:checker-compat-qual:2.5.5 (1 constraints: f00fed95)-org.checkerframework:checker-qual:2.0.0 (1 constraints: 140ae5b4)+org.checkerframework:checker-qual:3.10.0 (2 constraints: 490f9491)org.codehaus.janino:commons-compiler:3.0.9 (2 constraints: d910f7d1)org.codehaus.janino:janino:3.0.9 (1 constraints: 0e050336)org.codehaus.mojo:animal-sniffer-annotations:1.14 (1 constraints: ea09d5aa)diff --git a/versions.props b/versions.propsindex 6a74a68ed59..2617e1ed145 100644--- a/versions.props+++ b/versions.props@@ -4,6 +4,7 @@ com.carrotsearch:hppc=0.8.2com.cybozu.labs:langdetect=1.1-20120112com.drewnoakes:metadata-extractor=2.11.0com.epam:parso=2.0.11+com.esri.geometry:esri-geometry-api=2.2.0com.fasterxml.jackson*:*=2.10.1com.github.ben-manes.caffeine:caffeine=2.8.4com.github.virtuald:curvesapi=1.06@@ -68,8 +69,8 @@ net.sourceforge.argparse4j:argparse4j=0.8.1net.thisptr:jackson-jq=0.0.8no.nav.security:mock-oauth2-server=0.3.3org.antlr:antlr4-runtime=4.5.1-1-org.apache.calcite.avatica:avatica-core=1.13.0-org.apache.calcite:*=1.18.0+org.apache.calcite.avatica:avatica-core=1.18.0+org.apache.calcite:*=1.27.0org.apache.commons:commons-collections4=4.4org.apache.commons:commons-compress=1.19org.apache.commons:commons-configuration2=2.1.1@@ -95,6 +96,7 @@ org.apache.poi:*=4.1.1org.apache.tika:*=1.24org.apache.xmlbeans:xmlbeans=3.1.0org.apache.zookeeper:*=3.7.0+org.apiguardian:apiguardian-api=1.1.0org.asciidoctor:asciidoctorj=1.6.2org.aspectj:aspectjrt=1.8.0org.bitbucket.b_c:jose4j=0.7.7@@ -103,6 +105,7 @@ org.brotli:dec=0.1.2org.carrot2:carrot2-core=4.0.4org.carrot2:morfologik-*=2.1.5org.ccil.cowan.tagsoup:tagsoup=1.2.1+org.checkerframework:checker-qual=3.10.0org.codehaus.janino:*=3.0.9org.codehaus.woodstox:stax2-api=3.1.4org.codehaus.woodstox:woodstox-core-asl=4.4.1@@ -123,4 +126,4 @@ org.threeten:threetenbp=1.3.3org.tukaani:xz=1.8org.xerial.snappy:snappy-java=1.1.7.6ua.net.nlp:morfologik-ukrainian-search=4.9.1-xerces:xercesImpl=2.12.0+xerces:xercesImpl=2.12.0\ No newline at end of file