This is an automated email from the ASF dual-hosted git repository.
ctargett pushed a change to branch jira/solr-15556-antora
in repository https://gitbox.apache.org/repos/asf/solr.git.
from c8df19f Update location to UI bundle
add 6452154 SOLR-15648 ManagedSchema#GetZkSchemaVersionCallable can get
into a loop that wants to go on for 10 minutes before it cuts off. (#352)
add 5ce9e8f SOLR-15638: AffinityPlacementFactoryTest is ridiculous long
on a non nightly test runs. (#354)
add a32eaf8 SOLR-15697: Add ErrorLogMuter to test-framework, deprecating
SolrException.ignorePatterns
add e686024 SOLR-13671 Allow 'var' keyword in Java sources (#366)
add d65a69d SOLR-15628: Update changes on main branch to reflect backport
to 8x for 8.11
add caf22f1 SOLR-15572: Improve the default Prometheus exporter config
performance.
add 1be2efd SOLR-15716: Remove deprecated SolrException.ignorePatterns
and related code
add 2e12ce4 SOLR-15699: remove unused
updateHandler/indexWriter/closeWaitsForMerges element (#350)
add 79e15be SOLR-15719: LongSet.add to return boolean; add LongSetTest;
(#370)
add 3d9adf6 SOLR-15676: UpdateLog.RecentUpdates.getDeleteByQuery to not
return duplicate versions (#329)
add be2db72 SOLR-15676: UpdateLog.RecentUpdates.getVersions to not return
duplicate versions (#331)
add 8c3bf90 SOLR-15676: add solr/CHANGES.txt entry
add 7076359 SOLR-15722 (#374)
add a25c531 Add recovery check before querying in backup-restore test.
add 291068d SOLR-15608: Remove deprecated methods, classes and
constructors from SolrJ (#369)
add 06be1ac SOLR-15707: Add the ability to set the AWS Profile per
S3Repository (#357)
add 28139d2 SOLR-15337: Avoid XPath in solrconfig.xml parsing (#160)
add f0139e5 SOLR-12666: Add authn & authz plugins that supports multiple
authentication schemes, such as Bearer and Basic (#355)
add 8075bff Bump owasp-dependencycheck to 6.4.1.1 (#381)
add ab9bec6 SOLR-15728: Remove dead, unused log rotation code from
SolrCLI (#375)
add 4fdde44 gradle: Dependency tune-up of solr-core & solrj (#349)
add 6320e3f SOLR-15647: TestRebalanceLeaders#testRebalanceLeaders can be
abysmally slow. (#367)
add 6e680a2 SOLR-15761: Remove JdbcStream from Lang
add 3172327 SOLR-15721: Support editing Basic auth config when using the
MultiAuthPlugin (#393)
add 23b07ef SOLR-15764 (based on LUCENE-10218): Extend
validateSourcePatterns task to scan for LTR/RTL unicode to catch "Trojan
Source" source code attacks
add c3be04d SOLR-15757: 1st pass at some light organization structure
add c7592dc SOLR-15728 Clean up remains of "utils" tool in SolrCLI (#392)
add b3835dc SOLR-15766: MultiAuthPlugin should send non-AJAX anonymous
requests to the plugin that allows anonymous requests (#394)
add e7f025a SOLR-15763 : Fix documentation in indexing with tika (#391)
add 1fffc52 SOLR-15467: Rename Parrallel SQL to just SQL throughout Solr
docs (#364)
add b532f4d SOLR-15706: Fix incorrect path in backup purging
add df70f90 SOLR-10529: Solr UI Health Check enable/disable ping Button
doesn't work (#398)
add 03af2de SOLR-15351: Rewrite GET /v2/c/collName using annotations
(#396)
add a363acd LUCENE-9229 fixed jdk9 equals method link (#401)
add f589607 SOLR-15705: A deleteById request without _route_ param for
compositeid router could be sent to all shard leaders (#288)
add 2d39598 SOLR-15762 Error on Join Query with sync cache
add 9fe0ce4 SOLR-15762 Always async cache for join query tests
add 93c36a8 fixed esri link (#400)
add 67c55b5 LUCENE-9229 fixed 3 javadoc links 1) google guave, 2&3) Two
links relocated away from "aggregateknowledge" (#402)
add 2d2d4c4 SOLR-10529 Revert change to solrconfig for techproducts
example as it introduced test failures
add 79f3d18 SOLR-15663: JsonFaceting benchmark should flush by doc count
for better reproducible behavior. (#388)
add 5c6d12d Fix githubPRs.py to query the new solr repo (#405)
add 1c80803 SOLR-15660: Remove universal 10 second test thread leak
linger. (#377)
add 401da35 SOLR-15711: Fix GCSRepository to follow createDirectory API
contract (#373)
add 2e5f89a SOLR-15783: Prevent Logging MDC values from leaking between
request threads, and set 'trace_id' in MDC as soon as it's available
add 7646353 SOLR-15793: ref-guide jrubyPrepare fails due to gems trying
to compile native code (#412)
add aea698b SOLR-15790: SearchHandler now includes the value in the
Logging MDC for the duration of the request, allowing custom logging
configurations to include it.
add 9ee30f1 SOLR-15791: Remove remaining <admin> clauses from solrconfigs
(#411)
add f088857 Switching a PRS collection from true -> false -> true results
in INACTIVE replicas (#413)
add dbdd2d4 SOLR-15635: don't repeat close hooks if SRI cleared twice due
to using MDCThreadPool (#376)
add 0f9e482 SOLR-15774: Avoid weird off-by-one errors with Angular's
'chosen' select box directive for the security and schema-designer screens in
Admin UI (#404)
add 81d3478 SOLR-15536: Rewrite /c/<coll>/shards v2 APIs using
annotations (#218)
add 9b1f8dd SOLR-15792: Rewrite shardname APIs using annotation framework
(#415)
add 8479055 SOLR-14781: Delete unused classes (#330)
add d18e247 SOLR-15619: add Long support for @JsonProperty annotations
(#285)
add c2dcba1 SOLR-15635: move to 8.11.1 in CHANGES.txt (#417)
add ccb7d4d DOAP changes for release 8.11.0
add bfee656 SOLR-15784 Remove SolrJ dep on commons-io (#407)
add 111bd91 SOLR-15785: Load custom endpoints from solr/lib (#408)
add 70a19f9 SOLR-15795: Fix REPLACENODE to not use source node (#414)
add be96b2b a very embarrasing misspelling of the name of a contributor
add c214e07 SOLR-15376: Accept "Long" values for
CollectionAdminRequest.CreateTimeRoutedAlias.setMaxFutureMs to support
durations greater than ~25 days. (#202)
add a8290de SOLR-13138: Remove deprecated spatial (#382)
add 1ba86a8 SOLR-15806: expand UpdateLogCloudTest coverage w.r.t.
Ephemeral vs. Standard DirectoryFactory use (#421)
add 46d2ad2 SOLR-15804 Allow content-types with ;charset in
ShowFileRequestHandler (#418)
add e90f50f SOLR-11623 Every request handler in Solr implement
PermissionNameProvider (#372)
add 5866f80 SOLR-15774: Move changes entry to 8.11.1 section
add 3ec2fa0 SOLR-15808: The jattach tool for Docker image is now
installed with apt (#423)
add cee22de SOLR-15700: Make include paths in bin/solr consistent (#358)
add 55f6fbf Revert "SOLR-11623 Every request handler in Solr implement
PermissionNameProvider (#372)"
add 5f34dbb SOLR-15182: Remove orphaned apispec file
add 058f2b6 Logging: SpellCheckComponent shouldn't log at info level
(#422)
add 0cb23c7 SOLR-15427: Nested docs: [child limit=...] now defaults to -1
(#144)
add bf39765 SOLR-15182: replica API conversion to annotations (#429)
add fc5fb26 Ref Guide: 8.11 upgrade notes
add 4bbc25f fixed comment (#430)
new b2a9a87 Merge branch 'main' into jira/solr-15556-antora
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:
build.gradle | 2 +-
dev-tools/doap/solr.rdf | 7 +
dev-tools/scripts/githubPRs.py | 10 +-
gradle/validation/forbidden-apis.gradle | 23 +-
gradle/validation/forbidden-apis/defaults.all.txt | 6 +
gradle/validation/validate-source-patterns.gradle | 55 +-
help/dependencies.txt | 4 +-
solr/CHANGES.txt | 83 ++-
solr/benchmark/build.gradle | 1 +
.../configs/cloud-minimal/conf/solrconfig.xml | 3 +-
.../solr/bench/MiniClusterBenchStateTest.java | 2 +
solr/bin/solr | 14 +-
solr/bin/solr.cmd | 25 -
solr/bin/solr.in.cmd | 5 -
solr/bin/solr.in.sh | 5 -
solr/contrib/analysis-extras/build.gradle | 1 +
.../apache/solr/schema/TestICUCollationField.java | 7 +-
.../schema/TestICUCollationFieldDocValues.java | 8 +-
solr/contrib/analytics/build.gradle | 2 +
.../analytics/function/reduction/MeanFunction.java | 7 -
.../analytics/function/reduction/SumFunction.java | 7 -
.../solr/analytics/util/OldAnalyticsParams.java | 34 --
.../solr/analytics/facet/PivotFacetTest.java | 2 +
.../legacy/LegacyAbstractAnalyticsTest.java | 3 +-
.../legacy/facet/LegacyFieldFacetCloudTest.java | 2 +
.../legacy/facet/LegacyRangeFacetCloudTest.java | 3 +-
.../util/OldAnalyticsRequestConverterUnitTest.java | 2 +
solr/contrib/clustering/build.gradle | 2 +
.../solr/handler/clustering/EngineParameters.java | 3 +-
solr/contrib/extraction/build.gradle | 1 +
.../solr/collection1/conf/solrconfig.xml | 11 +-
solr/contrib/gcs-repository/build.gradle | 1 +
.../org/apache/solr/gcs/GCSBackupRepository.java | 21 +-
.../apache/solr/gcs/GCSIncrementalBackupTest.java | 2 +
.../apache/solr/jaeger/TestJaegerConfigurator.java | 2 +
solr/contrib/langid/build.gradle | 2 +-
...penNLPLangDetectUpdateProcessorFactoryTest.java | 2 +
solr/contrib/ltr/build.gradle | 1 +
.../org/apache/solr/ltr/TestLTROnSolrCloud.java | 2 +
solr/contrib/prometheus-exporter/build.gradle | 8 +-
.../conf/solr-exporter-config.xml | 21 +-
.../solr/prometheus/exporter/MetricsQuery.java | 15 +-
.../solr/prometheus/scraper/SolrCloudScraper.java | 2 +-
...theus-solr-exporter-integration-test-config.xml | 17 +-
...rometheus-solr-exporter-scraper-test-config.xml | 15 +-
.../prometheus/PrometheusExporterTestBase.java | 26 +-
.../prometheus/collector/MetricSamplesTest.java | 35 +-
.../exporter/SolrExporterIntegrationTest.java | 2 +-
.../prometheus/scraper/SolrCloudScraperTest.java | 2 +
solr/contrib/s3-repository/build.gradle | 5 +
.../apache/solr/s3/S3BackupRepositoryConfig.java | 15 +-
.../java/org/apache/solr/s3/S3StorageClient.java | 64 ++-
.../org/apache/solr/s3/AbstractS3ClientTest.java | 8 +-
.../apache/solr/s3/S3IncrementalBackupTest.java | 7 +-
solr/contrib/scripting/build.gradle | 2 +
solr/core/build.gradle | 193 ++++---
.../apache/solr/api/ContainerPluginsRegistry.java | 6 +-
.../org/apache/solr/cloud/RecoveryStrategy.java | 14 +-
.../apache/solr/cloud/api/collections/Assign.java | 28 +-
.../cloud/api/collections/DeleteBackupCmd.java | 30 +-
.../solr/cloud/api/collections/ReplaceNodeCmd.java | 151 ++---
.../apache/solr/cloud/overseer/SliceMutator.java | 3 +-
.../java/org/apache/solr/core/ConfigOverlay.java | 4 +
.../org/apache/solr/core/ConfigSetService.java | 6 +
.../java/org/apache/solr/core/CoreContainer.java | 7 +-
.../org/apache/solr/core/OverlaidConfigNode.java | 109 ++++
.../src/java/org/apache/solr/core/PluginInfo.java | 24 +
.../src/java/org/apache/solr/core/SolrConfig.java | 493 ++++++++++-------
.../src/java/org/apache/solr/core/SolrCore.java | 4 +-
.../java/org/apache/solr/core/XmlConfigFile.java | 15 +-
.../solr/core/backup/ShardBackupMetadata.java | 8 +
.../org/apache/solr/filestore/PackageStoreAPI.java | 14 +-
.../org/apache/solr/handler/CollectionsAPI.java | 10 +-
.../apache/solr/handler/ContentStreamLoader.java | 49 --
.../apache/solr/handler/DumpRequestHandler.java | 1 +
.../apache/solr/handler/MoreLikeThisHandler.java | 4 +-
.../solr/handler/admin/BaseHandlerApiSupport.java | 4 +-
.../solr/handler/admin/CollectionHandlerApi.java | 77 ---
.../solr/handler/admin/CollectionsHandler.java | 17 +-
.../solr/handler/admin/CoreAdminHandlerApi.java | 4 +-
.../solr/handler/admin/ShowFileRequestHandler.java | 10 +-
...ModifyCollectionAPI.java => AddReplicaAPI.java} | 57 +-
.../handler/admin/api/CollectionStatusAPI.java | 61 +++
...odifyCollectionAPI.java => CreateShardAPI.java} | 59 +-
.../solr/handler/admin/api/DeleteReplicaAPI.java | 61 +++
.../solr/handler/admin/api/DeleteShardAPI.java | 63 +++
.../solr/handler/admin/api/ForceLeaderAPI.java | 68 +++
.../handler/admin/api/ModifyCollectionAPI.java | 10 +-
...ModifyCollectionAPI.java => SplitShardAPI.java} | 57 +-
.../solr/handler/admin/api/SyncShardAPI.java | 68 +++
.../org/apache/solr/handler/api/ApiRegistrar.java | 23 +-
.../org/apache/solr/handler/api/V2ApiUtils.java} | 19 +-
.../handler/component/RealTimeGetComponent.java | 5 +-
.../solr/handler/component/SearchHandler.java | 16 +-
.../solr/handler/component/ShardResponse.java | 3 +-
.../handler/component/SpellCheckComponent.java | 6 +-
.../java/org/apache/solr/legacy/BBoxStrategy.java | 3 +-
.../org/apache/solr/legacy/BBoxValueSource.java | 1 +
.../apache/solr/legacy/DistanceValueSource.java | 120 ----
.../apache/solr/legacy/PointVectorStrategy.java | 289 ----------
.../java/org/apache/solr/logging/MDCSnapshot.java | 58 ++
.../org/apache/solr/request/SolrRequestInfo.java | 70 ++-
.../apache/solr/response/RawResponseWriter.java | 5 +-
.../transform/ChildDocTransformerFactory.java | 22 +-
.../org/apache/solr/schema/AbstractEnumField.java | 2 +-
.../apache/solr/schema/FieldTypePluginLoader.java | 6 +-
.../java/org/apache/solr/schema/GeoHashField.java | 103 ----
.../java/org/apache/solr/schema/IndexSchema.java | 25 +-
.../org/apache/solr/schema/IndexSchemaFactory.java | 14 +-
.../java/org/apache/solr/schema/LatLonType.java | 606 ---------------------
.../org/apache/solr/schema/ManagedIndexSchema.java | 14 +-
.../src/java/org/apache/solr/schema/PointType.java | 4 +-
.../solr/schema/SpatialPointVectorFieldType.java | 106 ----
.../org/apache/solr/schema/SpatialQueryable.java | 2 +-
.../SpatialTermQueryPrefixTreeFieldType.java | 33 --
.../java/org/apache/solr/search/CacheConfig.java | 40 +-
.../java/org/apache/solr/search/CaffeineCache.java | 5 +
.../org/apache/solr/search/JoinQParserPlugin.java | 2 +-
.../src/java/org/apache/solr/search/JoinQuery.java | 5 +
.../src/java/org/apache/solr/search/SolrCache.java | 11 +
.../solr/search/SpatialFilterQParserPlugin.java | 8 +-
.../apache/solr/search/facet/FacetFieldMerger.java | 42 --
.../distance/GeoDistValueSourceParser.java | 2 +-
.../search/function/distance/GeohashFunction.java | 1 +
.../distance/GeohashHaversineFunction.java | 3 +-
.../org/apache/solr/security/BasicAuthPlugin.java | 2 +-
.../org/apache/solr/security/MultiAuthPlugin.java | 280 ++++++++++
.../MultiAuthRuleBasedAuthorizationPlugin.java | 150 +++++
.../java/org/apache/solr/servlet/HttpSolrCall.java | 7 +-
.../apache/solr/servlet/SolrDispatchFilter.java | 11 +-
.../apache/solr/update/DirectUpdateHandler2.java | 4 -
.../org/apache/solr/update/SolrCmdDistributor.java | 4 -
.../org/apache/solr/update/SolrIndexConfig.java | 82 ++-
.../src/java/org/apache/solr/update/UpdateLog.java | 22 +-
.../java/org/apache/solr/update/VersionInfo.java | 4 +-
.../processor/DistributedZkUpdateProcessor.java | 103 ++--
.../HTMLStripFieldUpdateProcessorFactory.java | 2 +-
.../java/org/apache/solr/util/DOMConfigNode.java | 12 +-
.../java/org/apache/solr/util/DataConfigNode.java | 71 +--
.../src/java/org/apache/solr/util/LongSet.java | 15 +-
.../java/org/apache/solr/util/RedactionUtils.java | 55 --
.../src/java/org/apache/solr/util/SolrCLI.java | 326 ++---------
.../src/java/org/apache/solr/util/hll/HLL.java | 6 +-
.../resources/EditableSolrConfigAttributes.json | 7 +-
.../solr/collection1/conf/schema-hash.xml | 28 -
.../solr/collection1/conf/schema-minhash.xml | 28 -
.../solr/collection1/conf/schema-rest.xml | 15 -
.../solr/collection1/conf/schema-spatial.xml | 23 +-
.../solr/collection1/conf/schema-sql.xml | 28 -
.../test-files/solr/collection1/conf/schema.xml | 21 +-
.../test-files/solr/collection1/conf/schema11.xml | 17 -
.../test-files/solr/collection1/conf/schema12.xml | 22 +-
.../test-files/solr/collection1/conf/schema15.xml | 18 +-
.../solr/collection1/conf/schema_latest.xml | 35 +-
.../solr/collection1/conf/schemasurround.xml | 17 -
.../conf/solrconfig-analytics-query.xml | 6 -
.../conf/solrconfig-collapseqparser.xml | 6 -
.../conf/solrconfig-components-name.xml | 7 +-
.../conf/solrconfig-doctransformers.xml | 6 -
.../solr/collection1/conf/solrconfig-elevate.xml | 11 +-
.../solr/collection1/conf/solrconfig-hash.xml | 6 -
.../solr/collection1/conf/solrconfig-minhash.xml | 30 +-
.../collection1/conf/solrconfig-plugcollector.xml | 5 -
.../solr/collection1/conf/solrconfig-sql.xml | 6 -
.../solr/collection1/conf/solrconfig-test-misc.xml | 8 +-
.../solr/collection1/conf/solrconfig.xml | 34 +-
.../solr/configsets/cloud-dynamic/conf/schema.xml | 14 +-
.../solr/configsets/doc-expiry/conf/schema.xml | 18 -
.../test-files/solr/configsets/sql/conf/schema.xml | 15 -
.../src/test-files/solr/crazy-path-to-config.xml | 5 -
.../solr/security/multi_auth_plugin_security.json | 71 +++
.../src/test/org/apache/hadoop/fs/HardLink.java | 14 -
.../test/org/apache/solr/ConvertedLegacyTest.java | 41 +-
.../test/org/apache/solr/TestCrossCoreJoin.java | 30 +-
.../test/org/apache/solr/TestGroupingSearch.java | 14 +-
solr/core/src/test/org/apache/solr/TestJoin.java | 1 +
.../apache/solr/cloud/CollectionsAPISolrJTest.java | 2 -
.../solr/cloud/FullSolrCloudDistribCmdsTest.java | 35 +-
.../cloud/HttpPartitionWithTlogReplicasTest.java | 2 +
.../org/apache/solr/cloud/ReplaceNodeTest.java | 73 ++-
.../apache/solr/cloud/TestCloudConsistency.java | 2 +
.../solr/cloud/TestLeaderElectionZkExpiry.java | 8 +-
.../apache/solr/cloud/TestRebalanceLeaders.java | 33 +-
.../org/apache/solr/cloud/TestStressLiveNodes.java | 2 +
.../ConcurrentDeleteAndCreateCollectionTest.java | 21 +-
.../HdfsCloudIncrementalBackupTest.java | 8 +-
.../solr/cloud/api/collections/PurgeGraphTest.java | 266 ++++-----
.../collections/TestHdfsCloudBackupRestore.java | 2 +
.../solr/cloud/hdfs/HDFSCollectionsAPITest.java | 2 +
.../cloud/hdfs/HdfsBasicDistributedZk2Test.java | 2 +
.../cloud/hdfs/HdfsBasicDistributedZkTest.java | 2 +
.../hdfs/HdfsChaosMonkeyNothingIsSafeTest.java | 2 +
.../cloud/hdfs/HdfsChaosMonkeySafeLeaderTest.java | 2 +
.../apache/solr/cloud/hdfs/HdfsNNFailoverTest.java | 2 +
.../solr/cloud/hdfs/HdfsRecoverLeaseTest.java | 2 +
.../apache/solr/cloud/hdfs/HdfsRecoveryZkTest.java | 2 +
.../cloud/hdfs/HdfsRestartWhileUpdatingTest.java | 2 +
.../apache/solr/cloud/hdfs/HdfsSyncSliceTest.java | 2 +
.../org/apache/solr/cloud/hdfs/HdfsTestUtil.java | 2 +
.../apache/solr/cloud/hdfs/HdfsThreadLeakTest.java | 2 +
.../HdfsTlogReplayBufferedWhileIndexingTest.java | 2 +
.../cloud/hdfs/HdfsUnloadDistributedZkTest.java | 2 +
.../hdfs/HdfsWriteToMultipleCollectionsTest.java | 2 +
.../org/apache/solr/cloud/hdfs/StressHdfsTest.java | 2 +
.../cluster/events/ClusterEventProducerTest.java | 4 +-
.../plugins/AffinityPlacementFactoryTest.java | 42 +-
.../solr/core/BlobRepositoryMockingTest.java | 4 +-
.../solr/core/BlobStoreTestRequestHandler.java | 62 ---
.../apache/solr/core/HdfsDirectoryFactoryTest.java | 2 +
.../test/org/apache/solr/core/MockInfoBean.java | 65 ---
.../test/org/apache/solr/core/TestBadConfig.java | 12 -
.../org/apache/solr/core/TestCodecSupport.java | 6 +-
.../org/apache/solr/core/TestConfLoadPerf.java | 88 +++
.../src/test/org/apache/solr/core/TestConfig.java | 55 +-
.../org/apache/solr/core/TestConfigOverlay.java | 5 -
.../org/apache/solr/core/TestSimpleTextCodec.java | 2 +-
.../HdfsBackupRepositoryIntegrationTest.java | 2 +
.../org/apache/solr/handler/TestBlobHandler.java | 2 +
.../solr/handler/TestHdfsBackupRestoreCore.java | 2 +
.../org/apache/solr/handler/TestRequestId.java | 103 ++++
.../solr/handler/admin/DaemonStreamApiTest.java | 2 +
.../solr/handler/admin/MBeansHandlerTest.java | 3 +
.../handler/admin/ShowFileRequestHandlerTest.java | 7 +
.../solr/handler/admin/TestApiFramework.java | 5 +-
.../solr/handler/admin/TestCollectionAPIs.java | 30 +-
.../admin/api/V2CollectionAPIMappingTest.java | 39 +-
.../handler/admin/api/V2ShardsAPIMappingTest.java | 291 ++++++++++
.../DistributedQueryComponentCustomSortTest.java | 2 +
.../handler/component/SuggestComponentTest.java | 122 +++--
.../solr/handler/component/UpdateLogCloudTest.java | 22 +-
.../apache/solr/request/TestRemoteStreaming.java | 2 +-
.../apache/solr/request/TestSolrRequestInfo.java | 80 +++
.../solr/response/TestGeoJSONResponseWriter.java | 9 +-
.../transform/TestSubQueryTransformerDistrib.java | 7 +-
.../rest/schema/TestFieldCollectionResource.java | 24 +-
.../test/org/apache/solr/schema/RankFieldTest.java | 34 +-
.../org/apache/solr/search/QueryEqualityTest.java | 40 +-
.../org/apache/solr/search/ReturnFieldsTest.java | 22 +-
.../org/apache/solr/search/SpatialFilterTest.java | 21 +-
.../org/apache/solr/search/TestSolr4Spatial.java | 5 +-
.../apache/solr/search/TestSolrQueryParser.java | 1 +
.../apache/solr/search/TestValueSourceCache.java | 6 +-
.../function/distance/DistanceFunctionTest.java | 80 ++-
.../search/join/InvalidConfigJoinQueryTest.java | 47 ++
.../solr/search/join/TestScoreJoinQPNoScore.java | 1 +
.../solr/search/join/TestScoreJoinQPScore.java | 1 +
.../solr/security/BasicAuthStandaloneTest.java | 32 +-
.../apache/solr/security/MultiAuthPluginTest.java | 263 +++++++++
.../apache/solr/store/hdfs/HdfsDirectoryTest.java | 2 +
.../apache/solr/update/SolrIndexConfigTest.java | 12 +-
.../AbstractAtomicUpdatesMultivalueTestBase.java | 6 +-
.../TimeRoutedAliasUpdateProcessorTest.java | 43 ++
.../src/test/org/apache/solr/util/LongSetTest.java | 94 ++++
.../solr/util/TestSolrJacksonAnnotation.java | 6 +
.../test/org/apache/solr/util/UtilsToolTest.java | 206 -------
solr/docker/templates/Dockerfile.body.template | 7 +-
solr/licenses/annotations-2.16.93.jar.sha1 | 1 -
solr/licenses/annotations-2.17.63.jar.sha1 | 1 +
solr/licenses/apache-client-2.16.93.jar.sha1 | 1 -
solr/licenses/apache-client-2.17.63.jar.sha1 | 1 +
solr/licenses/arns-2.16.93.jar.sha1 | 1 -
solr/licenses/arns-2.17.63.jar.sha1 | 1 +
solr/licenses/auth-2.16.93.jar.sha1 | 1 -
solr/licenses/auth-2.17.63.jar.sha1 | 1 +
solr/licenses/aws-core-2.16.93.jar.sha1 | 1 -
solr/licenses/aws-core-2.17.63.jar.sha1 | 1 +
solr/licenses/aws-query-protocol-2.16.93.jar.sha1 | 1 -
solr/licenses/aws-query-protocol-2.17.63.jar.sha1 | 1 +
solr/licenses/aws-xml-protocol-2.16.93.jar.sha1 | 1 -
solr/licenses/aws-xml-protocol-2.17.63.jar.sha1 | 1 +
solr/licenses/commons-compiler-3.0.11.jar.sha1 | 1 +
solr/licenses/commons-compiler-3.0.9.jar.sha1 | 1 -
solr/licenses/eigenbase-properties-1.1.5.jar.sha1 | 1 -
solr/licenses/eigenbase-properties-LICENSE-ASL.txt | 202 -------
solr/licenses/eigenbase-properties-NOTICE.txt | 20 -
solr/licenses/http-client-spi-2.16.93.jar.sha1 | 1 -
solr/licenses/http-client-spi-2.17.63.jar.sha1 | 1 +
solr/licenses/janino-3.0.11.jar.sha1 | 1 +
solr/licenses/janino-3.0.9.jar.sha1 | 1 -
solr/licenses/json-utils-2.17.63.jar.sha1 | 1 +
...-LICENSE-ASL.txt => json-utils-LICENSE-ASL.txt} | 0
.../{utils-NOTICE.txt => json-utils-NOTICE.txt} | 0
solr/licenses/kerby-kdc-1.0.1.jar.sha1 | 1 -
solr/licenses/kerby-kdc-LICENSE-ASL.txt | 201 -------
solr/licenses/kerby-kdc-NOTICE.txt | 5 -
solr/licenses/metrics-spi-2.16.93.jar.sha1 | 1 -
solr/licenses/metrics-spi-2.17.63.jar.sha1 | 1 +
solr/licenses/profiles-2.16.93.jar.sha1 | 1 -
solr/licenses/profiles-2.17.63.jar.sha1 | 1 +
solr/licenses/protocol-core-2.16.93.jar.sha1 | 1 -
solr/licenses/protocol-core-2.17.63.jar.sha1 | 1 +
solr/licenses/regions-2.16.93.jar.sha1 | 1 -
solr/licenses/regions-2.17.63.jar.sha1 | 1 +
solr/licenses/s3-2.16.93.jar.sha1 | 1 -
solr/licenses/s3-2.17.63.jar.sha1 | 1 +
solr/licenses/sdk-core-2.16.93.jar.sha1 | 1 -
solr/licenses/sdk-core-2.17.63.jar.sha1 | 1 +
.../third-party-jackson-core-2.17.63.jar.sha1 | 1 +
...xt => third-party-jackson-core-LICENSE-ASL.txt} | 0
...ICE.txt => third-party-jackson-core-NOTICE.txt} | 0
.../url-connection-client-2.16.93.jar.sha1 | 1 -
.../url-connection-client-2.17.63.jar.sha1 | 1 +
solr/licenses/utils-2.16.93.jar.sha1 | 1 -
solr/licenses/utils-2.17.63.jar.sha1 | 1 +
.../conf/managed-schema | 9 +-
.../conf/solrconfig.xml | 1 -
solr/solr-ref-guide/build.gradle | 3 +
.../configuration-guide/pages/config-api.adoc | 1 -
.../pages/implicit-requesthandlers.adoc | 4 +-
.../deployment-guide/pages/backup-restore.adoc | 61 ++-
.../pages/basic-authentication-plugin.adoc | 64 +++
.../pages/configuring-logging.adoc | 1 -
.../pages/jwt-authentication-plugin.adoc | 6 +
.../pages/rule-based-authorization-plugin.adoc | 37 +-
.../getting-started/pages/solr-admin-ui.adoc | 1 +
.../pages/field-types-included-with-solr.adoc | 2 -
.../indexing-guide/pages/indexing-with-tika.adoc | 2 +-
.../pages/partial-document-updates.adoc | 2 +-
.../cluster.png | Bin
.../query-guide/images/sql-screen/sql-query-ui.png | Bin 0 -> 129399 bytes
.../query-guide/pages/document-transformers.adoc | 4 +-
.../pages/query-syntax-and-parsers.adoc | 9 +-
.../modules/query-guide/pages/spatial-search.adoc | 16 +-
...{parallel-sql-interface.adoc => sql-query.adoc} | 309 +++++------
.../modules/query-guide/pages/sql-screen.adoc | 26 +
.../modules/query-guide/querying-nav.adoc | 3 +-
.../pages/major-changes-in-solr-6.adoc | 5 +-
.../pages/major-changes-in-solr-7.adoc | 2 +-
.../pages/major-changes-in-solr-9.adoc | 274 +++++-----
.../upgrade-notes/pages/solr-upgrade-notes.adoc | 39 +-
solr/solr-ref-guide/package-lock.json | 32 +-
solr/solrj/build.gradle | 35 +-
.../client/solrj/impl/BaseCloudSolrClient.java | 29 +-
.../client/solrj/impl/CloudHttp2SolrClient.java | 4 -
.../solr/client/solrj/impl/CloudSolrClient.java | 157 +-----
.../solrj/impl/ConcurrentUpdateSolrClient.java | 74 +--
.../solrj/impl/DelegationTokenHttpSolrClient.java | 58 +-
.../solr/client/solrj/impl/Http2SolrClient.java | 8 +-
.../solrj/impl/HttpClusterStateProvider.java | 3 +
.../solr/client/solrj/impl/HttpSolrClient.java | 121 ++--
.../solr/client/solrj/impl/LBHttpSolrClient.java | 92 +---
.../solr/client/solrj/impl/NoOpResponseParser.java | 6 +-
.../client/solrj/impl/SolrHttpClientBuilder.java | 5 -
.../solrj/impl/ZkClientClusterStateProvider.java | 4 +-
.../java/org/apache/solr/client/solrj/io/Lang.java | 1 -
.../solr/client/solrj/request/ApiMapping.java | 77 +++
.../solrj/request/CollectionAdminRequest.java | 15 +-
.../client/solrj/request/CollectionApiMapping.java | 267 ---------
.../solrj/request/ConfigSetAdminRequest.java | 4 +-
.../solrj/request/ContentStreamUpdateRequest.java | 3 +-
.../solr/client/solrj/request/CoreApiMapping.java | 6 +-
.../solrj/request/MultiContentWriterRequest.java | 2 +-
.../solrj/request/StreamingUpdateRequest.java | 4 +-
.../solr/client/solrj/request/UpdateRequest.java | 21 +-
.../solr/client/solrj/request/V1toV2ApiMapper.java | 145 -----
.../solr/client/solrj/request/V2Request.java | 3 +-
.../solrj/request/beans/AddReplicaPayload.java | 73 +++
.../solrj/request/beans/CreateAliasPayload.java | 2 +-
.../solrj/request/beans/CreateShardPayload.java | 56 ++
.../solrj/request/beans/ForceLeaderPayload.java} | 11 +-
.../solrj/request/beans/SplitShardPayload.java | 63 +++
.../solrj/request/beans/SyncShardPayload.java} | 13 +-
.../org/apache/solr/cluster/api/SimpleMap.java | 13 +-
.../java/org/apache/solr/common/ConfigNode.java | 124 ++++-
.../apache/solr/common/EmptyEntityResolver.java | 8 +-
.../java/org/apache/solr/common/SolrException.java | 114 +---
.../solr/common/cloud/CompositeIdRouter.java | 13 +
.../apache/solr/common/cloud/PerReplicaStates.java | 4 +
.../solr/common/cloud/PerReplicaStatesOps.java | 20 +-
.../org/apache/solr/common/cloud/SolrZkClient.java | 8 +-
.../solr/common/params/CommonAdminParams.java | 2 +
.../common/util/ByteArrayUtf8CharSequence.java | 2 +-
.../java/org/apache/solr/common/util/DOMUtil.java | 10 +-
.../apache/solr/common/util/JsonSchemaCreator.java | 2 +
.../solr/common/util/JsonSchemaValidator.java | 13 +
.../solr/common/util/LinkedSimpleHashMap.java | 34 --
.../apache/solr/common/util/WrappedSimpleMap.java | 11 +
solr/solrj/src/java/org/noggit/CharArr.java | 67 ---
.../cluster.security.MultiPluginAuth.Commands.json | 27 +
.../collections.collection.Commands.modify.json | 16 -
.../resources/apispec/collections.collection.json | 19 -
.../collections.collection.shards.Commands.json | 129 -----
...llections.collection.shards.shard.Commands.json | 24 -
...collections.collection.shards.shard.delete.json | 27 -
...ons.collection.shards.shard.replica.delete.json | 39 --
.../solrj/solr/collection1/conf/schema-sql.xml | 28 -
.../solrj/solr/collection1/conf/schema.xml | 28 -
.../solrj/solr/collection1/conf/solrconfig-sql.xml | 6 -
.../solrj/solr/collection1/conf/solrconfig.xml | 10 +-
.../solrj/solr/configsets/ml/conf/solrconfig.xml | 6 -
.../solr/configsets/shared/conf/solrconfig.xml | 10 +-
.../solr/configsets/streaming/conf/schema.xml | 31 +-
.../solr/configsets/streaming/conf/solrconfig.xml | 6 -
.../solrj/solr/multicore/core0/conf/solrconfig.xml | 20 +-
.../solrj/solr/multicore/core1/conf/solrconfig.xml | 20 +-
.../solrj/impl/CloudSolrClientBuilderTest.java | 7 -
.../solrj/impl/CloudSolrClientCacheTest.java | 4 +-
.../impl/CloudSolrClientMultiConstructorTest.java | 3 +-
.../client/solrj/impl/CloudSolrClientTest.java | 73 ++-
.../solrj/impl/HttpSolrClientConPoolTest.java | 5 +-
.../client/solrj/impl/LBHttpSolrClientTest.java | 7 +-
.../org/apache/solr/client/solrj/io/TestLang.java | 2 +-
.../client/solrj/io/stream/JDBCStreamTest.java | 2 +
.../solrj/io/stream/StreamExpressionTest.java | 2 +
.../io/stream/eval/ConversionEvaluatorsTest.java | 3 +-
.../io/stream/eval/TemporalEvaluatorsTest.java | 4 +-
.../solrj/io/stream/ops/ConcatOperationTest.java | 4 +-
.../client/solrj/io/stream/ops/OperationsTest.java | 4 +-
.../client/solrj/request/TestV1toV2ApiMapper.java | 41 --
.../solr/client/solrj/request/TestV2Request.java | 2 +
.../cloud/PerReplicaStatesIntegrationTest.java | 47 ++
.../apache/solr/common/util/ContentStreamTest.java | 12 +-
.../apache/solr/common/util/JsonValidatorTest.java | 23 +-
.../solr/common/util/TestFastJavabinDecoder.java | 3 +-
.../solr/common/util/TestJsonRecordReader.java | 3 +-
solr/test-framework/build.gradle | 14 +-
.../apache/solr/EmbeddedSolrServerTestBase.java | 32 +-
.../org/apache/solr/SolrIgnoredThreadsFilter.java | 33 +-
.../java/org/apache/solr/SolrJettyTestBase.java | 45 +-
.../src/java/org/apache/solr/SolrTestCase.java | 2 +-
.../src/java/org/apache/solr/SolrTestCaseHS.java | 12 +-
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 115 ++--
.../apache/solr/cloud/MiniSolrCloudCluster.java | 2 +-
.../collections/AbstractIncrementalBackupTest.java | 10 +-
.../solr/core/MockConcurrentMergeScheduler.java | 34 --
.../org/apache/solr/util/BadHdfsThreadsFilter.java | 2 +
.../solr/util/BadMrClusterThreadsFilter.java | 37 --
.../java/org/apache/solr/util/DirectoryUtil.java | 57 ++
.../java/org/apache/solr/util/ErrorLogMuter.java | 256 +++++++++
.../org/apache/solr/util/Log4jListAppender.java | 79 +++
.../src/java/org/apache/solr/util/TestHarness.java | 12 +-
.../solr/cloud/MiniSolrCloudClusterTest.java | 2 +
.../org/apache/solr/util/TestErrorLogMuter.java | 145 +++++
solr/webapp/web/css/angular/security.css | 22 +
.../web/js/angular/controllers/core-overview.js | 2 +
solr/webapp/web/js/angular/controllers/files.js | 6 +-
.../web/js/angular/controllers/schema-designer.js | 9 +
solr/webapp/web/js/angular/controllers/security.js | 180 +++++-
solr/webapp/web/js/angular/services.js | 2 +
solr/webapp/web/partials/core_overview.html | 4 +-
solr/webapp/web/partials/schema-designer.html | 20 +-
solr/webapp/web/partials/security.html | 29 +-
solr/webapp/web/partials/sqlquery.html | 2 +-
versions.lock | 132 ++---
versions.props | 3 +-
445 files changed, 6699 insertions(+), 6845 deletions(-)
create mode 100644
solr/core/src/java/org/apache/solr/core/OverlaidConfigNode.java
delete mode 100644
solr/core/src/java/org/apache/solr/handler/ContentStreamLoader.java
delete mode 100644
solr/core/src/java/org/apache/solr/handler/admin/CollectionHandlerApi.java
copy
solr/core/src/java/org/apache/solr/handler/admin/api/{ModifyCollectionAPI.java
=> AddReplicaAPI.java} (54%)
create mode 100644
solr/core/src/java/org/apache/solr/handler/admin/api/CollectionStatusAPI.java
copy
solr/core/src/java/org/apache/solr/handler/admin/api/{ModifyCollectionAPI.java
=> CreateShardAPI.java} (54%)
create mode 100644
solr/core/src/java/org/apache/solr/handler/admin/api/DeleteReplicaAPI.java
create mode 100644
solr/core/src/java/org/apache/solr/handler/admin/api/DeleteShardAPI.java
create mode 100644
solr/core/src/java/org/apache/solr/handler/admin/api/ForceLeaderAPI.java
copy
solr/core/src/java/org/apache/solr/handler/admin/api/{ModifyCollectionAPI.java
=> SplitShardAPI.java} (56%)
create mode 100644
solr/core/src/java/org/apache/solr/handler/admin/api/SyncShardAPI.java
rename
solr/core/src/{test/org/apache/solr/schema/ThrowErrorOnInitFieldType.java =>
java/org/apache/solr/handler/api/V2ApiUtils.java} (57%)
delete mode 100644
solr/core/src/java/org/apache/solr/legacy/DistanceValueSource.java
delete mode 100644
solr/core/src/java/org/apache/solr/legacy/PointVectorStrategy.java
create mode 100644 solr/core/src/java/org/apache/solr/logging/MDCSnapshot.java
delete mode 100644 solr/core/src/java/org/apache/solr/schema/GeoHashField.java
delete mode 100644 solr/core/src/java/org/apache/solr/schema/LatLonType.java
delete mode 100644
solr/core/src/java/org/apache/solr/schema/SpatialPointVectorFieldType.java
delete mode 100644
solr/core/src/java/org/apache/solr/schema/SpatialTermQueryPrefixTreeFieldType.java
create mode 100644
solr/core/src/java/org/apache/solr/security/MultiAuthPlugin.java
create mode 100644
solr/core/src/java/org/apache/solr/security/MultiAuthRuleBasedAuthorizationPlugin.java
create mode 100644
solr/core/src/test-files/solr/security/multi_auth_plugin_security.json
delete mode 100644
solr/core/src/test/org/apache/solr/core/BlobStoreTestRequestHandler.java
delete mode 100644 solr/core/src/test/org/apache/solr/core/MockInfoBean.java
create mode 100644
solr/core/src/test/org/apache/solr/core/TestConfLoadPerf.java
create mode 100644
solr/core/src/test/org/apache/solr/handler/TestRequestId.java
create mode 100644
solr/core/src/test/org/apache/solr/handler/admin/api/V2ShardsAPIMappingTest.java
create mode 100644
solr/core/src/test/org/apache/solr/request/TestSolrRequestInfo.java
create mode 100644
solr/core/src/test/org/apache/solr/search/join/InvalidConfigJoinQueryTest.java
create mode 100644
solr/core/src/test/org/apache/solr/security/MultiAuthPluginTest.java
create mode 100644 solr/core/src/test/org/apache/solr/util/LongSetTest.java
delete mode 100644 solr/core/src/test/org/apache/solr/util/UtilsToolTest.java
delete mode 100644 solr/licenses/annotations-2.16.93.jar.sha1
create mode 100644 solr/licenses/annotations-2.17.63.jar.sha1
delete mode 100644 solr/licenses/apache-client-2.16.93.jar.sha1
create mode 100644 solr/licenses/apache-client-2.17.63.jar.sha1
delete mode 100644 solr/licenses/arns-2.16.93.jar.sha1
create mode 100644 solr/licenses/arns-2.17.63.jar.sha1
delete mode 100644 solr/licenses/auth-2.16.93.jar.sha1
create mode 100644 solr/licenses/auth-2.17.63.jar.sha1
delete mode 100644 solr/licenses/aws-core-2.16.93.jar.sha1
create mode 100644 solr/licenses/aws-core-2.17.63.jar.sha1
delete mode 100644 solr/licenses/aws-query-protocol-2.16.93.jar.sha1
create mode 100644 solr/licenses/aws-query-protocol-2.17.63.jar.sha1
delete mode 100644 solr/licenses/aws-xml-protocol-2.16.93.jar.sha1
create mode 100644 solr/licenses/aws-xml-protocol-2.17.63.jar.sha1
create mode 100644 solr/licenses/commons-compiler-3.0.11.jar.sha1
delete mode 100644 solr/licenses/commons-compiler-3.0.9.jar.sha1
delete mode 100644 solr/licenses/eigenbase-properties-1.1.5.jar.sha1
delete mode 100644 solr/licenses/eigenbase-properties-LICENSE-ASL.txt
delete mode 100644 solr/licenses/eigenbase-properties-NOTICE.txt
delete mode 100644 solr/licenses/http-client-spi-2.16.93.jar.sha1
create mode 100644 solr/licenses/http-client-spi-2.17.63.jar.sha1
create mode 100644 solr/licenses/janino-3.0.11.jar.sha1
delete mode 100644 solr/licenses/janino-3.0.9.jar.sha1
create mode 100644 solr/licenses/json-utils-2.17.63.jar.sha1
copy solr/licenses/{utils-LICENSE-ASL.txt => json-utils-LICENSE-ASL.txt} (100%)
copy solr/licenses/{utils-NOTICE.txt => json-utils-NOTICE.txt} (100%)
delete mode 100644 solr/licenses/kerby-kdc-1.0.1.jar.sha1
delete mode 100644 solr/licenses/kerby-kdc-LICENSE-ASL.txt
delete mode 100644 solr/licenses/kerby-kdc-NOTICE.txt
delete mode 100644 solr/licenses/metrics-spi-2.16.93.jar.sha1
create mode 100644 solr/licenses/metrics-spi-2.17.63.jar.sha1
delete mode 100644 solr/licenses/profiles-2.16.93.jar.sha1
create mode 100644 solr/licenses/profiles-2.17.63.jar.sha1
delete mode 100644 solr/licenses/protocol-core-2.16.93.jar.sha1
create mode 100644 solr/licenses/protocol-core-2.17.63.jar.sha1
delete mode 100644 solr/licenses/regions-2.16.93.jar.sha1
create mode 100644 solr/licenses/regions-2.17.63.jar.sha1
delete mode 100644 solr/licenses/s3-2.16.93.jar.sha1
create mode 100644 solr/licenses/s3-2.17.63.jar.sha1
delete mode 100644 solr/licenses/sdk-core-2.16.93.jar.sha1
create mode 100644 solr/licenses/sdk-core-2.17.63.jar.sha1
create mode 100644 solr/licenses/third-party-jackson-core-2.17.63.jar.sha1
copy solr/licenses/{utils-LICENSE-ASL.txt =>
third-party-jackson-core-LICENSE-ASL.txt} (100%)
copy solr/licenses/{utils-NOTICE.txt => third-party-jackson-core-NOTICE.txt}
(100%)
delete mode 100644 solr/licenses/url-connection-client-2.16.93.jar.sha1
create mode 100644 solr/licenses/url-connection-client-2.17.63.jar.sha1
delete mode 100644 solr/licenses/utils-2.16.93.jar.sha1
create mode 100644 solr/licenses/utils-2.17.63.jar.sha1
rename solr/solr-ref-guide/modules/query-guide/images/{parallel-sql-interface
=> sql-query}/cluster.png (100%)
create mode 100644
solr/solr-ref-guide/modules/query-guide/images/sql-screen/sql-query-ui.png
rename
solr/solr-ref-guide/modules/query-guide/pages/{parallel-sql-interface.adoc =>
sql-query.adoc} (96%)
create mode 100644
solr/solr-ref-guide/modules/query-guide/pages/sql-screen.adoc
create mode 100644
solr/solrj/src/java/org/apache/solr/client/solrj/request/ApiMapping.java
delete mode 100644
solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionApiMapping.java
delete mode 100644
solr/solrj/src/java/org/apache/solr/client/solrj/request/V1toV2ApiMapper.java
create mode 100644
solr/solrj/src/java/org/apache/solr/client/solrj/request/beans/AddReplicaPayload.java
create mode 100644
solr/solrj/src/java/org/apache/solr/client/solrj/request/beans/CreateShardPayload.java
rename
solr/{core/src/java/org/apache/solr/search/stats/CachedSearcherStats.java =>
solrj/src/java/org/apache/solr/client/solrj/request/beans/ForceLeaderPayload.java}
(74%)
create mode 100644
solr/solrj/src/java/org/apache/solr/client/solrj/request/beans/SplitShardPayload.java
rename solr/solrj/src/java/org/apache/solr/{common/cloud/LiveNodesWatcher.java
=> client/solrj/request/beans/SyncShardPayload.java} (75%)
delete mode 100644
solr/solrj/src/java/org/apache/solr/common/util/LinkedSimpleHashMap.java
create mode 100644
solr/solrj/src/resources/apispec/cluster.security.MultiPluginAuth.Commands.json
delete mode 100644
solr/solrj/src/resources/apispec/collections.collection.Commands.modify.json
delete mode 100644 solr/solrj/src/resources/apispec/collections.collection.json
delete mode 100644
solr/solrj/src/resources/apispec/collections.collection.shards.Commands.json
delete mode 100644
solr/solrj/src/resources/apispec/collections.collection.shards.shard.Commands.json
delete mode 100644
solr/solrj/src/resources/apispec/collections.collection.shards.shard.delete.json
delete mode 100644
solr/solrj/src/resources/apispec/collections.collection.shards.shard.replica.delete.json
delete mode 100644
solr/solrj/src/test/org/apache/solr/client/solrj/request/TestV1toV2ApiMapper.java
delete mode 100644
solr/test-framework/src/java/org/apache/solr/core/MockConcurrentMergeScheduler.java
delete mode 100644
solr/test-framework/src/java/org/apache/solr/util/BadMrClusterThreadsFilter.java
create mode 100644
solr/test-framework/src/java/org/apache/solr/util/DirectoryUtil.java
create mode 100644
solr/test-framework/src/java/org/apache/solr/util/ErrorLogMuter.java
create mode 100644
solr/test-framework/src/java/org/apache/solr/util/Log4jListAppender.java
create mode 100644
solr/test-framework/src/test/org/apache/solr/util/TestErrorLogMuter.java
