You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by no...@apache.org on 2021/06/03 04:02:11 UTC

[solr] branch jira/solr15337_1 updated (76f36a8 -> f04e476)

This is an automated email from the ASF dual-hosted git repository.

noble pushed a change to branch jira/solr15337_1
in repository https://gitbox.apache.org/repos/asf/solr.git.


    from 76f36a8  fixing test errors
     add b27b587  SOLR-14166 fq cache=false should use TwoPhaseIterator (#57)
     add 6c969f7  SOLR-15340: Fix wildcard path detection on Windows.
     add d316946  SOLR-11904: Mark ReplicationHandler's polling thread as a Solr server thread so the PKI Interceptor is activated to   allow PULL replicas to replicate from security-enabled leaders (#110)
     add e131414  Revert "SOLR-11904: Mark ReplicationHandler's polling thread as a Solr server thread so the PKI Interceptor is activated to   allow PULL replicas to replicate from security-enabled leaders (#110)"
     add 5fe3123  Remove PDF Checks from gradle ref-guide generation. (#102)
     add 19ea591  SOLR-15368: replace bad favicon logo to transparent background (#93)
     add 89816ad  SOLR-15389 AwaitsFix tests while awaiting fix
     add abdca25  SOLR-14166: update and refactor docs on cache local-param (#113)
     add 1df082c  SOLR-15365: New cluster row in Grafana Dashboard (#88)
     add 69ff663  SOLR-15384 Zookeeper admin handlers not queryable from SolrJ (#105)
     add 0eb7b3e  SOLR-15300: Report collection and shard "health" state in CLUSTERSTATUS response.
     add 8c5084e  link to the json.nl parameter which is important when faceting (#118)
     add 4dae203  SOLR-15377: Improve IndexFetcher's exception logging upon replication errors. (#99)
     add ae1ac22  SOLR-11904: Mark ReplicationHandler's polling thread as a Solr server thread so the PKI Interceptor is activated to allow PULL replicas to replicate from security-enabled leaders (#112)
     add 1cc36f4  SOLR-11904: Mark flaky tests as BadApples (#119)
     add a33ef7d  SOLR-11904: Mark tests as BadApples due to inconsistent failures in Jenkins
     add 00148a9  SOLR-15156: Backported to 8.9
     add f5ad738  SOLR-15389: Tests shouldn't rely on dismax clause order (#117)
     add f94d347  SOLR-15222: userfiles dir will only be created in SolrCloud mode (#121)
     add 151539db SOLR-15397 Expose zookeeper status in the exporter, and in grafana da… (#116)
     add 720fa00  SOLR-6152  Pre-populating values into search parameters on the query page of solr admin (#122)
     add 2d2b6a2  SOLR-14790: Migrate docker usage documentation to the ref-guide (#101)
     add 3ed47d7  SOLR-15405 AwaitsFix enough HDFS tests to get 3 consecutive runs with no hdfs failures. (#127)
     add 30e34d8  Move SOLR-11904 under 8.9 in solr/CHANGES.txt now that backport is complete
     add a1bdadc  SOLR-15335: Add support for Official Dockerfile generation
     add 6d3e512  SOLR-15409: Upgrade to Zookeeper 3.7.0 (#130)
     add 2801def  SOLR-15315: contrib/ltr MultipleAdditiveTreesModel latency optimisation by changing recursion to loop (#58)
     add b437c3d  SOLR-15335: Do not require signature for assemble.
     add a2bd03c  SOLR-15348: reduce 'could not obtain overseer' WARNings in MetricsHistoryHandler (#80)
     add f01c413  SolrJ V2Request.getCollection broken (#125)
     add 667cbaa  Correct port in tutorial
     add f36262d  SOLR-15424: Solr replication UI wraps ETA time (#137)
     add c731873  SOLR-15399: IndexFetcher should not issue a local commit for PULL replicas (#133)
     add 8742e70  GitHub PR Template: Add JIRA issue URL (#138)
     add 18e57cd  SOLR-15414 Use ConfigSetAPI to list configs on AdminUI (#140)
     add a08fb35  SOLR-15422 Remove commons-lang2 license files (#136)
     add 24cc7a1  SOLR-14656: remove leftover ref guide images for suggestions screen
     add 12a777e  SOLR-15401: Document NorwegianNormalizationFilter (#132)
     add 4ad8072  SOLR-15426 Remove unused decrypt AES methods (#142)
     add aeb617d  SOLR-15418: V2 API: Fix GET to /select and others (#134)
     add f7a3f7e  SOLR-15241: Add Docker & Kubernetes info to the README (#141)
     add a4618ac  SOLR-15416: Remove metrics history collection (and MetricsHistoryHandler).
     add c9b58f5  SOLR-11134: restructure TestLTRReRankingPipeline and fix testDifferentTopN test (#145)
     add 0432716  SOLR-14702: Fix ref-guide images to use leader-follower terms. (#149)
     add abc87c7  Use a fixed Lucene prerelease from Apache Nightlies server (#148)
     add 42291b7  SOLR-15283: fix tracing when cores is null
     add e57de6a  SOLR-15397 Remove "exemplar" setting for the new zookeeper grafana graph (#153)
     add f4f84d2  SOLR-15439 Upgrade jose4j to v0.7.7 (#154)
     add 59a6b94  SOLR-15090: Update CHANGES.txt to reflect 8.9 backport
     add 3db4cdd  SOLR-12697: In contrib/ltr FieldValueFeature support "stored=false docValues=true" a.k.a. pure DocValues fields. (#123)
     add f4739ce  Update CHANGES for backport to 8.x
     add f3b4693  SOLR-15421: ConfigSet existence now checks for solrconfig.xml (#135)
     add 3f8456f  SOLR-15316 Update Jetty to 9.4.41.v20210516 (#157)
     add c8e06a7  SOLR-15385 Address many rawtypes warnings (#107)
     add f04e476  Merge branch 'main' into jira/solr15337_1

No new revisions were added by this update.

Summary of changes:
 .github/PULL_REQUEST_TEMPLATE.md                   |     2 +
 README.md                                          |    31 +
 gradle/defaults.gradle                             |     6 +-
 gradle/help.gradle                                 |     1 +
 gradle/validation/validate-source-patterns.gradle  |    35 -
 help/dependencies.txt                              |    24 +
 solr/CHANGES.txt                                   |    64 +-
 ...ExtractNamedEntitiesUpdateProcessorFactory.java |     2 -
 .../handler/clustering/ClusteringComponent.java    |     1 -
 .../java/org/apache/solr/ltr/feature/Feature.java  |     3 +-
 .../apache/solr/ltr/feature/FieldValueFeature.java |   189 +-
 .../org/apache/solr/ltr/model/LTRScoringModel.java |     3 +-
 .../solr/ltr/model/MultipleAdditiveTreesModel.java |   152 +-
 .../solr/ltr/store/rest/ManagedModelStore.java     |     1 -
 .../test-files/solr/collection1/conf/schema.xml    |    30 +
 .../org/apache/solr/ltr/TestLTROnSolrCloud.java    |   155 +-
 .../apache/solr/ltr/TestLTRReRankingPipeline.java  |   345 +-
 .../solr/ltr/feature/TestFieldValueFeature.java    |   350 +-
 .../org/apache/solr/ltr/model/TestLinearModel.java |     8 +-
 .../conf/grafana-solr-dashboard.json               | 13668 ++++++++++---------
 .../conf/solr-exporter-config.xml                  |    53 +-
 solr/core/build.gradle                             |     2 -
 .../src/java/org/apache/solr/api/AnnotatedApi.java |    18 +-
 solr/core/src/java/org/apache/solr/api/ApiBag.java |     6 +-
 .../apache/solr/api/ContainerPluginsRegistry.java  |    24 +-
 .../client/solrj/embedded/EmbeddedSolrServer.java  |     9 +-
 .../src/java/org/apache/solr/cloud/CloudUtil.java  |     3 +-
 .../java/org/apache/solr/cloud/ConfigSetCmds.java  |     4 -
 .../apache/solr/cloud/OverseerTaskProcessor.java   |     1 -
 .../org/apache/solr/cloud/ReplicateFromLeader.java |    18 +-
 .../solr/cloud/ShardLeaderElectionContextBase.java |    13 +-
 .../org/apache/solr/cloud/ZkConfigSetService.java  |     6 +-
 .../solr/cloud/api/collections/CollApiCmds.java    |     2 -
 .../api/collections/CollectionHandlingUtils.java   |     8 +-
 .../solr/cloud/api/collections/CreateAliasCmd.java |     1 -
 .../cloud/api/collections/DeleteCollectionCmd.java |    14 -
 .../cloud/api/collections/DeleteReplicaCmd.java    |     3 -
 .../solr/cloud/api/collections/MigrateCmd.java     |     7 +-
 .../api/collections/ReindexCollectionCmd.java      |    16 +-
 .../solr/cloud/api/collections/RestoreCmd.java     |     2 +-
 .../solr/cloud/api/collections/RoutedAlias.java    |     6 +-
 .../solr/cloud/overseer/CollectionMutator.java     |     3 +-
 .../apache/solr/cloud/overseer/ReplicaMutator.java |     4 +-
 .../apache/solr/cloud/overseer/SliceMutator.java   |     5 +-
 .../solr/cluster/placement/impl/MetricImpl.java    |     1 -
 .../java/org/apache/solr/core/BlobRepository.java  |     2 +-
 .../java/org/apache/solr/core/ConfigOverlay.java   |    51 +-
 .../java/org/apache/solr/core/CoreContainer.java   |    88 +-
 .../solr/core/FileSystemConfigSetService.java      |     4 +-
 .../java/org/apache/solr/core/MetricsConfig.java   |    19 +-
 .../src/java/org/apache/solr/core/PluginBag.java   |     6 +-
 .../java/org/apache/solr/core/RequestParams.java   |    25 +-
 .../src/java/org/apache/solr/core/SolrConfig.java  |    42 +-
 .../src/java/org/apache/solr/core/SolrCore.java    |     6 +-
 .../src/java/org/apache/solr/core/SolrPaths.java   |    24 +-
 .../org/apache/solr/core/SolrResourceLoader.java   |    28 +-
 .../java/org/apache/solr/core/SolrXmlConfig.java   |     7 +-
 .../org/apache/solr/core/TracerConfigurator.java   |     2 +-
 .../java/org/apache/solr/handler/BlobHandler.java  |     8 +-
 .../java/org/apache/solr/handler/ClusterAPI.java   |    11 +-
 .../apache/solr/handler/CollectionBackupsAPI.java  |     2 -
 .../org/apache/solr/handler/CollectionsAPI.java    |     3 -
 .../org/apache/solr/handler/ExportHandler.java     |     3 +-
 .../java/org/apache/solr/handler/GraphHandler.java |     4 +-
 .../java/org/apache/solr/handler/IndexFetcher.java |     8 +-
 .../apache/solr/handler/ReplicationHandler.java    |     7 +-
 .../org/apache/solr/handler/SchemaHandler.java     |    32 +-
 .../org/apache/solr/handler/SolrConfigHandler.java |    21 +-
 .../org/apache/solr/handler/StreamHandler.java     |    27 +-
 .../solr/handler/admin/AdminHandlersProxy.java     |    12 +-
 .../solr/handler/admin/BaseHandlerApiSupport.java  |     2 +-
 .../apache/solr/handler/admin/ClusterStatus.java   |    78 +-
 .../solr/handler/admin/CollectionsHandler.java     |     9 +-
 .../solr/handler/admin/CoreAdminOperation.java     |    23 -
 .../apache/solr/handler/admin/MetricsHandler.java  |     6 +-
 .../solr/handler/admin/MetricsHistoryHandler.java  |   992 --
 .../solr/handler/admin/SecurityConfHandler.java    |     3 +-
 .../solr/handler/admin/ZookeeperStatusHandler.java |    26 +-
 .../solr/handler/component/ExpandComponent.java    |     3 -
 .../handler/component/SpellCheckComponent.java     |     1 -
 .../solr/handler/component/SuggestComponent.java   |     1 -
 .../apache/solr/handler/export/ExportWriter.java   |     4 +-
 .../apache/solr/handler/sql/SolrEnumerator.java    |    13 +-
 .../org/apache/solr/handler/sql/SolrMethod.java    |     3 +-
 .../org/apache/solr/handler/sql/SolrTable.java     |    58 +-
 .../handler/sql/SolrToEnumerableConverter.java     |     9 +-
 .../solr/highlight/DefaultSolrHighlighter.java     |     3 -
 .../org/apache/solr/highlight/SolrHighlighter.java |     1 -
 .../solr/index/WrapperMergePolicyFactory.java      |     3 +-
 .../solr/legacy/LegacyNumericRangeQuery.java       |     2 +-
 .../java/org/apache/solr/metrics/MetricsMap.java   |    11 +-
 .../org/apache/solr/metrics/SolrMetricManager.java |     3 +-
 .../reporters/solr/SolrClusterReporter.java        |   295 -
 .../metrics/reporters/solr/SolrShardReporter.java  |   189 -
 .../apache/solr/metrics/rrd/SolrRrdBackend.java    |   273 -
 .../solr/metrics/rrd/SolrRrdBackendFactory.java    |   468 -
 .../org/apache/solr/metrics/rrd/package-info.java  |    22 -
 .../apache/solr/packagemanager/PackageManager.java |     1 -
 .../src/java/org/apache/solr/pkg/PackageAPI.java   |     1 -
 .../solr/pkg/PackageListeningClassLoader.java      |     3 +-
 .../java/org/apache/solr/pkg/PackageLoader.java    |     3 +-
 .../apache/solr/request/SolrQueryRequestBase.java  |     3 +-
 .../org/apache/solr/request/SolrRequestInfo.java   |     1 -
 .../java/org/apache/solr/rest/ManagedResource.java |     1 -
 .../src/java/org/apache/solr/schema/BoolField.java |     2 +-
 .../org/apache/solr/schema/CurrencyFieldType.java  |     5 +-
 .../apache/solr/schema/FieldTypePluginLoader.java  |     9 +-
 .../java/org/apache/solr/schema/IndexSchema.java   |     5 +-
 .../org/apache/solr/schema/RandomSortField.java    |     2 +-
 .../org/apache/solr/schema/StrFieldSource.java     |     2 +-
 .../org/apache/solr/schema/TrieDoubleField.java    |     2 +-
 .../org/apache/solr/schema/TrieFloatField.java     |     2 +-
 .../java/org/apache/solr/schema/TrieIntField.java  |     2 +-
 .../java/org/apache/solr/schema/TrieLongField.java |     2 +-
 .../java/org/apache/solr/search/CacheConfig.java   |     1 +
 .../solr/search/CollapsingQParserPlugin.java       |     8 -
 .../java/org/apache/solr/search/ExtendedQuery.java |    27 +-
 .../org/apache/solr/search/ExtendedQueryBase.java  |    14 -
 .../solr/search/FloatPayloadValueSource.java       |     3 +-
 .../solr/search/GraphTermsQParserPlugin.java       |    17 +-
 .../src/java/org/apache/solr/search/Grouping.java  |    14 +-
 .../org/apache/solr/search/MatchCostQuery.java     |   158 +
 .../src/java/org/apache/solr/search/QParser.java   |     2 -
 .../apache/solr/search/SolrConstantScoreQuery.java |     9 -
 .../org/apache/solr/search/SolrCoreParser.java     |     8 +-
 .../org/apache/solr/search/SolrIndexSearcher.java  |   328 +-
 .../org/apache/solr/search/ValueSourceParser.java  |    19 +-
 .../apache/solr/search/facet/AggValueSource.java   |     3 +-
 .../apache/solr/search/facet/FacetFieldMerger.java |     2 +-
 .../org/apache/solr/search/facet/FacetModule.java  |     1 -
 .../solr/search/facet/FacetRangeProcessor.java     |     1 -
 .../search/facet/FacetRequestSortedMerger.java     |     2 +-
 .../apache/solr/search/facet/RelatednessAgg.java   |     2 +-
 .../solr/search/facet/SimpleAggValueSource.java    |     3 +-
 .../java/org/apache/solr/search/facet/SlotAcc.java |     1 -
 .../apache/solr/search/facet/UnInvertedField.java  |     1 -
 .../search/function/CollapseScoreFunction.java     |     3 +-
 .../solr/search/function/FieldNameValueSource.java |     3 +-
 .../solr/search/function/FileFloatSource.java      |     4 +-
 .../solr/search/function/MultiStringFunction.java  |     3 +-
 .../solr/search/function/OrdFieldSource.java       |     3 +-
 .../search/function/ReverseOrdFieldSource.java     |     3 +-
 .../search/function/distance/GeohashFunction.java  |     5 +-
 .../distance/GeohashHaversineFunction.java         |     7 +-
 .../function/distance/HaversineConstFunction.java  |     7 +-
 .../function/distance/HaversineFunction.java       |     7 +-
 .../function/distance/StringDistanceFunction.java  |     5 +-
 .../function/distance/VectorDistanceFunction.java  |     7 +-
 .../distributed/command/TopGroupsFieldCommand.java |     1 -
 .../search/join/ChildFieldValueSourceParser.java   |     2 +-
 .../solr/security/PermissionNameProvider.java      |     1 -
 .../java/org/apache/solr/servlet/HttpSolrCall.java |     3 +-
 .../apache/solr/servlet/SolrDispatchFilter.java    |     3 +-
 .../apache/solr/servlet/SolrRequestParsers.java    |    33 +-
 .../solr/servlet/cache/HttpCacheHeaderUtil.java    |     1 -
 .../solr/spelling/suggest/SolrSuggester.java       |     3 +-
 .../org/apache/solr/update/IndexFingerprint.java   |    10 +-
 .../org/apache/solr/update/SolrIndexConfig.java    |    36 +-
 .../src/java/org/apache/solr/update/UpdateLog.java |     4 +-
 ...AbstractDefaultValueUpdateProcessorFactory.java |     1 -
 .../processor/AtomicUpdateDocumentMerger.java      |     3 +-
 .../processor/AtomicUpdateProcessorFactory.java    |     3 +-
 .../CloneFieldUpdateProcessorFactory.java          |     2 -
 .../ConcatFieldUpdateProcessorFactory.java         |     1 -
 .../DefaultValueUpdateProcessorFactory.java        |     1 -
 .../processor/DistributedZkUpdateProcessor.java    |     2 +-
 .../DocExpirationUpdateProcessorFactory.java       |     1 -
 .../FieldLengthUpdateProcessorFactory.java         |     1 -
 .../processor/FieldMutatingUpdateProcessor.java    |    11 +-
 .../FieldMutatingUpdateProcessorFactory.java       |     1 -
 .../processor/RegexReplaceProcessorFactory.java    |     1 -
 .../RemoveBlankFieldUpdateProcessorFactory.java    |     1 -
 .../processor/TrimFieldUpdateProcessorFactory.java |     1 -
 .../TruncateFieldUpdateProcessorFactory.java       |     1 -
 .../processor/UUIDUpdateProcessorFactory.java      |     1 -
 .../processor/UpdateRequestProcessorChain.java     |    20 +-
 .../org/apache/solr/util/ConcurrentLRUCache.java   |     4 +-
 .../src/java/org/apache/solr/util/CryptoKeys.java  |   142 -
 .../src/java/org/apache/solr/util/SolrCLI.java     |     1 -
 .../java/org/apache/solr/util/SolrLogLayout.java   |     3 +-
 .../java/org/apache/solr/util/TestInjection.java   |     7 +-
 .../util/circuitbreaker/CircuitBreakerManager.java |     1 -
 .../SSLCredentialProviderFactory.java              |     5 +-
 .../solr/util/plugin/AbstractPluginLoader.java     |     1 -
 .../org/apache/solr/util/stats/MetricUtils.java    |     2 -
 .../core/src/test-files/solr/solr-solrreporter.xml |    69 -
 .../test/org/apache/hadoop/http/HttpServer2.java   |     3 -
 .../org/apache/solr/TestDistributedGrouping.java   |     1 -
 .../apache/solr/analysis/TokenizerChainTest.java   |     7 +-
 .../DistribDocExpirationUpdateProcessorTest.java   |    13 +-
 .../solr/cloud/MetricsHistoryIntegrationTest.java  |   190 -
 .../MetricsHistoryWithAuthIntegrationTest.java     |    93 -
 .../OverseerCollectionConfigSetProcessorTest.java  |     5 +-
 .../org/apache/solr/cloud/ReplaceNodeTest.java     |     1 -
 .../test/org/apache/solr/cloud/RouteFieldTest.java |     6 +-
 .../org/apache/solr/cloud/SSLMigrationTest.java    |    12 +-
 .../org/apache/solr/cloud/TestConfigSetsAPI.java   |    13 +-
 .../solr/cloud/TestConfigSetsAPIShareSchema.java   |     3 +-
 .../org/apache/solr/cloud/TestHashPartitioner.java |     1 -
 .../org/apache/solr/cloud/TestPullReplica.java     |   131 +-
 .../apache/solr/cloud/TestPullReplicaWithAuth.java |   158 +
 .../apache/solr/cloud/TestSSLRandomization.java    |    28 +-
 .../solr/cloud/TestStressInPlaceUpdates.java       |     1 -
 .../solr/cloud/api/collections/ShardSplitTest.java |     4 +-
 .../cloud/api/collections/TestCollectionAPI.java   |    66 +
 .../solr/cloud/hdfs/HDFSCollectionsAPITest.java    |     2 +
 .../cloud/overseer/TestClusterStateMutator.java    |     6 +-
 .../solr/core/BlobRepositoryMockingTest.java       |     4 -
 .../test/org/apache/solr/core/CoreSorterTest.java  |    12 +-
 .../solr/core/CountUsageValueSourceParser.java     |     2 +-
 .../org/apache/solr/core/FakeDeletionPolicy.java   |     7 +-
 .../org/apache/solr/core/ResourceLoaderTest.java   |     7 +-
 .../src/test/org/apache/solr/core/SOLR749Test.java |    13 +-
 .../org/apache/solr/core/TestConfigOverlay.java    |     3 +-
 .../test/org/apache/solr/core/TestInitParams.java  |     9 +-
 .../solr/filestore/TestDistribPackageStore.java    |    66 +-
 .../apache/solr/handler/TestContainerPlugin.java   |     4 +-
 .../solr/handler/TestSolrConfigHandlerCloud.java   |     4 +-
 .../apache/solr/handler/V2ApiIntegrationTest.java  |    16 +-
 .../solr/handler/admin/MetricsHandlerTest.java     |     8 +-
 .../handler/admin/MetricsHistoryHandlerTest.java   |   116 -
 .../handler/admin/SecurityConfHandlerTest.java     |     9 +-
 .../solr/handler/admin/TestApiFramework.java       |    12 +-
 .../apache/solr/handler/admin/TestConfigsApi.java  |     2 +-
 .../solr/handler/admin/TestCoreAdminApis.java      |     3 +-
 .../admin/ZookeeperStatusHandlerFailureTest.java   |    74 +
 .../DistributedFacetPivotLongTailTest.java         |     1 -
 .../component/ResourceSharingTestComponent.java    |     1 -
 .../handler/component/SpellCheckComponentTest.java |     2 -
 .../apache/solr/index/hdfs/CheckHdfsIndexTest.java |     2 +
 .../reporters/solr/SolrCloudReportersTest.java     |   191 -
 .../reporters/solr/SolrShardReporterTest.java      |   130 -
 .../metrics/rrd/SolrRrdBackendFactoryTest.java     |   256 -
 .../src/test/org/apache/solr/pkg/TestPackages.java |    77 +-
 .../solr/response/TestGraphMLResponseWriter.java   |     1 -
 .../response/TestJavabinTupleStreamParser.java     |     8 +-
 .../apache/solr/schema/SchemaApiFailureTest.java   |     3 +-
 .../apache/solr/search/RankQueryTestPlugin.java    |     4 +-
 .../apache/solr/search/SolrIndexSearcherTest.java  |     9 -
 .../solr/search/TestExtendedDismaxParser.java      |   199 +-
 .../solr/search/TestMaxScoreQueryParser.java       |     6 +-
 .../org/apache/solr/search/TestRecoveryHdfs.java   |    38 +-
 .../apache/solr/search/TestSolrQueryParser.java    |   211 +-
 .../org/apache/solr/search/TestTaskManagement.java |     1 -
 .../search/facet/TestCloudJSONFacetSKGEquiv.java   |     6 +-
 .../solr/security/BasicAuthIntegrationTest.java    |     4 +-
 .../apache/solr/security/JWTAuthPluginTest.java    |     2 +-
 .../security/PKIAuthenticationIntegrationTest.java |     6 +-
 .../solr/spelling/SpellCheckCollatorTest.java      |     1 -
 .../org/apache/solr/update/TestHdfsUpdateLog.java  |    18 +-
 .../test/org/apache/solr/update/TestUpdate.java    |     2 +-
 .../org/apache/solr/util/TestCircuitBreaker.java   |     1 -
 .../apache/solr/util/stats/MetricUtilsTest.java    |     1 -
 solr/docker/README.md                              |   275 -
 solr/docker/build.gradle                           |   382 +-
 solr/docker/{docs => example}/docker-compose.yml   |     0
 .../{docs => example}/precreate-collection.sh      |     0
 solr/docker/{docs => example}/set-heap.sh          |     0
 solr/docker/gradle-help.txt                        |    27 +
 .../Dockerfile.body.template}                      |    43 +-
 .../templates/Dockerfile.local.header.template     |    29 +
 .../templates/Dockerfile.official.header.template  |    79 +
 solr/licenses/commons-lang-2.6.jar.sha1            |     1 -
 solr/licenses/commons-lang-LICENSE-ASL.txt         |   202 -
 solr/licenses/commons-lang-NOTICE.txt              |     5 -
 .../http2-client-9.4.34.v20201102.jar.sha1         |     1 -
 .../http2-client-9.4.41.v20210516.jar.sha1         |     1 +
 .../http2-common-9.4.34.v20201102.jar.sha1         |     1 -
 .../http2-common-9.4.41.v20210516.jar.sha1         |     1 +
 .../licenses/http2-hpack-9.4.34.v20201102.jar.sha1 |     1 -
 .../licenses/http2-hpack-9.4.41.v20210516.jar.sha1 |     1 +
 ...http-client-transport-9.4.34.v20201102.jar.sha1 |     1 -
 ...http-client-transport-9.4.41.v20210516.jar.sha1 |     1 +
 .../http2-server-9.4.34.v20201102.jar.sha1         |     1 -
 .../http2-server-9.4.41.v20210516.jar.sha1         |     1 +
 .../jetty-alpn-client-9.4.34.v20201102.jar.sha1    |     1 -
 .../jetty-alpn-client-9.4.41.v20210516.jar.sha1    |     1 +
 ...etty-alpn-java-client-9.4.34.v20201102.jar.sha1 |     1 -
 ...etty-alpn-java-client-9.4.41.v20210516.jar.sha1 |     1 +
 ...etty-alpn-java-server-9.4.34.v20201102.jar.sha1 |     1 -
 ...etty-alpn-java-server-9.4.41.v20210516.jar.sha1 |     1 +
 .../jetty-alpn-server-9.4.34.v20201102.jar.sha1    |     1 -
 .../jetty-alpn-server-9.4.41.v20210516.jar.sha1    |     1 +
 .../jetty-client-9.4.34.v20201102.jar.sha1         |     1 -
 .../jetty-client-9.4.41.v20210516.jar.sha1         |     1 +
 .../jetty-continuation-9.4.34.v20201102.jar.sha1   |     1 -
 .../jetty-continuation-9.4.41.v20210516.jar.sha1   |     1 +
 .../jetty-deploy-9.4.34.v20201102.jar.sha1         |     1 -
 .../jetty-deploy-9.4.41.v20210516.jar.sha1         |     1 +
 solr/licenses/jetty-http-9.4.34.v20201102.jar.sha1 |     1 -
 solr/licenses/jetty-http-9.4.41.v20210516.jar.sha1 |     1 +
 solr/licenses/jetty-io-9.4.34.v20201102.jar.sha1   |     1 -
 solr/licenses/jetty-io-9.4.41.v20210516.jar.sha1   |     1 +
 solr/licenses/jetty-jmx-9.4.34.v20201102.jar.sha1  |     1 -
 solr/licenses/jetty-jmx-9.4.41.v20210516.jar.sha1  |     1 +
 .../jetty-rewrite-9.4.34.v20201102.jar.sha1        |     1 -
 .../jetty-rewrite-9.4.41.v20210516.jar.sha1        |     1 +
 .../jetty-security-9.4.34.v20201102.jar.sha1       |     1 -
 .../jetty-security-9.4.41.v20210516.jar.sha1       |     1 +
 .../jetty-server-9.4.34.v20201102.jar.sha1         |     1 -
 .../jetty-server-9.4.41.v20210516.jar.sha1         |     1 +
 .../jetty-servlet-9.4.34.v20201102.jar.sha1        |     1 -
 .../jetty-servlet-9.4.41.v20210516.jar.sha1        |     1 +
 .../jetty-servlets-9.4.34.v20201102.jar.sha1       |     1 -
 .../jetty-servlets-9.4.41.v20210516.jar.sha1       |     1 +
 .../jetty-start-9.4.34.v20201102-shaded.jar.sha1   |     1 -
 .../jetty-start-9.4.41.v20210516-shaded.jar.sha1   |     1 +
 solr/licenses/jetty-util-9.4.34.v20201102.jar.sha1 |     1 -
 solr/licenses/jetty-util-9.4.41.v20210516.jar.sha1 |     1 +
 .../jetty-util-ajax-9.4.41.v20210516.jar.sha1      |     1 +
 .../jetty-webapp-9.4.34.v20201102.jar.sha1         |     1 -
 .../jetty-webapp-9.4.41.v20210516.jar.sha1         |     1 +
 solr/licenses/jetty-xml-9.4.34.v20201102.jar.sha1  |     1 -
 solr/licenses/jetty-xml-9.4.41.v20210516.jar.sha1  |     1 +
 solr/licenses/jose4j-0.6.5.jar.sha1                |     1 -
 solr/licenses/jose4j-0.7.7.jar.sha1                |     1 +
 solr/licenses/netty-buffer-4.1.50.Final.jar.sha1   |     1 -
 solr/licenses/netty-buffer-4.1.59.Final.jar.sha1   |     1 +
 solr/licenses/netty-codec-4.1.50.Final.jar.sha1    |     1 -
 solr/licenses/netty-codec-4.1.59.Final.jar.sha1    |     1 +
 solr/licenses/netty-common-4.1.50.Final.jar.sha1   |     1 -
 solr/licenses/netty-common-4.1.59.Final.jar.sha1   |     1 +
 solr/licenses/netty-handler-4.1.50.Final.jar.sha1  |     1 -
 solr/licenses/netty-handler-4.1.59.Final.jar.sha1  |     1 +
 solr/licenses/netty-resolver-4.1.50.Final.jar.sha1 |     1 -
 solr/licenses/netty-resolver-4.1.59.Final.jar.sha1 |     1 +
 .../licenses/netty-transport-4.1.50.Final.jar.sha1 |     1 -
 .../licenses/netty-transport-4.1.59.Final.jar.sha1 |     1 +
 ...ty-transport-native-epoll-4.1.50.Final.jar.sha1 |     1 -
 ...ty-transport-native-epoll-4.1.59.Final.jar.sha1 |     1 +
 ...nsport-native-unix-common-4.1.50.Final.jar.sha1 |     1 -
 ...nsport-native-unix-common-4.1.59.Final.jar.sha1 |     1 +
 solr/licenses/rrd4j-3.5.jar.sha1                   |     1 -
 solr/licenses/rrd4j-LICENSE-ASL.txt                |   202 -
 solr/licenses/rrd4j-NOTICE.txt                     |     2 -
 solr/licenses/zookeeper-3.6.2.jar.sha1             |     1 -
 solr/licenses/zookeeper-3.7.0.jar.sha1             |     1 +
 solr/licenses/zookeeper-jute-3.6.2.jar.sha1        |     1 -
 solr/licenses/zookeeper-jute-3.7.0.jar.sha1        |     1 +
 solr/packaging/build.gradle                        |     6 +
 .../src/analytics-expression-sources.adoc          |     4 +-
 .../src/analytics-mapping-functions.adoc           |   344 +-
 .../src/analytics-reduction-functions.adoc         |    33 +-
 .../src/cluster-node-management.adoc               |    21 +
 .../combining-distribution-and-replication.adoc    |     2 +-
 .../solr-ref-guide/src/command-line-utilities.adoc |     2 +-
 .../src/common-query-parameters.adoc               |    59 +-
 .../src/deployment-and-operations.adoc             |     4 +-
 .../src/docker-faq.adoc}                           |   258 +-
 .../src/docker-networking.adoc}                    |   135 +-
 solr/solr-ref-guide/src/faceting.adoc              |    10 +-
 .../src/field-type-definitions-and-properties.adoc |     2 +-
 solr/solr-ref-guide/src/filter-descriptions.adoc   |    28 +-
 .../distributed-replication.png                    |   Bin 0 -> 38896 bytes
 .../worddav4101c16174820e932b44baa22abcfcd1.png    |   Bin 54328 -> 0 bytes
 solr/solr-ref-guide/src/images/icons/favicon.ico   |   Bin 3262 -> 2350 bytes
 .../leader-follower-replication.png                |   Bin 0 -> 18224 bytes
 .../worddav2b7e14725d898b4104cdd9c502fc77cd.png    |   Bin 26388 -> 0 bytes
 .../images/suggestions-screen/no-violations.png    |   Bin 73333 -> 0 bytes
 .../suggestions-screen/violations-with-action.png  |   Bin 152486 -> 0 bytes
 .../src/images/suggestions-screen/violations.png   |   Bin 123009 -> 0 bytes
 solr/solr-ref-guide/src/index-replication.adoc     |     2 +-
 solr/solr-ref-guide/src/language-analysis.adoc     |    54 +-
 .../src/major-changes-in-solr-8.adoc               |     2 +-
 .../src/major-changes-in-solr-9.adoc               |     5 +-
 .../src/making-and-restoring-backups.adoc          |     2 +-
 solr/solr-ref-guide/src/metrics-history.adoc       |   488 -
 solr/solr-ref-guide/src/metrics-reporting.adoc     |   174 +-
 solr/solr-ref-guide/src/monitoring-solr.adoc       |     4 +-
 .../src/query-settings-in-solrconfig.adoc          |     9 +-
 .../src/rule-based-authorization-plugin.adoc       |     1 -
 .../solr-ref-guide/src/running-solr-in-docker.adoc |   306 +
 .../src/solr-control-script-reference.adoc         |     4 +-
 .../src/solr-jdbc-apache-zeppelin.adoc             |     2 +-
 solr/solr-ref-guide/src/solr-tutorial.adoc         |     2 +-
 solr/solr-ref-guide/src/solr-upgrade-notes.adoc    |     6 +
 solr/solr-ref-guide/src/spatial-search.adoc        |     2 -
 .../org/apache/solr/client/solrj/SolrClient.java   |     4 +-
 .../client/solrj/beans/DocumentObjectBinder.java   |    16 +-
 .../org/apache/solr/client/solrj/beans/Field.java  |     2 +-
 .../client/solrj/cloud/DelegatingCloudManager.java |     2 +-
 .../solr/client/solrj/cloud/SolrCloudManager.java  |     2 +-
 .../client/solrj/impl/BaseCloudSolrClient.java     |     9 +-
 .../solrj/impl/BaseHttpClusterStateProvider.java   |     5 +-
 .../client/solrj/impl/ClusterStateProvider.java    |     5 +-
 .../solrj/impl/Http2ClusterStateProvider.java      |     1 -
 .../solrj/impl/HttpClusterStateProvider.java       |     1 -
 .../solr/client/solrj/impl/LBHttpSolrClient.java   |     4 +-
 .../solr/client/solrj/impl/LBSolrClient.java       |     1 +
 .../client/solrj/impl/SolrClientCloudManager.java  |     2 +-
 .../solrj/impl/SolrClientNodeStateProvider.java    |     6 +-
 .../solrj/impl/SolrHttpRequestRetryHandler.java    |     1 -
 .../apache/solr/client/solrj/io/ModelCache.java    |     2 +-
 .../client/solrj/io/eval/FieldValueEvaluator.java  |     1 -
 .../solr/client/solrj/io/eval/IsNullEvaluator.java |     5 +-
 .../client/solrj/io/eval/NotNullEvaluator.java     |     5 +-
 .../client/solrj/io/graph/GatherNodesStream.java   |     5 +-
 .../client/solrj/io/sql/ResultSetMetaDataImpl.java |     3 +-
 .../solr/client/solrj/io/stream/DrillStream.java   |     4 +-
 .../solr/client/solrj/io/stream/SelectStream.java  |     1 -
 .../solr/client/solrj/io/stream/StreamContext.java |    25 +-
 .../client/solrj/io/stream/expr/Explanation.java   |     3 +-
 .../solrj/io/stream/expr/StreamExplanation.java    |     1 -
 .../client/solrj/io/stream/expr/StreamFactory.java |    53 +-
 .../solrj/request/CollectionAdminRequest.java      |     4 +-
 .../client/solrj/request/CollectionApiMapping.java |    28 +-
 .../solr/client/solrj/request/CoreApiMapping.java  |    14 +-
 .../solr/client/solrj/request/RequestWriter.java   |     4 +-
 .../solr/client/solrj/request/UpdateRequest.java   |     3 +-
 .../solr/client/solrj/request/V2Request.java       |     2 +-
 .../client/solrj/response/SpellCheckResponse.java  |     1 -
 .../solrj/response/schema/SchemaResponse.java      |    11 -
 .../org/apache/solr/common/MapSerializable.java    |     3 +-
 .../src/java/org/apache/solr/common/MapWriter.java |     2 +-
 .../java/org/apache/solr/common/MapWriterMap.java  |     9 +-
 .../java/org/apache/solr/common/SolrException.java |     4 +-
 .../java/org/apache/solr/common/cloud/Aliases.java |     1 -
 .../apache/solr/common/cloud/SolrClassLoader.java  |     3 +-
 .../solr/common/cloud/ZkMaintenanceUtils.java      |    15 +-
 .../org/apache/solr/common/cloud/ZkNodeProps.java  |     6 +-
 .../apache/solr/common/cloud/ZkStateReader.java    |    20 +-
 .../apache/solr/common/params/CommonParams.java    |     6 +-
 .../apache/solr/common/params/CoreAdminParams.java |     2 -
 .../apache/solr/common/util/CommandOperation.java  |     5 +-
 .../apache/solr/common/util/JsonSchemaCreator.java |     5 +-
 .../solr/common/util/JsonSchemaValidator.java      |     5 +-
 .../src/java/org/apache/solr/common/util/Pair.java |     5 +-
 .../org/apache/solr/common/util/RetryUtil.java     |    20 +-
 .../java/org/apache/solr/common/util/Utils.java    |    28 +-
 .../solrj/io/stream/CloudAuthStreamTest.java       |    19 +-
 .../solrj/request/TestUpdateRequestCodec.java      |    12 +-
 .../routing/NodePreferenceRulesComparatorTest.java |    11 +-
 ...RequestReplicaListTransformerGeneratorTest.java |    13 +-
 .../org/apache/solr/common/util/NamedListTest.java |     8 +-
 .../apache/solr/common/util/TestJavaBinCodec.java  |    29 +-
 .../org/apache/solr/common/util/TestRetryUtil.java |    53 +-
 .../solr/common/util/TestSolrJsonWriter.java       |     2 +-
 .../solr/common/util/TestValidatingJsonMap.java    |     6 +-
 .../src/java/org/apache/solr/SolrTestCaseJ4.java   |    42 +-
 .../solr/cloud/AbstractFullDistribZkTestBase.java  |    17 +-
 .../org/apache/solr/cloud/CloudInspectUtil.java    |     1 -
 .../java/org/apache/solr/cloud/ZkTestServer.java   |     6 +-
 .../java/org/apache/solr/util/QueryMatchers.java   |   232 +
 .../java/org/apache/solr/util/RandomizeSSL.java    |    28 +-
 .../src/java/org/apache/solr/util/TestHarness.java |     4 -
 solr/webapp/web/css/angular/query.css              |     9 +-
 solr/webapp/web/css/angular/replication.css        |     4 +-
 solr/webapp/web/favicon.ico                        |   Bin 3262 -> 0 bytes
 solr/webapp/web/img/favicon.ico                    |   Bin 3262 -> 2350 bytes
 .../web/js/angular/controllers/collections.js      |     8 +-
 solr/webapp/web/js/angular/controllers/query.js    |   150 +-
 solr/webapp/web/js/angular/services.js             |     5 +
 solr/webapp/web/partials/query.html                |   284 +-
 versions.lock                                      |   125 +-
 versions.props                                     |    11 +-
 455 files changed, 12105 insertions(+), 14288 deletions(-)
 delete mode 100644 solr/core/src/java/org/apache/solr/handler/admin/MetricsHistoryHandler.java
 delete mode 100644 solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrClusterReporter.java
 delete mode 100644 solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrShardReporter.java
 delete mode 100644 solr/core/src/java/org/apache/solr/metrics/rrd/SolrRrdBackend.java
 delete mode 100644 solr/core/src/java/org/apache/solr/metrics/rrd/SolrRrdBackendFactory.java
 delete mode 100644 solr/core/src/java/org/apache/solr/metrics/rrd/package-info.java
 create mode 100644 solr/core/src/java/org/apache/solr/search/MatchCostQuery.java
 delete mode 100644 solr/core/src/test-files/solr/solr-solrreporter.xml
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/MetricsHistoryIntegrationTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/cloud/MetricsHistoryWithAuthIntegrationTest.java
 create mode 100644 solr/core/src/test/org/apache/solr/cloud/TestPullReplicaWithAuth.java
 delete mode 100644 solr/core/src/test/org/apache/solr/handler/admin/MetricsHistoryHandlerTest.java
 create mode 100644 solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerFailureTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/metrics/reporters/solr/SolrCloudReportersTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/metrics/reporters/solr/SolrShardReporterTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/metrics/rrd/SolrRrdBackendFactoryTest.java
 delete mode 100644 solr/docker/README.md
 rename solr/docker/{docs => example}/docker-compose.yml (100%)
 rename solr/docker/{docs => example}/precreate-collection.sh (100%)
 rename solr/docker/{docs => example}/set-heap.sh (100%)
 rename solr/docker/{Dockerfile => templates/Dockerfile.body.template} (64%)
 create mode 100644 solr/docker/templates/Dockerfile.local.header.template
 create mode 100644 solr/docker/templates/Dockerfile.official.header.template
 delete mode 100644 solr/licenses/commons-lang-2.6.jar.sha1
 delete mode 100644 solr/licenses/commons-lang-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/commons-lang-NOTICE.txt
 delete mode 100644 solr/licenses/http2-client-9.4.34.v20201102.jar.sha1
 create mode 100644 solr/licenses/http2-client-9.4.41.v20210516.jar.sha1
 delete mode 100644 solr/licenses/http2-common-9.4.34.v20201102.jar.sha1
 create mode 100644 solr/licenses/http2-common-9.4.41.v20210516.jar.sha1
 delete mode 100644 solr/licenses/http2-hpack-9.4.34.v20201102.jar.sha1
 create mode 100644 solr/licenses/http2-hpack-9.4.41.v20210516.jar.sha1
 delete mode 100644 solr/licenses/http2-http-client-transport-9.4.34.v20201102.jar.sha1
 create mode 100644 solr/licenses/http2-http-client-transport-9.4.41.v20210516.jar.sha1
 delete mode 100644 solr/licenses/http2-server-9.4.34.v20201102.jar.sha1
 create mode 100644 solr/licenses/http2-server-9.4.41.v20210516.jar.sha1
 delete mode 100644 solr/licenses/jetty-alpn-client-9.4.34.v20201102.jar.sha1
 create mode 100644 solr/licenses/jetty-alpn-client-9.4.41.v20210516.jar.sha1
 delete mode 100644 solr/licenses/jetty-alpn-java-client-9.4.34.v20201102.jar.sha1
 create mode 100644 solr/licenses/jetty-alpn-java-client-9.4.41.v20210516.jar.sha1
 delete mode 100644 solr/licenses/jetty-alpn-java-server-9.4.34.v20201102.jar.sha1
 create mode 100644 solr/licenses/jetty-alpn-java-server-9.4.41.v20210516.jar.sha1
 delete mode 100644 solr/licenses/jetty-alpn-server-9.4.34.v20201102.jar.sha1
 create mode 100644 solr/licenses/jetty-alpn-server-9.4.41.v20210516.jar.sha1
 delete mode 100644 solr/licenses/jetty-client-9.4.34.v20201102.jar.sha1
 create mode 100644 solr/licenses/jetty-client-9.4.41.v20210516.jar.sha1
 delete mode 100644 solr/licenses/jetty-continuation-9.4.34.v20201102.jar.sha1
 create mode 100644 solr/licenses/jetty-continuation-9.4.41.v20210516.jar.sha1
 delete mode 100644 solr/licenses/jetty-deploy-9.4.34.v20201102.jar.sha1
 create mode 100644 solr/licenses/jetty-deploy-9.4.41.v20210516.jar.sha1
 delete mode 100644 solr/licenses/jetty-http-9.4.34.v20201102.jar.sha1
 create mode 100644 solr/licenses/jetty-http-9.4.41.v20210516.jar.sha1
 delete mode 100644 solr/licenses/jetty-io-9.4.34.v20201102.jar.sha1
 create mode 100644 solr/licenses/jetty-io-9.4.41.v20210516.jar.sha1
 delete mode 100644 solr/licenses/jetty-jmx-9.4.34.v20201102.jar.sha1
 create mode 100644 solr/licenses/jetty-jmx-9.4.41.v20210516.jar.sha1
 delete mode 100644 solr/licenses/jetty-rewrite-9.4.34.v20201102.jar.sha1
 create mode 100644 solr/licenses/jetty-rewrite-9.4.41.v20210516.jar.sha1
 delete mode 100644 solr/licenses/jetty-security-9.4.34.v20201102.jar.sha1
 create mode 100644 solr/licenses/jetty-security-9.4.41.v20210516.jar.sha1
 delete mode 100644 solr/licenses/jetty-server-9.4.34.v20201102.jar.sha1
 create mode 100644 solr/licenses/jetty-server-9.4.41.v20210516.jar.sha1
 delete mode 100644 solr/licenses/jetty-servlet-9.4.34.v20201102.jar.sha1
 create mode 100644 solr/licenses/jetty-servlet-9.4.41.v20210516.jar.sha1
 delete mode 100644 solr/licenses/jetty-servlets-9.4.34.v20201102.jar.sha1
 create mode 100644 solr/licenses/jetty-servlets-9.4.41.v20210516.jar.sha1
 delete mode 100644 solr/licenses/jetty-start-9.4.34.v20201102-shaded.jar.sha1
 create mode 100644 solr/licenses/jetty-start-9.4.41.v20210516-shaded.jar.sha1
 delete mode 100644 solr/licenses/jetty-util-9.4.34.v20201102.jar.sha1
 create mode 100644 solr/licenses/jetty-util-9.4.41.v20210516.jar.sha1
 create mode 100644 solr/licenses/jetty-util-ajax-9.4.41.v20210516.jar.sha1
 delete mode 100644 solr/licenses/jetty-webapp-9.4.34.v20201102.jar.sha1
 create mode 100644 solr/licenses/jetty-webapp-9.4.41.v20210516.jar.sha1
 delete mode 100644 solr/licenses/jetty-xml-9.4.34.v20201102.jar.sha1
 create mode 100644 solr/licenses/jetty-xml-9.4.41.v20210516.jar.sha1
 delete mode 100644 solr/licenses/jose4j-0.6.5.jar.sha1
 create mode 100644 solr/licenses/jose4j-0.7.7.jar.sha1
 delete mode 100644 solr/licenses/netty-buffer-4.1.50.Final.jar.sha1
 create mode 100644 solr/licenses/netty-buffer-4.1.59.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-codec-4.1.50.Final.jar.sha1
 create mode 100644 solr/licenses/netty-codec-4.1.59.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-common-4.1.50.Final.jar.sha1
 create mode 100644 solr/licenses/netty-common-4.1.59.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-handler-4.1.50.Final.jar.sha1
 create mode 100644 solr/licenses/netty-handler-4.1.59.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-resolver-4.1.50.Final.jar.sha1
 create mode 100644 solr/licenses/netty-resolver-4.1.59.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-transport-4.1.50.Final.jar.sha1
 create mode 100644 solr/licenses/netty-transport-4.1.59.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-transport-native-epoll-4.1.50.Final.jar.sha1
 create mode 100644 solr/licenses/netty-transport-native-epoll-4.1.59.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-transport-native-unix-common-4.1.50.Final.jar.sha1
 create mode 100644 solr/licenses/netty-transport-native-unix-common-4.1.59.Final.jar.sha1
 delete mode 100644 solr/licenses/rrd4j-3.5.jar.sha1
 delete mode 100644 solr/licenses/rrd4j-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/rrd4j-NOTICE.txt
 delete mode 100644 solr/licenses/zookeeper-3.6.2.jar.sha1
 create mode 100644 solr/licenses/zookeeper-3.7.0.jar.sha1
 delete mode 100644 solr/licenses/zookeeper-jute-3.6.2.jar.sha1
 create mode 100644 solr/licenses/zookeeper-jute-3.7.0.jar.sha1
 rename solr/{docker/Docker-FAQ.md => solr-ref-guide/src/docker-faq.adoc} (66%)
 rename solr/{docker/docs/docker-networking.md => solr-ref-guide/src/docker-networking.adoc} (75%)
 create mode 100644 solr/solr-ref-guide/src/images/combining-distribution-and-replication/distributed-replication.png
 delete mode 100644 solr/solr-ref-guide/src/images/combining-distribution-and-replication/worddav4101c16174820e932b44baa22abcfcd1.png
 create mode 100644 solr/solr-ref-guide/src/images/index-replication/leader-follower-replication.png
 delete mode 100644 solr/solr-ref-guide/src/images/index-replication/worddav2b7e14725d898b4104cdd9c502fc77cd.png
 delete mode 100644 solr/solr-ref-guide/src/images/suggestions-screen/no-violations.png
 delete mode 100644 solr/solr-ref-guide/src/images/suggestions-screen/violations-with-action.png
 delete mode 100644 solr/solr-ref-guide/src/images/suggestions-screen/violations.png
 delete mode 100644 solr/solr-ref-guide/src/metrics-history.adoc
 create mode 100644 solr/solr-ref-guide/src/running-solr-in-docker.adoc
 create mode 100644 solr/test-framework/src/java/org/apache/solr/util/QueryMatchers.java
 delete mode 100644 solr/webapp/web/favicon.ico