You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2020/10/08 08:54:25 UTC
[lucene-solr] 01/01: Merge branch 'master' into jira/solr-14749
This is an automated email from the ASF dual-hosted git repository.
ab pushed a commit to branch jira/solr-14749
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit ceb0d870bbb16380f22367c4fbc2eaf9cfbccbcc
Merge: a8658ce 7a13e81
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Thu Oct 8 10:53:52 2020 +0200
Merge branch 'master' into jira/solr-14749
gradle/defaults.gradle | 3 -
gradle/documentation/render-javadoc.gradle | 10 -
gradle/generation/jflex.gradle | 2 +-
gradle/maven/defaults-maven.gradle | 175 ++++++++--
gradle/maven/maven-local.gradle | 15 +-
gradle/testing/randomization.gradle | 3 +-
gradle/validation/check-environment.gradle | 2 +-
.../owasp-dependency-check/exclusions.xml | 30 --
gradle/validation/validate-log-calls.gradle | 22 +-
gradle/wrapper/gradle-wrapper.jar | Bin 58910 -> 59203 bytes
gradle/wrapper/gradle-wrapper.jar.sha256 | 2 +-
gradle/wrapper/gradle-wrapper.jar.version | 2 +-
gradle/wrapper/gradle-wrapper.properties | 2 +-
help/validateLogCalls.txt | 2 +-
lucene/CHANGES.txt | 11 +-
lucene/MIGRATE.md | 5 +
.../miscellaneous/WordDelimiterGraphFilter.java | 24 +-
.../miscellaneous/WordDelimiterIterator.java | 14 +-
.../TestWordDelimiterGraphFilter.java | 56 ++-
.../icu}/ICUCollationAttributeFactory.java | 5 +-
.../icu}/ICUCollationDocValuesField.java | 2 +-
.../icu}/ICUCollationKeyAnalyzer.java | 3 +-
.../ICUCollatedTermAttributeImpl.java | 2 +-
.../java/org/apache/lucene/collation/package.html | 23 --
.../lucene/collation/tokenattributes/package.html | 23 --
.../icu}/TestICUCollationDocValuesField.java | 2 +-
.../icu}/TestICUCollationKeyAnalyzer.java | 3 +-
.../byTask/tasks/NewCollationAnalyzerTask.java | 2 +-
.../java/org/apache/lucene/index/IndexWriter.java | 8 +
.../org/apache/lucene/search/ConjunctionDISI.java | 36 ++
.../src/java/org/apache/lucene/search/Weight.java | 58 +++-
.../lucene/search/comparators/DocComparator.java | 8 +-
.../search/comparators/NumericComparator.java | 8 +-
.../org/apache/lucene/index/TestIndexWriter.java | 20 ++
.../lucene/index/TestSizeBoundedForceMerge.java | 2 +-
.../apache/lucene/search/TestConjunctionDISI.java | 19 +-
.../org/apache/lucene/facet/FacetTestCase.java | 43 ++-
.../facet/taxonomy/TestTaxonomyFacetCounts.java | 24 +-
.../complexPhrase/ComplexPhraseQueryParser.java | 13 +-
.../complexPhrase/TestComplexPhraseQuery.java | 6 +-
.../apache/lucene/spatial/StrategyTestCase.java | 2 +-
.../spatial/prefix/HeatmapFacetCounterTest.java | 2 +-
.../prefix/RandomSpatialOpFuzzyPrefixTreeTest.java | 2 +-
.../lucene/analysis/BaseTokenStreamTestCase.java | 3 +-
.../java/org/apache/lucene/geo/ShapeTestUtil.java | 6 +-
solr/CHANGES.txt | 26 ++
solr/NOTICE.txt | 12 -
.../org/apache/solr/schema/ICUCollationField.java | 2 +-
.../clustering/carrot2/CarrotClusteringEngine.java | 2 +-
.../extraction/ExtractingDocumentLoader.java | 2 +-
solr/contrib/ltr/build.gradle | 1 -
.../test/org/apache/solr/ltr/TestRerankBase.java | 14 +-
.../collector/SchedulerMetricsCollector.java | 2 +-
solr/core/build.gradle | 2 -
.../apache/solr/cloud/ActiveReplicaWatcher.java | 4 +-
.../src/java/org/apache/solr/cloud/CloudUtil.java | 2 +-
.../apache/solr/cloud/OverseerTaskProcessor.java | 6 +-
.../src/java/org/apache/solr/core/SolrCore.java | 4 +-
.../org/apache/solr/core/SolrResourceLoader.java | 26 +-
.../java/org/apache/solr/handler/IndexFetcher.java | 4 +-
.../apache/solr/handler/ReplicationHandler.java | 11 +-
.../apache/solr/handler/RequestHandlerBase.java | 4 +-
.../org/apache/solr/handler/SchemaHandler.java | 39 +++
.../solr/handler/admin/CollectionsHandler.java | 2 +-
.../solr/handler/admin/ConfigSetsHandler.java | 50 ++-
.../apache/solr/handler/admin/MetricsHandler.java | 24 +-
.../apache/solr/handler/admin/PrepRecoveryOp.java | 2 +-
.../solr/handler/component/SuggestComponent.java | 4 +-
.../org/apache/solr/logging/DeprecationLog.java | 53 +++
.../java/org/apache/solr/metrics/MetricsMap.java | 69 +++-
.../solr/metrics/reporters/solr/SolrReporter.java | 2 +-
.../org/apache/solr/rest/BaseSolrResource.java | 133 ++------
.../src/java/org/apache/solr/rest/DELETEable.java | 26 --
.../src/java/org/apache/solr/rest/GETable.java | 26 --
.../java/org/apache/solr/rest/ManagedResource.java | 23 +-
.../apache/solr/rest/ManagedResourceStorage.java | 4 +-
.../src/java/org/apache/solr/rest/POSTable.java | 26 --
.../src/java/org/apache/solr/rest/PUTable.java | 26 --
.../src/java/org/apache/solr/rest/RestManager.java | 323 ++++++------------
.../org/apache/solr/rest/SolrSchemaRestApi.java | 78 -----
.../java/org/apache/solr/rest/package-info.java | 2 +-
.../analysis/ManagedSynonymFilterFactory.java | 6 +-
.../analysis/ManagedSynonymGraphFilterFactory.java | 6 +-
.../solr/rest/schema/analysis/package-info.java | 3 +-
.../org/apache/solr/rest/schema/package-info.java | 2 +-
.../org/apache/solr/schema/ManagedIndexSchema.java | 11 +-
.../java/org/apache/solr/search/CaffeineCache.java | 2 +-
.../solr/search/CollapsingQParserPlugin.java | 147 +++++---
.../org/apache/solr/search/SolrFieldCacheBean.java | 4 +-
.../org/apache/solr/search/SolrIndexSearcher.java | 4 +-
.../org/apache/solr/security/HadoopAuthPlugin.java | 2 +-
.../java/org/apache/solr/servlet/HttpSolrCall.java | 69 ++--
.../apache/solr/servlet/SolrDispatchFilter.java | 8 +-
.../apache/solr/servlet/SolrRequestParsers.java | 11 +-
.../apache/solr/spelling/SpellCheckCollator.java | 2 +-
.../org/apache/solr/store/blockcache/Metrics.java | 2 +-
.../solr/store/hdfs/HdfsLocalityReporter.java | 2 +-
.../org/apache/solr/update/SolrIndexSplitter.java | 2 +-
.../org/apache/solr/util/StartupLoggingUtils.java | 2 +-
.../org/apache/solr/util/stats/MetricUtils.java | 380 +++++++++++++++------
... => MyPatternReplaceCharFilterFactory.java.txt} | 0
.../{MyPlugin.java => MyPlugin.java.txt} | 0
.../{MyTextField.java => MyTextField.java.txt} | 0
....java => MyWhitespaceTokenizerFactory.java.txt} | 0
...qHandler.java => RuntimeLibReqHandler.java.txt} | 0
...iter.java => RuntimeLibResponseWriter.java.txt} | 0
...ent.java => RuntimeLibSearchComponent.java.txt} | 0
.../runtimecode/{TestURP.java => TestURP.java.txt} | 0
...VersionedURP.java => TestVersionedURP.java.txt} | 0
.../src/test/org/apache/hadoop/fs/FileUtil.java | 10 +-
.../datanode/fsdataset/impl/BlockPoolSlice.java | 3 +-
.../test/org/apache/hadoop/http/HttpServer2.java | 3 +-
.../ChaosMonkeySafeLeaderWithPullReplicasTest.java | 2 +-
.../org/apache/solr/cloud/OverseerRolesTest.java | 2 +-
.../test/org/apache/solr/cloud/OverseerTest.java | 16 +-
.../org/apache/solr/cloud/RollingRestartTest.java | 2 +-
.../org/apache/solr/cloud/TestConfigSetsAPI.java | 146 +++++---
.../solr/cloud/TestConfigSetsAPIExclusivity.java | 3 +
.../solr/cloud/TestConfigSetsAPIZkFailure.java | 1 +
.../test/org/apache/solr/core/MockInfoBean.java | 2 +-
.../apache/solr/core/TestSolrConfigHandler.java | 4 -
.../solr/handler/TestReplicationHandler.java | 2 +-
.../solr/handler/admin/MetricsHandlerTest.java | 63 ++--
.../apache/solr/handler/admin/TestConfigsApi.java | 4 -
.../org/apache/solr/request/TestStreamBody.java | 4 -
.../org/apache/solr/rest/SolrRestletTestBase.java | 9 +-
.../test/org/apache/solr/rest/TestRestManager.java | 147 +-------
.../schema/TestSerializedLuceneMatchVersion.java | 4 -
.../analysis/TestManagedStopFilterFactory.java | 4 -
.../analysis/TestManagedSynonymFilterFactory.java | 4 -
.../TestManagedSynonymGraphFilterFactory.java | 4 -
.../apache/solr/schema/TestCloudSchemaless.java | 4 -
.../search/TestRandomCollapseQParserPlugin.java | 53 ++-
.../solr/security/BasicAuthIntegrationTest.java | 2 +-
.../apache/solr/servlet/SecurityHeadersTest.java | 93 +++++
.../solr/update/TestInPlaceUpdatesDistrib.java | 6 +-
.../CategoryRoutedAliasUpdateProcessorTest.java | 2 +-
.../DimensionalRoutedAliasUpdateProcessorTest.java | 2 +-
.../TimeRoutedAliasUpdateProcessorTest.java | 2 +-
.../apache/solr/util/TestSolrCLIRunExample.java | 2 +-
.../apache/solr/util/stats/MetricUtilsTest.java | 75 ++--
solr/example/films/README.md | 46 ---
solr/licenses/commons-io-2.6.jar.sha1 | 1 -
solr/licenses/commons-io-2.8.0.jar.sha1 | 1 +
solr/licenses/org.restlet-2.4.3.jar.sha1 | 1 -
solr/licenses/org.restlet-LICENSE-ASL.txt | 201 -----------
solr/licenses/org.restlet-NOTICE.txt | 2 -
.../org.restlet.ext.servlet-2.4.3.jar.sha1 | 1 -
.../org.restlet.ext.servlet-LICENSE-ASL.txt | 201 -----------
solr/licenses/org.restlet.ext.servlet-NOTICE.txt | 2 -
.../solr/configsets/_default/conf/solrconfig.xml | 154 ++-------
.../conf/solrconfig.xml | 166 ++-------
solr/solr-ref-guide/build.gradle | 79 ++---
solr/solr-ref-guide/src/_config.yml.template | 32 +-
solr/solr-ref-guide/src/analytics.adoc | 2 +-
solr/solr-ref-guide/src/collection-management.adoc | 5 +-
.../src/common-query-parameters.adoc | 8 +-
solr/solr-ref-guide/src/configsets-api.adoc | 14 +-
solr/solr-ref-guide/src/faceting.adoc | 2 +
solr/solr-ref-guide/src/highlighting.adoc | 2 +-
solr/solr-ref-guide/src/index-replication.adoc | 2 +-
.../src/initparams-in-solrconfig.adoc | 2 +-
.../src/major-changes-in-solr-9.adoc | 4 +
...andlers-and-searchcomponents-in-solrconfig.adoc | 286 ++++++++++++----
.../src/rule-based-authorization-plugin.adoc | 4 +-
solr/solr-ref-guide/src/solr-tutorial.adoc | 13 +-
solr/solr-ref-guide/src/the-terms-component.adoc | 2 +-
.../src/uploading-data-with-index-handlers.adoc | 5 +
solr/solrj/build.gradle | 1 -
.../java/org/apache/solr/common/MapWriterMap.java | 5 +
.../org/apache/solr/common/NavigableObject.java | 6 +
.../solr/common/cloud/NodesSysPropsCacher.java | 4 +-
.../apache/solr/common/cloud/ZkConfigManager.java | 23 +-
.../org/apache/solr/common/util/NamedList.java | 5 +
.../java/org/apache/solr/common/util/Utils.java | 60 +++-
.../solr/client/solrj/request/SchemaTest.java | 4 -
.../solr/cloud/AbstractFullDistribZkTestBase.java | 6 +-
solr/webapp/web/WEB-INF/web.xml | 14 -
versions.lock | 4 +-
versions.props | 3 +-
180 files changed, 2113 insertions(+), 2346 deletions(-)