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/09/22 09:23:35 UTC
[lucene-solr] branch jira/solr-14749 updated (efb51c2 -> 6253927)
This is an automated email from the ASF dual-hosted git repository.
ab pushed a change to branch jira/solr-14749
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from efb51c2 SOLR-14749: Add a unit test for the collections repair listener.
add 6c9d7ad LUCENE-9527: upgrade javacc to 7.0.4 (#1884)
add 2364a7a SOLR-14792: Remove VelocityResponseWriter
add dbba48b SOLR-14613: use set-placement-plugin for both setting and unsetting plugin config
add e0a6490 Further tune Lucene87StoredFieldsFormat for small documents. (#1888)
add 33f7280 LUCENE-9529: Track dirtiness of stored fields via a number of docs, not chunks. (#1882)
add ee0a374 SOLR-14875: Make SolrEventListeners load from packages (#1887)
add fbf8e4f LUCENE-9523: Speed up query shapes for geometries that generate multiple points (#1866)
add 5ec2bac LUCENE-9531: Consolidate duplicated generated classes CharStream and FastCharStream (#1886)
add 3a92e1b LUCENE-9528: cleanup of flexible query parser's grammar (#1879)
add 745fc31 SOLR-14871: Wrong field name in POJO
add 208a1c0 LUCENE-9534: Ensure DWPT#ramBytesUsed is only called unter lock (#1889)
add 4ed7c13 Ref Guide: escape non-attributes to avoid conversion warnings
add ebb980f SOLR-14856: Adding docker test to github workflow. (#1859)
add 5e034d7 SOLR-14824: remove cruft from the ref-guide gradle build and simpliy the publish process
add ab3f1f0 SOLR-14876: Upgrade to zookeeper 3.6.2
add f6e8bc8 SOLR-14878: Expose solr.xml's coreRootDirectory property via the System Settings API (#1894)
add 3664182 SOLR-14879: address TestPackages test failures (#1895)
add aa071f7 SOLR-14824: Hotfix for escaping windows paths. IMHO, the template appraoch is not good, we should take care of escaping other props, too
add fa756b1 SOLR-14802: geodist: Support most spatial field types as an arg FunctionQParser: overload parseValueSourceList with flags
add 64ca559 SOLR-14879: address TestPackages test failures
add 73c06e3 SOLR-14881: ManagedSchemaRoundRobinCloudTest test failures
add da2714c SOLR-9607: Finalize move of Terms component and request handler into the implicit definitions (#1897)
add 9a6ca2d SOLR-14859: Set fieldType defaults for DateRangeField
add f1921b9 Improve TestConfigSetsAPI (#1892)
add da44d09 Adding dev-docs around the use of Git Worktree. (#1899)
add 4087958 SOLR-14884: TestContainerPlugin.testApiFromPackage jenkins failures
add 91b6223 SOLR-14878: Expose coreRootDirectory via API (Correction to make name shorter and always return value)
add d898eda SOLR-14840: Overseer doc in asciidoc
new 6253927 Merge branch 'master' into jira/solr-14749
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/docker-test.yml | 32 +
.gitignore | 1 -
build.gradle | 2 +-
dev-docs/working-between-major-versions.adoc | 63 +
gradle/documentation/render-javadoc.gradle | 7 -
gradle/generation/javacc.gradle | 57 +-
gradle/maven/defaults-maven.gradle | 1 -
lucene/CHANGES.txt | 7 +
.../compressing/CompressingStoredFieldsReader.java | 68 +-
.../compressing/CompressingStoredFieldsWriter.java | 13 +-
.../compressing/CompressingTermVectorsReader.java | 32 +-
.../compressing/CompressingTermVectorsWriter.java | 15 +-
.../lucene87/Lucene87StoredFieldsFormat.java | 4 +-
.../org/apache/lucene/document/ShapeQuery.java | 95 +-
.../lucene/index/DocumentsWriterFlushControl.java | 2 +-
.../lucene/index/DocumentsWriterPerThread.java | 6 +-
.../standard/parser => charstream}/CharStream.java | 42 +-
.../parser => charstream}/FastCharStream.java | 47 +-
.../queryparser/charstream/package-info.java | 24 +-
.../lucene/queryparser/classic/CharStream.java | 115 --
.../lucene/queryparser/classic/FastCharStream.java | 141 --
.../lucene/queryparser/classic/ParseException.java | 36 +-
.../lucene/queryparser/classic/QueryParser.java | 735 +++++-----
.../lucene/queryparser/classic/QueryParser.jj | 2 +
.../queryparser/classic/QueryParserBase.java | 2 +
.../classic/QueryParserTokenManager.java | 440 +++---
.../apache/lucene/queryparser/classic/Token.java | 5 +-
.../lucene/queryparser/classic/TokenMgrError.java | 22 +-
.../flexible/standard/nodes/RegexpQueryNode.java | 14 +-
.../flexible/standard/parser/FastCharStream.java | 141 --
.../flexible/standard/parser/ParseException.java | 36 +-
.../standard/parser/StandardSyntaxParser.java | 1402 +++++++++----------
.../standard/parser/StandardSyntaxParser.jj | 760 +++++------
.../parser/StandardSyntaxParserConstants.java | 24 +-
.../parser/StandardSyntaxParserTokenManager.java | 619 ++++-----
.../flexible/standard/parser/Token.java | 5 +-
.../flexible/standard/parser/TokenMgrError.java | 22 +-
.../queryparser/surround/parser/CharStream.java | 115 --
.../surround/parser/ParseException.java | 36 +-
.../queryparser/surround/parser/QueryParser.java | 580 ++++----
.../queryparser/surround/parser/QueryParser.jj | 2 +
.../surround/parser/QueryParserTokenManager.java | 306 +++--
.../lucene/queryparser/surround/parser/Token.java | 5 +-
.../queryparser/surround/parser/TokenMgrError.java | 22 +-
.../queryparser/classic/TestQueryParser.java | 1 +
.../precedence/TestPrecedenceQueryParser.java | 1 -
.../flexible/standard/TestQPHelper.java | 15 +-
.../queryparser/util/QueryParserTestBase.java | 1 -
.../TestCompressingStoredFieldsFormat.java | 3 +-
.../TestCompressingTermVectorsFormat.java | 2 +-
settings.gradle | 1 -
solr/CHANGES.txt | 16 +
solr/contrib/velocity/build.gradle | 33 -
.../java/org/apache/solr/response/PageTool.java | 92 --
.../solr/response/SolrVelocityResourceLoader.java | 61 -
.../solr/response/VelocityResponseWriter.java | 468 -------
.../src/java/org/apache/solr/response/package.html | 23 -
solr/contrib/velocity/src/java/overview.html | 21 -
.../velocity/src/resources/VM_global_library.vm | 4 -
solr/contrib/velocity/src/resources/_macros.vm | 70 -
solr/contrib/velocity/src/resources/macros.vm | 3 -
.../velocity/src/resources/velocity/_default.vm | 14 -
.../velocity/src/resources/velocity/browse.vm | 73 -
.../velocity/src/resources/velocity/error.vm | 4 -
.../velocity/src/resources/velocity/facets.vm | 23 -
.../velocity/src/resources/velocity/footer.vm | 19 -
.../velocity/src/resources/velocity/head.vm | 185 ---
.../contrib/velocity/src/resources/velocity/hit.vm | 27 -
.../velocity/src/resources/velocity/layout.vm | 19 -
.../src/resources/velocity/resources.properties | 6 -
.../src/resources/velocity/results_list.vm | 3 -
.../velocity/src/test-files/velocity/file.vm | 1 -
.../velocity/solr/collection1/conf/solrconfig.xml | 52 -
.../solr/collection1/conf/velocity-init.properties | 18 -
.../collection1/conf/velocity/VM_global_library.vm | 3 -
.../solr/collection1/conf/velocity/encoding.vm | 1 -
.../solr/collection1/conf/velocity/layout.vm | 1 -
.../solr/collection1/conf/velocity/locale.vm | 1 -
.../collection1/conf/velocity/locale_number.vm | 1 -
.../solr/collection1/conf/velocity/macros.vm | 3 -
.../solr/collection1/conf/velocity/numFound.vm | 1 -
.../collection1/conf/velocity/outside_the_box.vm | 4 -
.../solr/collection1/conf/velocity/resource_get.vm | 1 -
.../conf/velocity/sandbox_intersection.vm | 5 -
.../conf/velocity/test_macro_legacy_support.vm | 1 -
.../conf/velocity/test_macro_overridden.vm | 1 -
.../conf/velocity/test_macro_visible.vm | 1 -
solr/contrib/velocity/src/test/custom_tool.vm | 19 -
solr/contrib/velocity/src/test/foreach.vm | 14 -
.../solr/velocity/VelocityResponseWriterTest.java | 318 -----
.../src/test/velocity/resources.properties | 18 -
.../src/test/velocity/resources_en_UK.properties | 18 -
.../apache/solr/api/CustomContainerPlugins.java | 24 +-
.../cluster/placement/PlacementPluginConfig.java | 4 +-
.../SamplePluginAffinityReplicaPlacement.java | 2 +-
.../java/org/apache/solr/core/CoreContainer.java | 1 +
.../apache/solr/core/DelegatingEventListener.java | 55 +
.../src/java/org/apache/solr/core/PluginBag.java | 7 +-
.../src/java/org/apache/solr/core/SolrCore.java | 47 +-
.../java/org/apache/solr/handler/ClusterAPI.java | 27 +-
.../org/apache/solr/handler/StreamHandler.java | 2 +-
.../solr/handler/admin/SystemInfoHandler.java | 7 +-
.../java/org/apache/solr/parser/CharStream.java | 115 --
.../org/apache/solr/parser/FastCharStream.java | 148 --
.../org/apache/solr/parser/ParseException.java | 36 +-
.../java/org/apache/solr/parser/QueryParser.java | 765 ++++++-----
.../src/java/org/apache/solr/parser/QueryParser.jj | 2 +
.../solr/parser/QueryParserTokenManager.java | 542 ++++----
.../apache/solr/parser/SolrQueryParserBase.java | 2 +
.../src/java/org/apache/solr/parser/Token.java | 5 +-
.../java/org/apache/solr/parser/TokenMgrError.java | 22 +-
.../src/java/org/apache/solr/pkg/PackageAPI.java | 46 +-
.../java/org/apache/solr/pkg/PackageLoader.java | 8 +
.../org/apache/solr/pkg/PackagePluginHolder.java | 18 +-
.../schema/AbstractSpatialPrefixTreeFieldType.java | 67 +
.../org/apache/solr/search/FunctionQParser.java | 14 +-
.../distance/GeoDistValueSourceParser.java | 68 +-
.../java/org/apache/solr/update/UpdateHandler.java | 6 +-
solr/core/src/resources/ImplicitPlugins.json | 6 +-
...bad-schema-daterangefield-instance-options.xml} | 21 +-
.../bad-schema-daterangefield-type-options.xml} | 37 +-
.../solr/collection1/conf/solrconfig-minhash.xml | 11 +-
.../collection1/conf/solrconfig-plugcollector.xml | 9 +-
.../solr/collection1/conf/solrconfig.xml | 4 +-
.../solr/configsets/schema-package/conf/schema.xml | 50 +
.../conf/solrconfig.xml | 0
.../TestReversedWildcardFilterFactory.java | 2 +-
.../org/apache/solr/cloud/TestConfigSetsAPI.java | 291 ++--
.../component/DistributedTermsComponentTest.java | 32 +-
.../solr/handler/component/TermsComponentTest.java | 58 +-
.../solr/parser/SolrQueryParserBaseTest.java | 1 +
.../src/test/org/apache/solr/pkg/TestPackages.java | 54 +-
.../org/apache/solr/schema/BadIndexSchemaTest.java | 5 +
.../org/apache/solr/schema/DateRangeFieldTest.java | 4 +
.../solr/schema/SpatialRPTFieldTypeTest.java | 3 +-
.../org/apache/solr/search/TestSolr4Spatial2.java | 78 +-
.../solr/update/TestNestedUpdateProcessor.java | 2 +-
.../overseer/images/configSet-processor-flow.png | Bin 0 -> 37427 bytes
solr/dev-docs/overseer/images/locking-levels.png | Bin 0 -> 9474 bytes
.../overseer/images/session-lockTree-20nodes.png | Bin 0 -> 7608 bytes
.../dev-docs/overseer/images/session-lockTree1.png | Bin 0 -> 4368 bytes
.../dev-docs/overseer/images/session-lockTree2.png | Bin 0 -> 4515 bytes
.../images/single-thread-clusterstate-updater.png | Bin 0 -> 18235 bytes
.../overseer/images/state-change-steps.png | Bin 0 -> 267439 bytes
solr/dev-docs/overseer/overseer.adoc | 683 ++++++++++
solr/example/files/README.md | 167 ---
.../browse-resources/velocity/resources.properties | 82 --
.../velocity/resources_de_DE.properties | 18 -
.../velocity/resources_fr_FR.properties | 20 -
solr/example/files/conf/currency.xml | 67 -
solr/example/files/conf/email_url_types.txt | 2 -
solr/example/files/conf/lang/contractions_ca.txt | 8 -
solr/example/files/conf/lang/contractions_fr.txt | 15 -
solr/example/files/conf/lang/contractions_ga.txt | 5 -
solr/example/files/conf/lang/contractions_it.txt | 23 -
solr/example/files/conf/lang/hyphenations_ga.txt | 5 -
solr/example/files/conf/lang/stemdict_nl.txt | 6 -
solr/example/files/conf/lang/stoptags_ja.txt | 420 ------
solr/example/files/conf/lang/stopwords_ar.txt | 125 --
solr/example/files/conf/lang/stopwords_bg.txt | 193 ---
solr/example/files/conf/lang/stopwords_ca.txt | 220 ---
solr/example/files/conf/lang/stopwords_cz.txt | 172 ---
solr/example/files/conf/lang/stopwords_da.txt | 110 --
solr/example/files/conf/lang/stopwords_de.txt | 294 ----
solr/example/files/conf/lang/stopwords_el.txt | 78 --
solr/example/files/conf/lang/stopwords_en.txt | 54 -
solr/example/files/conf/lang/stopwords_es.txt | 356 -----
solr/example/files/conf/lang/stopwords_eu.txt | 99 --
solr/example/files/conf/lang/stopwords_fa.txt | 313 -----
solr/example/files/conf/lang/stopwords_fi.txt | 97 --
solr/example/files/conf/lang/stopwords_fr.txt | 186 ---
solr/example/files/conf/lang/stopwords_ga.txt | 110 --
solr/example/files/conf/lang/stopwords_gl.txt | 161 ---
solr/example/files/conf/lang/stopwords_hi.txt | 235 ----
solr/example/files/conf/lang/stopwords_hu.txt | 211 ---
solr/example/files/conf/lang/stopwords_hy.txt | 46 -
solr/example/files/conf/lang/stopwords_id.txt | 359 -----
solr/example/files/conf/lang/stopwords_it.txt | 303 -----
solr/example/files/conf/lang/stopwords_ja.txt | 127 --
solr/example/files/conf/lang/stopwords_lv.txt | 172 ---
solr/example/files/conf/lang/stopwords_nl.txt | 119 --
solr/example/files/conf/lang/stopwords_no.txt | 194 ---
solr/example/files/conf/lang/stopwords_pt.txt | 253 ----
solr/example/files/conf/lang/stopwords_ro.txt | 233 ----
solr/example/files/conf/lang/stopwords_ru.txt | 243 ----
solr/example/files/conf/lang/stopwords_sv.txt | 133 --
solr/example/files/conf/lang/stopwords_th.txt | 119 --
solr/example/files/conf/lang/stopwords_tr.txt | 212 ---
solr/example/files/conf/lang/userdict_ja.txt | 29 -
solr/example/files/conf/managed-schema | 520 -------
solr/example/files/conf/params.json | 34 -
solr/example/files/conf/protwords.txt | 21 -
solr/example/files/conf/solrconfig.xml | 1423 --------------------
solr/example/files/conf/stopwords.txt | 14 -
solr/example/files/conf/synonyms.txt | 29 -
solr/example/files/conf/update-script.js | 115 --
solr/example/files/conf/velocity/browse.vm | 32 -
solr/example/files/conf/velocity/dropit.js | 0
solr/example/files/conf/velocity/facet_doc_type.vm | 2 -
.../files/conf/velocity/facet_text_shingles.vm | 12 -
solr/example/files/conf/velocity/facets.vm | 24 -
solr/example/files/conf/velocity/footer.vm | 29 -
solr/example/files/conf/velocity/head.vm | 290 ----
solr/example/files/conf/velocity/hit.vm | 77 --
.../files/conf/velocity/img/english_640.png | Bin 138412 -> 0 bytes
.../example/files/conf/velocity/img/france_640.png | Bin 99992 -> 0 bytes
.../files/conf/velocity/img/germany_640.png | Bin 105271 -> 0 bytes
solr/example/files/conf/velocity/img/globe_256.png | Bin 46622 -> 0 bytes
.../files/conf/velocity/jquery.tx3-tag-cloud.js | 0
solr/example/files/conf/velocity/js/dropit.js | 97 --
.../files/conf/velocity/js/jquery.autocomplete.js | 763 -----------
.../files/conf/velocity/js/jquery.tx3-tag-cloud.js | 70 -
solr/example/files/conf/velocity/layout.vm | 42 -
solr/example/files/conf/velocity/macros.vm | 16 -
.../example/files/conf/velocity/mime_type_lists.vm | 68 -
solr/example/files/conf/velocity/results.vm | 20 -
solr/example/files/conf/velocity/results_list.vm | 21 -
solr/licenses/velocity-engine-core-2.0.jar.sha1 | 1 -
solr/licenses/velocity-engine-core-LICENSE-ASL.txt | 202 ---
solr/licenses/velocity-engine-core-NOTICE.txt | 7 -
solr/licenses/velocity-tools-generic-3.0.jar.sha1 | 1 -
.../velocity-tools-generic-LICENSE-ASL.txt | 201 ---
solr/licenses/velocity-tools-generic-NOTICE.txt | 12 -
solr/licenses/velocity-tools-view-3.0.jar.sha1 | 1 -
solr/licenses/velocity-tools-view-LICENSE-ASL.txt | 201 ---
solr/licenses/velocity-tools-view-NOTICE.txt | 12 -
solr/licenses/velocity-tools-view-jsp-3.0.jar.sha1 | 1 -
.../velocity-tools-view-jsp-LICENSE-ASL.txt | 201 ---
solr/licenses/velocity-tools-view-jsp-NOTICE.txt | 12 -
solr/licenses/zookeeper-3.6.1.jar.sha1 | 1 -
solr/licenses/zookeeper-3.6.2.jar.sha1 | 1 +
solr/licenses/zookeeper-jute-3.6.1.jar.sha1 | 1 -
solr/licenses/zookeeper-jute-3.6.2.jar.sha1 | 1 +
solr/packaging/build.gradle | 1 -
.../solr/configsets/_default/conf/solrconfig.xml | 21 +-
.../conf/solrconfig.xml | 133 +-
.../conf/velocity/README.md | 116 --
.../conf/velocity/VM_global_library.vm | 186 ---
.../conf/velocity/browse.vm | 33 -
.../conf/velocity/cluster.vm | 19 -
.../conf/velocity/cluster_results.vm | 31 -
.../conf/velocity/debug.vm | 28 -
.../conf/velocity/did_you_mean.vm | 11 -
.../conf/velocity/error.vm | 11 -
.../conf/velocity/facet_fields.vm | 24 -
.../conf/velocity/facet_pivot.vm | 12 -
.../conf/velocity/facet_queries.vm | 12 -
.../conf/velocity/facet_ranges.vm | 23 -
.../conf/velocity/facets.vm | 10 -
.../conf/velocity/footer.vm | 43 -
.../conf/velocity/head.vm | 37 -
.../conf/velocity/header.vm | 7 -
.../conf/velocity/hit.vm | 25 -
.../conf/velocity/hit_grouped.vm | 43 -
.../conf/velocity/hit_plain.vm | 25 -
.../conf/velocity/join_doc.vm | 20 -
.../conf/velocity/jquery.autocomplete.css | 48 -
.../conf/velocity/jquery.autocomplete.js | 763 -----------
.../conf/velocity/layout.vm | 24 -
.../conf/velocity/main.css | 231 ----
.../conf/velocity/mime_type_lists.vm | 68 -
.../conf/velocity/pagination_bottom.vm | 22 -
.../conf/velocity/pagination_top.vm | 29 -
.../conf/velocity/product_doc.vm | 32 -
.../conf/velocity/query.vm | 42 -
.../conf/velocity/query_form.vm | 64 -
.../conf/velocity/query_group.vm | 43 -
.../conf/velocity/query_spatial.vm | 75 --
.../conf/velocity/results_list.vm | 22 -
.../conf/velocity/richtext_doc.vm | 153 ---
.../conf/velocity/suggest.vm | 8 -
.../conf/velocity/tabs.vm | 50 -
solr/solr-ref-guide/build.gradle | 171 +--
solr/solr-ref-guide/src/_config.yml.template | 34 +-
solr/solr-ref-guide/src/_includes/footer.html | 2 +-
solr/solr-ref-guide/src/_includes/head.html | 3 +-
solr/solr-ref-guide/src/css/navs.css | 2 +-
solr/solr-ref-guide/src/libs.adoc | 2 -
solr/solr-ref-guide/src/meta-docs/publish.adoc | 8 +-
...andlers-and-searchcomponents-in-solrconfig.adoc | 4 +-
solr/solr-ref-guide/src/response-writers.adoc | 10 +-
solr/solr-ref-guide/src/searching.adoc | 2 -
.../src/the-query-elevation-component.adoc | 3 +-
solr/solr-ref-guide/src/the-terms-component.adoc | 56 +-
.../src/velocity-response-writer.adoc | 122 --
solr/solr-ref-guide/src/velocity-search-ui.adoc | 26 -
.../solrj/request/beans/ClusterPropInfo.java | 2 +-
.../apache/solr/cloud/MiniSolrCloudCluster.java | 9 +-
versions.lock | 16 +-
versions.props | 4 +-
290 files changed, 5156 insertions(+), 20000 deletions(-)
create mode 100644 .github/workflows/docker-test.yml
create mode 100644 dev-docs/working-between-major-versions.adoc
rename lucene/queryparser/src/java/org/apache/lucene/queryparser/{flexible/standard/parser => charstream}/CharStream.java (78%)
rename lucene/queryparser/src/java/org/apache/lucene/queryparser/{surround/parser => charstream}/FastCharStream.java (79%)
rename solr/contrib/velocity/src/test/org/apache/solr/velocity/MockTool.java => lucene/queryparser/src/java/org/apache/lucene/queryparser/charstream/package-info.java (67%)
delete mode 100644 lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/CharStream.java
delete mode 100644 lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/FastCharStream.java
delete mode 100644 lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/FastCharStream.java
delete mode 100644 lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/CharStream.java
delete mode 100644 solr/contrib/velocity/build.gradle
delete mode 100644 solr/contrib/velocity/src/java/org/apache/solr/response/PageTool.java
delete mode 100644 solr/contrib/velocity/src/java/org/apache/solr/response/SolrVelocityResourceLoader.java
delete mode 100644 solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java
delete mode 100644 solr/contrib/velocity/src/java/org/apache/solr/response/package.html
delete mode 100644 solr/contrib/velocity/src/java/overview.html
delete mode 100644 solr/contrib/velocity/src/resources/VM_global_library.vm
delete mode 100644 solr/contrib/velocity/src/resources/_macros.vm
delete mode 100644 solr/contrib/velocity/src/resources/macros.vm
delete mode 100644 solr/contrib/velocity/src/resources/velocity/_default.vm
delete mode 100644 solr/contrib/velocity/src/resources/velocity/browse.vm
delete mode 100644 solr/contrib/velocity/src/resources/velocity/error.vm
delete mode 100644 solr/contrib/velocity/src/resources/velocity/facets.vm
delete mode 100644 solr/contrib/velocity/src/resources/velocity/footer.vm
delete mode 100644 solr/contrib/velocity/src/resources/velocity/head.vm
delete mode 100644 solr/contrib/velocity/src/resources/velocity/hit.vm
delete mode 100644 solr/contrib/velocity/src/resources/velocity/layout.vm
delete mode 100644 solr/contrib/velocity/src/resources/velocity/resources.properties
delete mode 100644 solr/contrib/velocity/src/resources/velocity/results_list.vm
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/file.vm
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/solrconfig.xml
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/velocity-init.properties
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/velocity/VM_global_library.vm
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/velocity/encoding.vm
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/velocity/layout.vm
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/velocity/locale.vm
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/velocity/locale_number.vm
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/velocity/macros.vm
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/velocity/numFound.vm
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/velocity/outside_the_box.vm
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/velocity/resource_get.vm
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/velocity/sandbox_intersection.vm
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/velocity/test_macro_legacy_support.vm
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/velocity/test_macro_overridden.vm
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/velocity/test_macro_visible.vm
delete mode 100644 solr/contrib/velocity/src/test/custom_tool.vm
delete mode 100644 solr/contrib/velocity/src/test/foreach.vm
delete mode 100644 solr/contrib/velocity/src/test/org/apache/solr/velocity/VelocityResponseWriterTest.java
delete mode 100644 solr/contrib/velocity/src/test/velocity/resources.properties
delete mode 100644 solr/contrib/velocity/src/test/velocity/resources_en_UK.properties
create mode 100644 solr/core/src/java/org/apache/solr/core/DelegatingEventListener.java
delete mode 100644 solr/core/src/java/org/apache/solr/parser/CharStream.java
delete mode 100644 solr/core/src/java/org/apache/solr/parser/FastCharStream.java
rename solr/{contrib/velocity/src/test-files/velocity/solr/collection1/conf/schema.xml => core/src/test-files/solr/collection1/conf/bad-schema-daterangefield-instance-options.xml} (52%)
rename solr/{example/files/conf/elevate.xml => core/src/test-files/solr/collection1/conf/bad-schema-daterangefield-type-options.xml} (51%)
create mode 100644 solr/core/src/test-files/solr/configsets/schema-package/conf/schema.xml
copy solr/core/src/test-files/solr/configsets/{cloud-minimal => schema-package}/conf/solrconfig.xml (100%)
create mode 100755 solr/dev-docs/overseer/images/configSet-processor-flow.png
create mode 100755 solr/dev-docs/overseer/images/locking-levels.png
create mode 100755 solr/dev-docs/overseer/images/session-lockTree-20nodes.png
create mode 100755 solr/dev-docs/overseer/images/session-lockTree1.png
create mode 100755 solr/dev-docs/overseer/images/session-lockTree2.png
create mode 100755 solr/dev-docs/overseer/images/single-thread-clusterstate-updater.png
create mode 100755 solr/dev-docs/overseer/images/state-change-steps.png
create mode 100644 solr/dev-docs/overseer/overseer.adoc
delete mode 100644 solr/example/files/README.md
delete mode 100644 solr/example/files/browse-resources/velocity/resources.properties
delete mode 100644 solr/example/files/browse-resources/velocity/resources_de_DE.properties
delete mode 100644 solr/example/files/browse-resources/velocity/resources_fr_FR.properties
delete mode 100644 solr/example/files/conf/currency.xml
delete mode 100644 solr/example/files/conf/email_url_types.txt
delete mode 100644 solr/example/files/conf/lang/contractions_ca.txt
delete mode 100644 solr/example/files/conf/lang/contractions_fr.txt
delete mode 100644 solr/example/files/conf/lang/contractions_ga.txt
delete mode 100644 solr/example/files/conf/lang/contractions_it.txt
delete mode 100644 solr/example/files/conf/lang/hyphenations_ga.txt
delete mode 100644 solr/example/files/conf/lang/stemdict_nl.txt
delete mode 100644 solr/example/files/conf/lang/stoptags_ja.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_ar.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_bg.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_ca.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_cz.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_da.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_de.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_el.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_en.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_es.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_eu.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_fa.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_fi.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_fr.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_ga.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_gl.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_hi.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_hu.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_hy.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_id.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_it.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_ja.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_lv.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_nl.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_no.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_pt.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_ro.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_ru.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_sv.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_th.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_tr.txt
delete mode 100644 solr/example/files/conf/lang/userdict_ja.txt
delete mode 100644 solr/example/files/conf/managed-schema
delete mode 100644 solr/example/files/conf/params.json
delete mode 100644 solr/example/files/conf/protwords.txt
delete mode 100644 solr/example/files/conf/solrconfig.xml
delete mode 100644 solr/example/files/conf/stopwords.txt
delete mode 100644 solr/example/files/conf/synonyms.txt
delete mode 100644 solr/example/files/conf/update-script.js
delete mode 100644 solr/example/files/conf/velocity/browse.vm
delete mode 100644 solr/example/files/conf/velocity/dropit.js
delete mode 100644 solr/example/files/conf/velocity/facet_doc_type.vm
delete mode 100644 solr/example/files/conf/velocity/facet_text_shingles.vm
delete mode 100644 solr/example/files/conf/velocity/facets.vm
delete mode 100644 solr/example/files/conf/velocity/footer.vm
delete mode 100644 solr/example/files/conf/velocity/head.vm
delete mode 100644 solr/example/files/conf/velocity/hit.vm
delete mode 100644 solr/example/files/conf/velocity/img/english_640.png
delete mode 100644 solr/example/files/conf/velocity/img/france_640.png
delete mode 100644 solr/example/files/conf/velocity/img/germany_640.png
delete mode 100644 solr/example/files/conf/velocity/img/globe_256.png
delete mode 100644 solr/example/files/conf/velocity/jquery.tx3-tag-cloud.js
delete mode 100644 solr/example/files/conf/velocity/js/dropit.js
delete mode 100644 solr/example/files/conf/velocity/js/jquery.autocomplete.js
delete mode 100644 solr/example/files/conf/velocity/js/jquery.tx3-tag-cloud.js
delete mode 100644 solr/example/files/conf/velocity/layout.vm
delete mode 100644 solr/example/files/conf/velocity/macros.vm
delete mode 100644 solr/example/files/conf/velocity/mime_type_lists.vm
delete mode 100644 solr/example/files/conf/velocity/results.vm
delete mode 100644 solr/example/files/conf/velocity/results_list.vm
delete mode 100644 solr/licenses/velocity-engine-core-2.0.jar.sha1
delete mode 100644 solr/licenses/velocity-engine-core-LICENSE-ASL.txt
delete mode 100644 solr/licenses/velocity-engine-core-NOTICE.txt
delete mode 100644 solr/licenses/velocity-tools-generic-3.0.jar.sha1
delete mode 100644 solr/licenses/velocity-tools-generic-LICENSE-ASL.txt
delete mode 100644 solr/licenses/velocity-tools-generic-NOTICE.txt
delete mode 100644 solr/licenses/velocity-tools-view-3.0.jar.sha1
delete mode 100644 solr/licenses/velocity-tools-view-LICENSE-ASL.txt
delete mode 100644 solr/licenses/velocity-tools-view-NOTICE.txt
delete mode 100644 solr/licenses/velocity-tools-view-jsp-3.0.jar.sha1
delete mode 100644 solr/licenses/velocity-tools-view-jsp-LICENSE-ASL.txt
delete mode 100644 solr/licenses/velocity-tools-view-jsp-NOTICE.txt
delete mode 100644 solr/licenses/zookeeper-3.6.1.jar.sha1
create mode 100644 solr/licenses/zookeeper-3.6.2.jar.sha1
delete mode 100644 solr/licenses/zookeeper-jute-3.6.1.jar.sha1
create mode 100644 solr/licenses/zookeeper-jute-3.6.2.jar.sha1
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/README.md
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/VM_global_library.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/browse.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/cluster.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/cluster_results.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/debug.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/did_you_mean.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/error.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/facet_fields.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/facet_pivot.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/facet_queries.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/facet_ranges.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/facets.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/footer.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/head.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/header.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/hit.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/hit_grouped.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/hit_plain.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/join_doc.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/jquery.autocomplete.css
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/jquery.autocomplete.js
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/layout.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/main.css
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/mime_type_lists.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/pagination_bottom.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/pagination_top.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/product_doc.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/query.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/query_form.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/query_group.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/query_spatial.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/results_list.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/richtext_doc.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/suggest.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/tabs.vm
delete mode 100644 solr/solr-ref-guide/src/velocity-response-writer.adoc
delete mode 100644 solr/solr-ref-guide/src/velocity-search-ui.adoc
[lucene-solr] 01/01: Merge branch 'master' into jira/solr-14749
Posted by ab...@apache.org.
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 62539271604000955ab0c3ae4e110c18767cd83a
Merge: efb51c2 d898eda
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Tue Sep 22 11:23:08 2020 +0200
Merge branch 'master' into jira/solr-14749
.github/workflows/docker-test.yml | 32 +
.gitignore | 1 -
build.gradle | 2 +-
dev-docs/working-between-major-versions.adoc | 63 +
gradle/documentation/render-javadoc.gradle | 7 -
gradle/generation/javacc.gradle | 57 +-
gradle/maven/defaults-maven.gradle | 1 -
lucene/CHANGES.txt | 7 +
.../compressing/CompressingStoredFieldsReader.java | 68 +-
.../compressing/CompressingStoredFieldsWriter.java | 13 +-
.../compressing/CompressingTermVectorsReader.java | 32 +-
.../compressing/CompressingTermVectorsWriter.java | 15 +-
.../lucene87/Lucene87StoredFieldsFormat.java | 4 +-
.../org/apache/lucene/document/ShapeQuery.java | 95 +-
.../lucene/index/DocumentsWriterFlushControl.java | 2 +-
.../lucene/index/DocumentsWriterPerThread.java | 6 +-
.../standard/parser => charstream}/CharStream.java | 42 +-
.../parser => charstream}/FastCharStream.java | 47 +-
.../queryparser/charstream/package-info.java | 24 +-
.../lucene/queryparser/classic/CharStream.java | 115 --
.../lucene/queryparser/classic/FastCharStream.java | 141 --
.../lucene/queryparser/classic/ParseException.java | 36 +-
.../lucene/queryparser/classic/QueryParser.java | 735 +++++-----
.../lucene/queryparser/classic/QueryParser.jj | 2 +
.../queryparser/classic/QueryParserBase.java | 2 +
.../classic/QueryParserTokenManager.java | 440 +++---
.../apache/lucene/queryparser/classic/Token.java | 5 +-
.../lucene/queryparser/classic/TokenMgrError.java | 22 +-
.../flexible/standard/nodes/RegexpQueryNode.java | 14 +-
.../flexible/standard/parser/FastCharStream.java | 141 --
.../flexible/standard/parser/ParseException.java | 36 +-
.../standard/parser/StandardSyntaxParser.java | 1402 +++++++++----------
.../standard/parser/StandardSyntaxParser.jj | 760 +++++------
.../parser/StandardSyntaxParserConstants.java | 24 +-
.../parser/StandardSyntaxParserTokenManager.java | 619 ++++-----
.../flexible/standard/parser/Token.java | 5 +-
.../flexible/standard/parser/TokenMgrError.java | 22 +-
.../queryparser/surround/parser/CharStream.java | 115 --
.../surround/parser/ParseException.java | 36 +-
.../queryparser/surround/parser/QueryParser.java | 580 ++++----
.../queryparser/surround/parser/QueryParser.jj | 2 +
.../surround/parser/QueryParserTokenManager.java | 306 +++--
.../lucene/queryparser/surround/parser/Token.java | 5 +-
.../queryparser/surround/parser/TokenMgrError.java | 22 +-
.../queryparser/classic/TestQueryParser.java | 1 +
.../precedence/TestPrecedenceQueryParser.java | 1 -
.../flexible/standard/TestQPHelper.java | 15 +-
.../queryparser/util/QueryParserTestBase.java | 1 -
.../TestCompressingStoredFieldsFormat.java | 3 +-
.../TestCompressingTermVectorsFormat.java | 2 +-
settings.gradle | 1 -
solr/CHANGES.txt | 16 +
solr/contrib/velocity/build.gradle | 33 -
.../java/org/apache/solr/response/PageTool.java | 92 --
.../solr/response/SolrVelocityResourceLoader.java | 61 -
.../solr/response/VelocityResponseWriter.java | 468 -------
.../src/java/org/apache/solr/response/package.html | 23 -
solr/contrib/velocity/src/java/overview.html | 21 -
.../velocity/src/resources/VM_global_library.vm | 4 -
solr/contrib/velocity/src/resources/_macros.vm | 70 -
solr/contrib/velocity/src/resources/macros.vm | 3 -
.../velocity/src/resources/velocity/_default.vm | 14 -
.../velocity/src/resources/velocity/browse.vm | 73 -
.../velocity/src/resources/velocity/error.vm | 4 -
.../velocity/src/resources/velocity/facets.vm | 23 -
.../velocity/src/resources/velocity/footer.vm | 19 -
.../velocity/src/resources/velocity/head.vm | 185 ---
.../contrib/velocity/src/resources/velocity/hit.vm | 27 -
.../velocity/src/resources/velocity/layout.vm | 19 -
.../src/resources/velocity/resources.properties | 6 -
.../src/resources/velocity/results_list.vm | 3 -
.../velocity/src/test-files/velocity/file.vm | 1 -
.../velocity/solr/collection1/conf/solrconfig.xml | 52 -
.../solr/collection1/conf/velocity-init.properties | 18 -
.../collection1/conf/velocity/VM_global_library.vm | 3 -
.../solr/collection1/conf/velocity/encoding.vm | 1 -
.../solr/collection1/conf/velocity/layout.vm | 1 -
.../solr/collection1/conf/velocity/locale.vm | 1 -
.../collection1/conf/velocity/locale_number.vm | 1 -
.../solr/collection1/conf/velocity/macros.vm | 3 -
.../solr/collection1/conf/velocity/numFound.vm | 1 -
.../collection1/conf/velocity/outside_the_box.vm | 4 -
.../solr/collection1/conf/velocity/resource_get.vm | 1 -
.../conf/velocity/sandbox_intersection.vm | 5 -
.../conf/velocity/test_macro_legacy_support.vm | 1 -
.../conf/velocity/test_macro_overridden.vm | 1 -
.../conf/velocity/test_macro_visible.vm | 1 -
solr/contrib/velocity/src/test/custom_tool.vm | 19 -
solr/contrib/velocity/src/test/foreach.vm | 14 -
.../solr/velocity/VelocityResponseWriterTest.java | 318 -----
.../src/test/velocity/resources.properties | 18 -
.../src/test/velocity/resources_en_UK.properties | 18 -
.../apache/solr/api/CustomContainerPlugins.java | 24 +-
.../cluster/placement/PlacementPluginConfig.java | 4 +-
.../SamplePluginAffinityReplicaPlacement.java | 2 +-
.../java/org/apache/solr/core/CoreContainer.java | 1 +
.../apache/solr/core/DelegatingEventListener.java | 55 +
.../src/java/org/apache/solr/core/PluginBag.java | 7 +-
.../src/java/org/apache/solr/core/SolrCore.java | 47 +-
.../java/org/apache/solr/handler/ClusterAPI.java | 27 +-
.../org/apache/solr/handler/StreamHandler.java | 2 +-
.../solr/handler/admin/SystemInfoHandler.java | 7 +-
.../java/org/apache/solr/parser/CharStream.java | 115 --
.../org/apache/solr/parser/FastCharStream.java | 148 --
.../org/apache/solr/parser/ParseException.java | 36 +-
.../java/org/apache/solr/parser/QueryParser.java | 765 ++++++-----
.../src/java/org/apache/solr/parser/QueryParser.jj | 2 +
.../solr/parser/QueryParserTokenManager.java | 542 ++++----
.../apache/solr/parser/SolrQueryParserBase.java | 2 +
.../src/java/org/apache/solr/parser/Token.java | 5 +-
.../java/org/apache/solr/parser/TokenMgrError.java | 22 +-
.../src/java/org/apache/solr/pkg/PackageAPI.java | 46 +-
.../java/org/apache/solr/pkg/PackageLoader.java | 8 +
.../org/apache/solr/pkg/PackagePluginHolder.java | 18 +-
.../schema/AbstractSpatialPrefixTreeFieldType.java | 67 +
.../org/apache/solr/search/FunctionQParser.java | 14 +-
.../distance/GeoDistValueSourceParser.java | 68 +-
.../java/org/apache/solr/update/UpdateHandler.java | 6 +-
solr/core/src/resources/ImplicitPlugins.json | 6 +-
...bad-schema-daterangefield-instance-options.xml} | 21 +-
.../bad-schema-daterangefield-type-options.xml} | 37 +-
.../solr/collection1/conf/solrconfig-minhash.xml | 11 +-
.../collection1/conf/solrconfig-plugcollector.xml | 9 +-
.../solr/collection1/conf/solrconfig.xml | 4 +-
.../solr/configsets/schema-package/conf/schema.xml | 50 +
.../configsets/schema-package/conf/solrconfig.xml | 51 +
.../TestReversedWildcardFilterFactory.java | 2 +-
.../org/apache/solr/cloud/TestConfigSetsAPI.java | 291 ++--
.../component/DistributedTermsComponentTest.java | 32 +-
.../solr/handler/component/TermsComponentTest.java | 58 +-
.../solr/parser/SolrQueryParserBaseTest.java | 1 +
.../src/test/org/apache/solr/pkg/TestPackages.java | 54 +-
.../org/apache/solr/schema/BadIndexSchemaTest.java | 5 +
.../org/apache/solr/schema/DateRangeFieldTest.java | 4 +
.../solr/schema/SpatialRPTFieldTypeTest.java | 3 +-
.../org/apache/solr/search/TestSolr4Spatial2.java | 78 +-
.../solr/update/TestNestedUpdateProcessor.java | 2 +-
.../overseer/images/configSet-processor-flow.png | Bin 0 -> 37427 bytes
solr/dev-docs/overseer/images/locking-levels.png | Bin 0 -> 9474 bytes
.../overseer/images/session-lockTree-20nodes.png | Bin 0 -> 7608 bytes
.../dev-docs/overseer/images/session-lockTree1.png | Bin 0 -> 4368 bytes
.../dev-docs/overseer/images/session-lockTree2.png | Bin 0 -> 4515 bytes
.../images/single-thread-clusterstate-updater.png | Bin 0 -> 18235 bytes
.../overseer/images/state-change-steps.png | Bin 0 -> 267439 bytes
solr/dev-docs/overseer/overseer.adoc | 683 ++++++++++
solr/example/files/README.md | 167 ---
.../browse-resources/velocity/resources.properties | 82 --
.../velocity/resources_de_DE.properties | 18 -
.../velocity/resources_fr_FR.properties | 20 -
solr/example/files/conf/currency.xml | 67 -
solr/example/files/conf/email_url_types.txt | 2 -
solr/example/files/conf/lang/contractions_ca.txt | 8 -
solr/example/files/conf/lang/contractions_fr.txt | 15 -
solr/example/files/conf/lang/contractions_ga.txt | 5 -
solr/example/files/conf/lang/contractions_it.txt | 23 -
solr/example/files/conf/lang/hyphenations_ga.txt | 5 -
solr/example/files/conf/lang/stemdict_nl.txt | 6 -
solr/example/files/conf/lang/stoptags_ja.txt | 420 ------
solr/example/files/conf/lang/stopwords_ar.txt | 125 --
solr/example/files/conf/lang/stopwords_bg.txt | 193 ---
solr/example/files/conf/lang/stopwords_ca.txt | 220 ---
solr/example/files/conf/lang/stopwords_cz.txt | 172 ---
solr/example/files/conf/lang/stopwords_da.txt | 110 --
solr/example/files/conf/lang/stopwords_de.txt | 294 ----
solr/example/files/conf/lang/stopwords_el.txt | 78 --
solr/example/files/conf/lang/stopwords_en.txt | 54 -
solr/example/files/conf/lang/stopwords_es.txt | 356 -----
solr/example/files/conf/lang/stopwords_eu.txt | 99 --
solr/example/files/conf/lang/stopwords_fa.txt | 313 -----
solr/example/files/conf/lang/stopwords_fi.txt | 97 --
solr/example/files/conf/lang/stopwords_fr.txt | 186 ---
solr/example/files/conf/lang/stopwords_ga.txt | 110 --
solr/example/files/conf/lang/stopwords_gl.txt | 161 ---
solr/example/files/conf/lang/stopwords_hi.txt | 235 ----
solr/example/files/conf/lang/stopwords_hu.txt | 211 ---
solr/example/files/conf/lang/stopwords_hy.txt | 46 -
solr/example/files/conf/lang/stopwords_id.txt | 359 -----
solr/example/files/conf/lang/stopwords_it.txt | 303 -----
solr/example/files/conf/lang/stopwords_ja.txt | 127 --
solr/example/files/conf/lang/stopwords_lv.txt | 172 ---
solr/example/files/conf/lang/stopwords_nl.txt | 119 --
solr/example/files/conf/lang/stopwords_no.txt | 194 ---
solr/example/files/conf/lang/stopwords_pt.txt | 253 ----
solr/example/files/conf/lang/stopwords_ro.txt | 233 ----
solr/example/files/conf/lang/stopwords_ru.txt | 243 ----
solr/example/files/conf/lang/stopwords_sv.txt | 133 --
solr/example/files/conf/lang/stopwords_th.txt | 119 --
solr/example/files/conf/lang/stopwords_tr.txt | 212 ---
solr/example/files/conf/lang/userdict_ja.txt | 29 -
solr/example/files/conf/managed-schema | 520 -------
solr/example/files/conf/params.json | 34 -
solr/example/files/conf/protwords.txt | 21 -
solr/example/files/conf/solrconfig.xml | 1423 --------------------
solr/example/files/conf/stopwords.txt | 14 -
solr/example/files/conf/synonyms.txt | 29 -
solr/example/files/conf/update-script.js | 115 --
solr/example/files/conf/velocity/browse.vm | 32 -
solr/example/files/conf/velocity/dropit.js | 0
solr/example/files/conf/velocity/facet_doc_type.vm | 2 -
.../files/conf/velocity/facet_text_shingles.vm | 12 -
solr/example/files/conf/velocity/facets.vm | 24 -
solr/example/files/conf/velocity/footer.vm | 29 -
solr/example/files/conf/velocity/head.vm | 290 ----
solr/example/files/conf/velocity/hit.vm | 77 --
.../files/conf/velocity/img/english_640.png | Bin 138412 -> 0 bytes
.../example/files/conf/velocity/img/france_640.png | Bin 99992 -> 0 bytes
.../files/conf/velocity/img/germany_640.png | Bin 105271 -> 0 bytes
solr/example/files/conf/velocity/img/globe_256.png | Bin 46622 -> 0 bytes
.../files/conf/velocity/jquery.tx3-tag-cloud.js | 0
solr/example/files/conf/velocity/js/dropit.js | 97 --
.../files/conf/velocity/js/jquery.autocomplete.js | 763 -----------
.../files/conf/velocity/js/jquery.tx3-tag-cloud.js | 70 -
solr/example/files/conf/velocity/layout.vm | 42 -
solr/example/files/conf/velocity/macros.vm | 16 -
.../example/files/conf/velocity/mime_type_lists.vm | 68 -
solr/example/files/conf/velocity/results.vm | 20 -
solr/example/files/conf/velocity/results_list.vm | 21 -
solr/licenses/velocity-engine-core-2.0.jar.sha1 | 1 -
solr/licenses/velocity-engine-core-LICENSE-ASL.txt | 202 ---
solr/licenses/velocity-engine-core-NOTICE.txt | 7 -
solr/licenses/velocity-tools-generic-3.0.jar.sha1 | 1 -
.../velocity-tools-generic-LICENSE-ASL.txt | 201 ---
solr/licenses/velocity-tools-generic-NOTICE.txt | 12 -
solr/licenses/velocity-tools-view-3.0.jar.sha1 | 1 -
solr/licenses/velocity-tools-view-LICENSE-ASL.txt | 201 ---
solr/licenses/velocity-tools-view-NOTICE.txt | 12 -
solr/licenses/velocity-tools-view-jsp-3.0.jar.sha1 | 1 -
.../velocity-tools-view-jsp-LICENSE-ASL.txt | 201 ---
solr/licenses/velocity-tools-view-jsp-NOTICE.txt | 12 -
solr/licenses/zookeeper-3.6.1.jar.sha1 | 1 -
solr/licenses/zookeeper-3.6.2.jar.sha1 | 1 +
solr/licenses/zookeeper-jute-3.6.1.jar.sha1 | 1 -
solr/licenses/zookeeper-jute-3.6.2.jar.sha1 | 1 +
solr/packaging/build.gradle | 1 -
.../solr/configsets/_default/conf/solrconfig.xml | 21 +-
.../conf/solrconfig.xml | 133 +-
.../conf/velocity/README.md | 116 --
.../conf/velocity/VM_global_library.vm | 186 ---
.../conf/velocity/browse.vm | 33 -
.../conf/velocity/cluster.vm | 19 -
.../conf/velocity/cluster_results.vm | 31 -
.../conf/velocity/debug.vm | 28 -
.../conf/velocity/did_you_mean.vm | 11 -
.../conf/velocity/error.vm | 11 -
.../conf/velocity/facet_fields.vm | 24 -
.../conf/velocity/facet_pivot.vm | 12 -
.../conf/velocity/facet_queries.vm | 12 -
.../conf/velocity/facet_ranges.vm | 23 -
.../conf/velocity/facets.vm | 10 -
.../conf/velocity/footer.vm | 43 -
.../conf/velocity/head.vm | 37 -
.../conf/velocity/header.vm | 7 -
.../conf/velocity/hit.vm | 25 -
.../conf/velocity/hit_grouped.vm | 43 -
.../conf/velocity/hit_plain.vm | 25 -
.../conf/velocity/join_doc.vm | 20 -
.../conf/velocity/jquery.autocomplete.css | 48 -
.../conf/velocity/jquery.autocomplete.js | 763 -----------
.../conf/velocity/layout.vm | 24 -
.../conf/velocity/main.css | 231 ----
.../conf/velocity/mime_type_lists.vm | 68 -
.../conf/velocity/pagination_bottom.vm | 22 -
.../conf/velocity/pagination_top.vm | 29 -
.../conf/velocity/product_doc.vm | 32 -
.../conf/velocity/query.vm | 42 -
.../conf/velocity/query_form.vm | 64 -
.../conf/velocity/query_group.vm | 43 -
.../conf/velocity/query_spatial.vm | 75 --
.../conf/velocity/results_list.vm | 22 -
.../conf/velocity/richtext_doc.vm | 153 ---
.../conf/velocity/suggest.vm | 8 -
.../conf/velocity/tabs.vm | 50 -
solr/solr-ref-guide/build.gradle | 171 +--
solr/solr-ref-guide/src/_config.yml.template | 34 +-
solr/solr-ref-guide/src/_includes/footer.html | 2 +-
solr/solr-ref-guide/src/_includes/head.html | 3 +-
solr/solr-ref-guide/src/css/navs.css | 2 +-
solr/solr-ref-guide/src/libs.adoc | 2 -
solr/solr-ref-guide/src/meta-docs/publish.adoc | 8 +-
...andlers-and-searchcomponents-in-solrconfig.adoc | 4 +-
solr/solr-ref-guide/src/response-writers.adoc | 10 +-
solr/solr-ref-guide/src/searching.adoc | 2 -
.../src/the-query-elevation-component.adoc | 3 +-
solr/solr-ref-guide/src/the-terms-component.adoc | 56 +-
.../src/velocity-response-writer.adoc | 122 --
solr/solr-ref-guide/src/velocity-search-ui.adoc | 26 -
.../solrj/request/beans/ClusterPropInfo.java | 2 +-
.../apache/solr/cloud/MiniSolrCloudCluster.java | 9 +-
versions.lock | 16 +-
versions.props | 4 +-
290 files changed, 5207 insertions(+), 20000 deletions(-)