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

[solr] branch jira/solr-15051-blob updated (4b4ba12 -> 13a4eeb)

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

broustant pushed a change to branch jira/solr-15051-blob
in repository https://gitbox.apache.org/repos/asf/solr.git.


 discard 4b4ba12  Use BackupRepository instead of BlobStore.
    omit fcecdb6  BlobDirectoryFactoryTest, BlobDirectoryTest, BlobStore configurable, and some refactoring.
    omit 8440fdf  SOLR-15051: Initial WIP
     add bec4ed8  SOLR-14185: introduce DocSet.iterator(LeafReaderContext), replacing Filter where possible (#2)
     add 0f3893b  Remove archive-solr-ref-guide.sh script which has not been needed since we switched from 'releasing' ref-guide PDFs to just hosting the docs on the website
     add d6ff3dd  SOLR-15356: MergeIndexes should not use UninvertingReader. (#84)
     add 8ad07a2  SOLR-15356: Remove UninvertDocValuesMergePolicyFactory(#83)
     add 3672c33  SOLR-15361: Add gpg signing of the tgz & zip distribution files
     add 7877c91  SOLR-15341: indexHeapUsageBytes is no longer populated
     add 0a11a8b  precommit fix: import statements
     add fea2b1a  Replace http URLs with https (#85)
     add e843d82  SOLR-15363 Add CompletableFuture#runAsync to forbidden-api (#86)
     add 69b4187  SOLR-15283 Tracing overhaul (#52)
     add 9e27c37  SOLR-15329 Improve hdfs directory size calculation
     add 251eb2c  SOLR-15366 Add debug output
     add 67772018 Revert "SOLR-15361: Add gpg signing of the tgz & zip distribution files"
     add 7103731  SOLR-11646: document v2 api (WIP) (#41)
     add 2159cad  SOLR-15334 Check for Mockito before using it
     add f5f9dee  SOLR-15366 Allow weak crypto for KRB tests
     add d0adf4d  SOLR-15334 NPE when test is ignored
     add fc04ba8  Update gradle to 6.8.3 (#89)
     add 798ea7a  CHANGES.txt fix wrong JIRA reference and add my name
     add 1adedf5  SOLR-15067: Child doc transformer should use the perSegFilter cache (#92)
     add c7abf3f  SOLR-15217: Rename shardsWhitelist and extract AllowListUrlChecker.
     add d79b19a  SOLR-15019: Remove support for (unsecure) env variables until it's needed.
     add 175094a  SOLR-15341: remove indexHeapUsageBytes (#94)
     add c8cea3f  SOLR-15369: Only load PackageStoreAPI with SolrCloud (#95)
     add 08d3533  SOLR-15363 Off-by-one error in test
     add f206930  SOLR-15340: Fix allowPaths building.
     add 2cb5f70  SOLR-15373 implement LeafReader.searchNearestVectors
     add b5f286b  SOLR-15366 Add assumeNoException for Linux
     add da38408  Fix bad unchecked casts for generic types (#87)
     add b625dd6  SOLR-15340: Fix allowUrls doc.
     add 421f693  SOLR-15379: Fix API incompatibility after LUCENE-9905.
     add f062be2  SOLR-15361: Add gpg signing of the tgz & zip distribution files
     add ca031d2  SOLR-15337: Avoid XPath in solrconfig.xml parsing (#104)
     add 3141609  SOLR-15374 Update Mockito to newer version (#97)
     add 0192550  Add missing copyright header: OverlaidConfigNode
     add 9ca0d5d  Update type assumptions in TestMaxScoreQueryParser (#106)
     add be681bd  SOLR-15090: Allow backup storage in GCS (#39)
     add 7c4567c  SOLR-15383 Solr Zookeeper status page shows green even for down Zookeepers (#103)
     add 2bdcb96  SOLR-15051: Initial WIP
     add af4702e  BlobDirectoryFactoryTest, BlobDirectoryTest, BlobStore configurable, and some refactoring.
     add 13a4eeb  Use BackupRepository instead of BlobStore.

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (4b4ba12)
            \
             N -- N -- N   refs/heads/jira/solr-15051-blob (13a4eeb)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 dev-docs/pmc-chair.adoc                            |   4 +-
 dev-tools/doap/solr.rdf                            |   2 +-
 dev-tools/scripts/README.md                        |  19 -
 dev-tools/scripts/addBackcompatIndexes.py          | 272 ------------
 dev-tools/scripts/archive-solr-ref-guide.sh        |  87 ----
 dev-tools/scripts/releaseWizard.py                 |   8 +-
 dev-tools/scripts/releaseWizard.yaml               | 135 +-----
 gradle/maven/defaults-maven.gradle                 |   2 +-
 gradle/validation/check-environment.gradle         |   2 +-
 gradle/validation/forbidden-apis.gradle            |   2 +-
 gradle/validation/forbidden-apis/defaults.all.txt  |  25 ++
 .../validation/forbidden-apis/defaults.lucene.txt  |  49 ---
 gradle/validation/forbidden-apis/defaults.solr.txt |  35 --
 gradle/validation/jar-checks.gradle                |   2 +-
 gradle/wrapper/gradle-wrapper.jar.version          |   2 +-
 gradle/wrapper/gradle-wrapper.properties           |   2 +-
 help/gpgSigning.txt                                |  70 +++
 settings.gradle                                    |   3 +-
 solr/CHANGES.txt                                   |  32 +-
 solr/NOTICE.txt                                    |  53 +++
 solr/README.md                                     |   6 +-
 solr/bin/install_solr_service.sh                   |   2 +-
 solr/bin/post                                      |   4 +-
 solr/bin/solr                                      |   2 +-
 solr/bin/solr.in.cmd                               |   8 +-
 solr/bin/solr.in.sh                                |   8 +-
 ...ExtractNamedEntitiesUpdateProcessorFactory.java |   2 +-
 solr/contrib/extraction/README.md                  |   4 +-
 .../extraction/ExtractingDocumentLoader.java       |   2 +-
 solr/contrib/gcs-repository/README.md              |   4 +
 solr/contrib/gcs-repository/build.gradle           |  55 +++
 .../org/apache/solr/gcs/GCSBackupRepository.java   | 465 ++++++++++++++++++++
 .../java/org/apache/solr/gcs/GCSConfigParser.java  | 175 ++++++++
 .../java/org/apache/solr/gcs/package-info.java}    |  22 +-
 .../gcs-repository/src/test-files}/conf/schema.xml |   0
 .../src/test-files}/conf/solrconfig.xml            |   0
 .../gcs-repository/src/test-files/log4j2.xml       |  69 +++
 .../solr/gcs/ConcurrentDelegatingStorage.java      | 394 +++++++++++++++++
 .../apache/solr/gcs/GCSBackupRepositoryTest.java   |  71 +++
 .../apache/solr/gcs/GCSIncrementalBackupTest.java  |  98 +++++
 .../solr/gcs/LocalStorageGCSBackupRepository.java  | 104 +++++
 solr/contrib/jaegertracer-configurator/README.md   |  34 +-
 .../contrib/jaegertracer-configurator/build.gradle |   2 +-
 .../solr/jaeger/JaegerTracerConfigurator.java      |  56 +--
 .../src/test-files/solr/solr.xml                   |  10 +-
 .../apache/solr/jaeger/TestJaegerConfigurator.java | 106 +----
 ...angDetectLanguageIdentifierUpdateProcessor.java |   5 +-
 .../src/test-files/solr/solr.xml                   |   1 +
 solr/core/build.gradle                             |   2 +-
 .../solr/cloud/api/collections/BackupCmd.java      |   2 +-
 .../cloud/api/collections/DeleteBackupCmd.java     |   2 +-
 .../solr/cluster/placement/AttributeFetcher.java   |   6 -
 .../solr/cluster/placement/AttributeValues.java    |   5 -
 .../placement/impl/AttributeFetcherImpl.java       |  10 -
 .../placement/impl/AttributeValuesImpl.java        |   9 -
 .../java/org/apache/solr/core/ConfigOverlay.java   |  29 +-
 .../org/apache/solr/core/ConfigSetService.java     |   7 +
 .../java/org/apache/solr/core/CoreContainer.java   |  70 ++-
 .../org/apache/solr/core/HdfsDirectoryFactory.java |   2 -
 .../src/java/org/apache/solr/core/NodeConfig.java  |  46 +-
 .../org/apache/solr/core/OverlaidConfigNode.java   | 108 +++++
 .../src/java/org/apache/solr/core/PluginInfo.java  |  24 +
 .../src/java/org/apache/solr/core/SolrConfig.java  | 486 ++++++++++++---------
 .../src/java/org/apache/solr/core/SolrCore.java    |   2 +-
 .../src/java/org/apache/solr/core/SolrPaths.java   |  42 +-
 .../java/org/apache/solr/core/SolrXmlConfig.java   |  28 +-
 .../org/apache/solr/core/TracerConfigurator.java   |  96 ++--
 .../java/org/apache/solr/core/XmlConfigFile.java   |  15 +-
 .../solr/core/backup/ShardBackupMetadata.java      |  12 +-
 .../core/backup/repository/BackupRepository.java   |   1 +
 .../apache/solr/handler/DumpRequestHandler.java    |   1 +
 .../java/org/apache/solr/handler/IndexFetcher.java |  29 +-
 .../solr/handler/admin/LukeRequestHandler.java     |  43 +-
 .../apache/solr/handler/admin/MergeIndexesOp.java  |   2 +-
 .../solr/handler/admin/ZookeeperStatusHandler.java |   3 +
 .../solr/handler/component/CloudReplicaSource.java |  30 +-
 .../solr/handler/component/HttpShardHandler.java   |  24 +-
 .../handler/component/HttpShardHandlerFactory.java | 174 +-------
 .../solr/handler/component/ShardRequest.java       |   5 +
 .../handler/component/StandaloneReplicaSource.java |   9 +-
 .../solr/index/SlowCompositeReaderWrapper.java     |   8 +
 .../index/UninvertDocValuesMergePolicyFactory.java | 214 ---------
 .../src/java/org/apache/solr/pkg/PackageAPI.java   |   4 +
 .../java/org/apache/solr/query/SolrRangeQuery.java |  33 +-
 .../org/apache/solr/request/DocValuesFacets.java   |   9 +-
 .../org/apache/solr/request/DocValuesStats.java    |  10 +-
 .../org/apache/solr/request/IntervalFacets.java    |  27 +-
 .../request/PerSegmentSingleValuedFaceting.java    |  15 +-
 .../org/apache/solr/request/SolrQueryRequest.java  |  10 +
 .../apache/solr/request/SolrQueryRequestBase.java  |  18 +
 .../transform/ChildDocTransformerFactory.java      |  17 +-
 .../apache/solr/schema/FieldTypePluginLoader.java  |   6 +-
 .../java/org/apache/solr/schema/IndexSchema.java   |  18 +-
 .../org/apache/solr/schema/IndexSchemaFactory.java |   4 +-
 .../java/org/apache/solr/schema/SchemaField.java   |   4 +-
 .../src/java/org/apache/solr/search/BitDocSet.java | 145 +++---
 .../java/org/apache/solr/search/CacheConfig.java   |  47 +-
 .../solr/search/CollapsingQParserPlugin.java       |   2 +-
 .../src/java/org/apache/solr/search/DocSet.java    |   8 +
 .../solr/search/GraphTermsQParserPlugin.java       |  13 +-
 .../src/java/org/apache/solr/search/Insanity.java  |   2 +-
 .../src/java/org/apache/solr/search/JoinQuery.java |  13 +-
 .../org/apache/solr/search/SortedIntDocSet.java    | 219 +++++-----
 .../apache/solr/search/facet/SweepCountAware.java  |   5 +-
 .../org/apache/solr/search/facet/SweepDISI.java    |   4 +-
 .../solr/search/join/CrossCollectionJoinQuery.java |  14 +-
 .../org/apache/solr/search/join/GraphQuery.java    |   9 +-
 .../apache/solr/security/AllowListUrlChecker.java  | 209 +++++++++
 .../solr/servlet/CheckLoggingConfiguration.java    |   2 +-
 .../java/org/apache/solr/servlet/HttpSolrCall.java |   9 +-
 .../apache/solr/servlet/SolrDispatchFilter.java    |  68 ++-
 .../apache/solr/servlet/SolrRequestParsers.java    |  13 +-
 .../apache/solr/uninverting/UninvertingReader.java |   2 +-
 .../org/apache/solr/update/SolrCmdDistributor.java |   3 +-
 .../org/apache/solr/update/SolrIndexConfig.java    |  82 ++--
 .../java/org/apache/solr/update/UpdateCommand.java |  10 +
 .../java/org/apache/solr/update/VersionInfo.java   |   4 +-
 .../java/org/apache/solr/util/DOMConfigNode.java   |  10 +-
 .../java/org/apache/solr/util/DataConfigNode.java  |  71 +--
 .../java/org/apache/solr/util/SimplePostTool.java  |   2 +-
 .../org/apache/solr/util/tracing/GlobalTracer.java | 120 -----
 .../resources/EditableSolrConfigAttributes.json    |   4 -
 solr/core/src/test-files/krb5-template.conf        |  11 +
 ...rconfig-uninvertdocvaluesmergepolicyfactory.xml |  38 --
 solr/core/src/test-files/solr/solr-tracing.xml     |  57 ---
 solr/core/src/test-files/solr/solr.xml             |   2 +-
 .../test/org/apache/solr/TestTolerantSearch.java   |   4 +-
 .../apache/solr/cloud/KerberosTestServices.java    |  18 +-
 .../test/org/apache/solr/cloud/OverseerTest.java   |  26 +-
 .../apache/solr/cloud/SaslZkACLProviderTest.java   |   8 +
 .../apache/solr/cloud/UnloadDistributedZkTest.java |   8 +-
 .../cluster/placement/AttributeFetcherForTest.java |   5 -
 .../impl/PlacementPluginIntegrationTest.java       |  17 -
 .../test/org/apache/solr/core/TestBadConfig.java   |   5 +
 .../org/apache/solr/core/TestCodecSupport.java     |   6 +-
 .../org/apache/solr/core/TestConfLoadPerf.java     |  93 ++++
 .../src/test/org/apache/solr/core/TestConfig.java  |  25 +-
 .../org/apache/solr/core/TestConfigOverlay.java    |   5 +-
 .../org/apache/solr/core/TestSimpleTextCodec.java  |   2 +-
 .../HdfsBackupRepositoryIntegrationTest.java       |  12 +-
 .../solr/handler/TestReplicationHandler.java       |  21 +
 .../TestReplicationHandlerDiskOverFlow.java        |   2 +
 .../solr/handler/admin/LukeRequestHandlerTest.java |  14 -
 .../admin/PropertiesRequestHandlerTest.java        |   8 +-
 .../handler/admin/ZookeeperStatusHandlerTest.java  |  10 +
 .../handler/component/CloudReplicaSourceTest.java  |  29 +-
 .../component/DistributedDebugComponentTest.java   |   4 +-
 ...WhitelistTest.java => ShardsAllowListTest.java} |  47 +-
 .../handler/component/SuggestComponentTest.java    | 122 ++++--
 .../component/TestHttpShardHandlerFactory.java     | 171 +-------
 .../index/UninvertDocValuesMergePolicyTest.java    | 242 ----------
 .../src/test/org/apache/solr/pkg/TestPackages.java |  59 +--
 .../solr/schema/TestHalfAndHalfDocValues.java      | 131 ------
 .../apache/solr/schema/TestManagedSchemaAPI.java   |  12 +-
 .../test/org/apache/solr/search/TestDocSet.java    | 162 ++++++-
 .../solr/search/TestMaxScoreQueryParser.java       |  37 +-
 .../org/apache/solr/search/TestSmileRequest.java   |   4 +-
 .../org/apache/solr/search/TestTaskManagement.java | 114 ++---
 .../solr/search/facet/TestJsonFacetErrors.java     |   4 +-
 .../solr/search/facet/TestJsonFacetRefinement.java |   4 +-
 .../apache/solr/search/facet/TestJsonFacets.java   |   4 +-
 .../solr/search/facet/TestJsonRangeFacets.java     |   4 +-
 .../apache/solr/search/json/TestJsonRequest.java   |   4 +-
 .../solr/security/AllowListUrlCheckerTest.java     | 207 +++++++++
 .../solr/security/TestPKIAuthenticationPlugin.java |   7 +-
 .../apache/solr/update/SolrIndexConfigTest.java    |  12 +-
 .../solr/util/tracing/TestDistributedTracing.java  |  51 +--
 solr/documentation/src/markdown/index.template.md  |   2 +-
 .../src/markdown/online-link.template.md           |   2 +-
 solr/licenses/api-common-1.10.1.jar.sha1           |   1 +
 solr/licenses/api-common-LICENSE-BSD.txt           |  27 ++
 .../api-common-NOTICE.txt}                         |   0
 .../licenses/auto-value-annotations-1.7.4.jar.sha1 |   1 +
 .../auto-value-annotations-LICENSE-ASL.txt}        |   0
 .../auto-value-annotations-NOTICE.txt}             |   0
 solr/licenses/byte-buddy-1.10.20.jar.sha1          |   1 +
 solr/licenses/byte-buddy-1.9.3.jar.sha1            |   1 -
 solr/licenses/checker-compat-qual-2.5.5.jar.sha1   |   1 +
 solr/licenses/checker-compat-qual-LICENSE-MIT.txt  |   5 +
 .../error_prone_annotations-2.5.1.jar.sha1         |   1 +
 .../error_prone_annotations-LICENSE-ASL.txt}       |   0
 .../error_prone_annotations-NOTICE.txt}            |   0
 solr/licenses/failureaccess-1.0.1.jar.sha1         |   1 +
 .../failureaccess-LICENSE-ASL.txt}                 |   0
 .../failureaccess-NOTICE.txt}                      |   0
 solr/licenses/gax-1.62.0.jar.sha1                  |   1 +
 solr/licenses/gax-LICENSE-BSD.txt                  |  27 ++
 .../core.properties => licenses/gax-NOTICE.txt}    |   0
 solr/licenses/gax-httpjson-0.79.0.jar.sha1         |   1 +
 solr/licenses/gax-httpjson-LICENSE-BSD.txt         |  27 ++
 .../gax-httpjson-NOTICE.txt}                       |   0
 solr/licenses/google-api-client-1.31.3.jar.sha1    |   1 +
 .../google-api-client-LICENSE-ASL.txt}             |   0
 .../google-api-client-NOTICE.txt}                  |   0
 .../google-api-services-storage-LICENSE-ASL.txt}   |   0
 .../google-api-services-storage-NOTICE.txt}        |   0
 ...services-storage-v1-rev20210127-1.31.0.jar.sha1 |   1 +
 ...google-auth-library-credentials-0.24.1.jar.sha1 |   1 +
 ...google-auth-library-credentials-LICENSE-BSD.txt |  28 ++
 .../google-auth-library-credentials-NOTICE.txt}    |   0
 ...google-auth-library-oauth2-http-0.24.1.jar.sha1 |   1 +
 ...google-auth-library-oauth2-http-LICENSE-BSD.txt |  28 ++
 .../google-auth-library-oauth2-http-NOTICE.txt}    |   0
 solr/licenses/google-cloud-core-1.94.3.jar.sha1    |   1 +
 .../google-cloud-core-LICENSE-ASL.txt}             |   0
 .../google-cloud-core-NOTICE.txt}                  |   0
 .../google-cloud-core-http-1.94.3.jar.sha1         |   1 +
 .../google-cloud-core-http-LICENSE-ASL.txt}        |   0
 .../google-cloud-core-http-NOTICE.txt}             |   0
 solr/licenses/google-cloud-nio-0.122.11.jar.sha1   |   1 +
 .../google-cloud-nio-LICENSE-ASL.txt}              |   0
 .../google-cloud-nio-NOTICE.txt}                   |   0
 .../google-cloud-storage-1.113.14.jar.sha1         |   1 +
 .../google-cloud-storage-LICENSE-ASL.txt}          |   0
 .../google-cloud-storage-NOTICE.txt}               |   0
 solr/licenses/google-http-client-1.39.0.jar.sha1   |   1 +
 .../google-http-client-LICENSE-ASL.txt}            |   0
 .../google-http-client-NOTICE.txt}                 |   0
 .../google-http-client-apache-v2-1.39.0.jar.sha1   |   1 +
 .../google-http-client-apache-v2-LICENSE-ASL.txt}  |   0
 .../google-http-client-apache-v2-NOTICE.txt}       |   0
 .../google-http-client-appengine-1.39.0.jar.sha1   |   1 +
 .../google-http-client-appengine-LICENSE-ASL.txt}  |   0
 .../google-http-client-appengine-NOTICE.txt}       |   0
 .../google-http-client-gson-1.39.0.jar.sha1        |   1 +
 .../google-http-client-jackson2-1.39.0.jar.sha1    |   1 +
 .../google-http-client-jackson2-LICENSE-ASL.txt}   |   0
 .../google-http-client-jackson2-NOTICE.txt}        |   0
 solr/licenses/google-oauth-client-1.31.4.jar.sha1  |   1 +
 .../google-oauth-client-LICENSE-ASL.txt}           |   0
 .../google-oauth-client-NOTICE.txt}                |   0
 solr/licenses/grpc-context-1.36.0.jar.sha1         |   1 +
 .../grpc-context-LICENSE-ASL.txt}                  |   0
 solr/licenses/grpc-context-NOTICE.txt              |  62 +++
 solr/licenses/gson-2.8.6.jar.sha1                  |   1 +
 .../LICENSE.txt => licenses/gson-LICENSE-ASL.txt}  |   0
 .../core.properties => licenses/gson-NOTICE.txt}   |   0
 solr/licenses/httpcore-4.4.13.jar.sha1             |   1 -
 solr/licenses/httpcore-4.4.14.jar.sha1             |   1 +
 solr/licenses/j2objc-annotations-1.3.jar.sha1      |   1 +
 .../j2objc-annotations-LICENSE-ASL.txt}            |   0
 .../j2objc-annotations-NOTICE.txt}                 |   0
 solr/licenses/jackson-annotations-2.10.1.jar.sha1  |   1 -
 solr/licenses/jackson-annotations-2.12.2.jar.sha1  |   1 +
 solr/licenses/jackson-core-2.10.1.jar.sha1         |   1 -
 solr/licenses/jackson-core-2.12.2.jar.sha1         |   1 +
 solr/licenses/jackson-databind-2.10.1.jar.sha1     |   1 -
 solr/licenses/jackson-databind-2.12.2.jar.sha1     |   1 +
 .../jackson-dataformat-smile-2.10.1.jar.sha1       |   1 -
 .../jackson-dataformat-smile-2.12.2.jar.sha1       |   1 +
 solr/licenses/javax.annotation-api-1.3.2.jar.sha1  |   1 +
 .../licenses/javax.annotation-api-LICENSE-CDDL.txt | 362 +++++++++++++++
 solr/licenses/javax.inject-1.jar.sha1              |   1 +
 .../javax.inject-LICENSE-ASL.txt}                  |   0
 .../javax.inject-NOTICE.txt}                       |   0
 solr/licenses/jsr305-3.0.2.jar.sha1                |   1 +
 .../jsr305-LICENSE-ASL.txt}                        |   0
 .../core.properties => licenses/jsr305-NOTICE.txt} |   0
 ...9.0-empty-to-avoid-conflict-with-guava.jar.sha1 |   1 +
 .../listenablefuture-LICENSE-ASL.txt}              |   0
 .../listenablefuture-NOTICE.txt}                   |   0
 solr/licenses/mockito-core-2.23.4.jar.sha1         |   1 -
 solr/licenses/mockito-core-3.8.0.jar.sha1          |   1 +
 solr/licenses/objenesis-2.6.jar.sha1               |   1 -
 solr/licenses/objenesis-3.1.jar.sha1               |   1 +
 solr/licenses/opencensus-api-0.28.0.jar.sha1       |   1 +
 .../opencensus-api-LICENSE-ASL.txt}                |   0
 .../opencensus-api-NOTICE.txt}                     |   0
 .../opencensus-contrib-http-util-0.28.0.jar.sha1   |   1 +
 .../opencensus-contrib-http-util-LICENSE-ASL.txt}  |   0
 .../opencensus-contrib-http-util-NOTICE.txt}       |   0
 .../proto-google-common-protos-2.1.0.jar.sha1      |   1 +
 .../proto-google-common-protos-LICENSE-ASL.txt}    |   0
 .../proto-google-common-protos-NOTICE.txt}         |   0
 solr/licenses/proto-google-iam-v1-1.0.10.jar.sha1  |   1 +
 .../proto-google-iam-v1-LICENSE-ASL.txt}           |   0
 .../proto-google-iam-v1-NOTICE.txt}                |   0
 solr/licenses/protobuf-java-3.11.0.jar.sha1        |   1 -
 solr/licenses/protobuf-java-3.15.5.jar.sha1        |   1 +
 solr/licenses/protobuf-java-util-3.15.5.jar.sha1   |   1 +
 solr/licenses/threetenbp-1.5.0.jar.sha1            |   1 +
 solr/licenses/threetenbp-LICENSE-BSD.txt           |  29 ++
 .../threetenbp-NOTICE.txt}                         |   0
 solr/packaging/build.gradle                        |  47 ++
 solr/server/etc/security.properties                |   2 +-
 solr/server/solr/solr.xml                          |   2 +-
 solr/solr-ref-guide/src/collection-aliasing.adoc   | 329 ++++++++------
 solr/solr-ref-guide/src/collection-management.adoc | 285 +-----------
 solr/solr-ref-guide/src/collections-api.adoc       | 104 ++++-
 solr/solr-ref-guide/src/distributed-requests.adoc  |  15 +-
 .../distributed-search-with-index-sharding.adoc    |   4 +-
 solr/solr-ref-guide/src/enabling-ssl.adoc          |   4 +-
 solr/solr-ref-guide/src/filter-descriptions.adoc   |   2 +-
 solr/solr-ref-guide/src/format-of-solr-xml.adoc    |  11 +-
 .../src/indexconfig-in-solrconfig.adoc             |   3 +-
 .../src/major-changes-in-solr-8.adoc               |   4 +-
 .../src/major-changes-in-solr-9.adoc               |  14 +
 .../src/making-and-restoring-backups.adoc          | 191 +++++++-
 solr/solr-ref-guide/src/replica-management.adoc    | 355 +++++++++------
 solr/solr-ref-guide/src/shard-management.adoc      | 283 +++++++-----
 .../src/solr-jdbc-python-jython.adoc               |   4 +-
 solr/solr-ref-guide/src/solr-tracing.adoc          |  97 +---
 solr/solr-ref-guide/src/the-terms-component.adoc   |  16 -
 .../solrj/impl/SolrClientNodeStateProvider.java    |   3 -
 .../org/apache/solr/cluster/api/SimpleMap.java     |  11 +
 .../java/org/apache/solr/common/ConfigNode.java    | 133 +++++-
 .../org/apache/solr/common/cloud/ClusterState.java |  31 +-
 .../apache/solr/common/cloud/ZkStateReader.java    |   3 -
 .../solr/common/cloud/rule/ImplicitSnitch.java     |   1 -
 .../java/org/apache/solr/common/util/DOMUtil.java  |  12 +-
 .../org/apache/solr/common/util/ExecutorUtil.java  |   8 +
 .../solr/common/util/LinkedSimpleHashMap.java      |   6 +
 .../apache/solr/common/util/WrappedSimpleMap.java  |  11 +
 solr/solrj/src/test-files/solrj/solr/solr.xml      |   2 +-
 .../apache/solr/client/solrj/SolrExampleTests.java |  18 +-
 .../solr/client/solrj/io/stream/StreamingTest.java |  12 +-
 .../apache/solr/BaseDistributedSearchTestCase.java |   4 +-
 .../src/java/org/apache/solr/SolrTestCaseHS.java   |   7 +-
 .../src/java/org/apache/solr/SolrTestCaseJ4.java   |  46 +-
 .../apache/solr/cloud/MiniSolrCloudCluster.java    |   5 +-
 .../collections/AbstractBackupRepositoryTest.java  | 251 ++++++++---
 .../collections/AbstractIncrementalBackupTest.java |   1 +
 solr/webapp/web/partials/core_overview.html        |   3 -
 versions.lock                                      |  64 ++-
 versions.props                                     | 228 +++++-----
 325 files changed, 6287 insertions(+), 4150 deletions(-)
 delete mode 100755 dev-tools/scripts/addBackcompatIndexes.py
 delete mode 100755 dev-tools/scripts/archive-solr-ref-guide.sh
 delete mode 100644 gradle/validation/forbidden-apis/defaults.lucene.txt
 delete mode 100644 gradle/validation/forbidden-apis/defaults.solr.txt
 create mode 100644 help/gpgSigning.txt
 create mode 100644 solr/contrib/gcs-repository/README.md
 create mode 100644 solr/contrib/gcs-repository/build.gradle
 create mode 100644 solr/contrib/gcs-repository/src/java/org/apache/solr/gcs/GCSBackupRepository.java
 create mode 100644 solr/contrib/gcs-repository/src/java/org/apache/solr/gcs/GCSConfigParser.java
 rename solr/{test-framework/src/java/org/apache/solr/core/MockTracerConfigurator.java => contrib/gcs-repository/src/java/org/apache/solr/gcs/package-info.java} (67%)
 copy solr/{core/src/test-files/solr/configsets/cloud-minimal => contrib/gcs-repository/src/test-files}/conf/schema.xml (100%)
 copy solr/{core/src/test-files/solr/configsets/schema-package => contrib/gcs-repository/src/test-files}/conf/solrconfig.xml (100%)
 create mode 100644 solr/contrib/gcs-repository/src/test-files/log4j2.xml
 create mode 100644 solr/contrib/gcs-repository/src/test/org/apache/solr/gcs/ConcurrentDelegatingStorage.java
 create mode 100644 solr/contrib/gcs-repository/src/test/org/apache/solr/gcs/GCSBackupRepositoryTest.java
 create mode 100644 solr/contrib/gcs-repository/src/test/org/apache/solr/gcs/GCSIncrementalBackupTest.java
 create mode 100644 solr/contrib/gcs-repository/src/test/org/apache/solr/gcs/LocalStorageGCSBackupRepository.java
 create mode 100644 solr/core/src/java/org/apache/solr/core/OverlaidConfigNode.java
 delete mode 100644 solr/core/src/java/org/apache/solr/index/UninvertDocValuesMergePolicyFactory.java
 create mode 100644 solr/core/src/java/org/apache/solr/security/AllowListUrlChecker.java
 delete mode 100644 solr/core/src/java/org/apache/solr/util/tracing/GlobalTracer.java
 create mode 100644 solr/core/src/test-files/krb5-template.conf
 delete mode 100644 solr/core/src/test-files/solr/collection1/conf/solrconfig-uninvertdocvaluesmergepolicyfactory.xml
 delete mode 100644 solr/core/src/test-files/solr/solr-tracing.xml
 create mode 100644 solr/core/src/test/org/apache/solr/core/TestConfLoadPerf.java
 rename solr/core/src/test/org/apache/solr/handler/component/{ShardsWhitelistTest.java => ShardsAllowListTest.java} (83%)
 delete mode 100644 solr/core/src/test/org/apache/solr/index/UninvertDocValuesMergePolicyTest.java
 delete mode 100644 solr/core/src/test/org/apache/solr/schema/TestHalfAndHalfDocValues.java
 create mode 100644 solr/core/src/test/org/apache/solr/security/AllowListUrlCheckerTest.java
 create mode 100644 solr/licenses/api-common-1.10.1.jar.sha1
 create mode 100644 solr/licenses/api-common-LICENSE-BSD.txt
 copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/api-common-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/auto-value-annotations-1.7.4.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/auto-value-annotations-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/auto-value-annotations-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/byte-buddy-1.10.20.jar.sha1
 delete mode 100644 solr/licenses/byte-buddy-1.9.3.jar.sha1
 create mode 100644 solr/licenses/checker-compat-qual-2.5.5.jar.sha1
 create mode 100644 solr/licenses/checker-compat-qual-LICENSE-MIT.txt
 create mode 100644 solr/licenses/error_prone_annotations-2.5.1.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/error_prone_annotations-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/error_prone_annotations-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/failureaccess-1.0.1.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/failureaccess-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/failureaccess-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/gax-1.62.0.jar.sha1
 create mode 100644 solr/licenses/gax-LICENSE-BSD.txt
 copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/gax-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/gax-httpjson-0.79.0.jar.sha1
 create mode 100644 solr/licenses/gax-httpjson-LICENSE-BSD.txt
 copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/gax-httpjson-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/google-api-client-1.31.3.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/google-api-client-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/google-api-client-NOTICE.txt} (100%)
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/google-api-services-storage-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/google-api-services-storage-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/google-api-services-storage-v1-rev20210127-1.31.0.jar.sha1
 create mode 100644 solr/licenses/google-auth-library-credentials-0.24.1.jar.sha1
 create mode 100644 solr/licenses/google-auth-library-credentials-LICENSE-BSD.txt
 copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/google-auth-library-credentials-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/google-auth-library-oauth2-http-0.24.1.jar.sha1
 create mode 100644 solr/licenses/google-auth-library-oauth2-http-LICENSE-BSD.txt
 copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/google-auth-library-oauth2-http-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/google-cloud-core-1.94.3.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/google-cloud-core-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/google-cloud-core-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/google-cloud-core-http-1.94.3.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/google-cloud-core-http-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/google-cloud-core-http-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/google-cloud-nio-0.122.11.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/google-cloud-nio-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/google-cloud-nio-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/google-cloud-storage-1.113.14.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/google-cloud-storage-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/google-cloud-storage-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/google-http-client-1.39.0.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/google-http-client-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/google-http-client-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/google-http-client-apache-v2-1.39.0.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/google-http-client-apache-v2-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/google-http-client-apache-v2-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/google-http-client-appengine-1.39.0.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/google-http-client-appengine-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/google-http-client-appengine-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/google-http-client-gson-1.39.0.jar.sha1
 create mode 100644 solr/licenses/google-http-client-jackson2-1.39.0.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/google-http-client-jackson2-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/google-http-client-jackson2-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/google-oauth-client-1.31.4.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/google-oauth-client-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/google-oauth-client-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/grpc-context-1.36.0.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/grpc-context-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 create mode 100644 solr/licenses/grpc-context-NOTICE.txt
 create mode 100644 solr/licenses/gson-2.8.6.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/gson-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/gson-NOTICE.txt} (100%)
 delete mode 100644 solr/licenses/httpcore-4.4.13.jar.sha1
 create mode 100644 solr/licenses/httpcore-4.4.14.jar.sha1
 create mode 100644 solr/licenses/j2objc-annotations-1.3.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/j2objc-annotations-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/j2objc-annotations-NOTICE.txt} (100%)
 delete mode 100644 solr/licenses/jackson-annotations-2.10.1.jar.sha1
 create mode 100644 solr/licenses/jackson-annotations-2.12.2.jar.sha1
 delete mode 100644 solr/licenses/jackson-core-2.10.1.jar.sha1
 create mode 100644 solr/licenses/jackson-core-2.12.2.jar.sha1
 delete mode 100644 solr/licenses/jackson-databind-2.10.1.jar.sha1
 create mode 100644 solr/licenses/jackson-databind-2.12.2.jar.sha1
 delete mode 100644 solr/licenses/jackson-dataformat-smile-2.10.1.jar.sha1
 create mode 100644 solr/licenses/jackson-dataformat-smile-2.12.2.jar.sha1
 create mode 100644 solr/licenses/javax.annotation-api-1.3.2.jar.sha1
 create mode 100644 solr/licenses/javax.annotation-api-LICENSE-CDDL.txt
 create mode 100644 solr/licenses/javax.inject-1.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/javax.inject-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/javax.inject-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/jsr305-3.0.2.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/jsr305-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/jsr305-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/listenablefuture-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/listenablefuture-NOTICE.txt} (100%)
 delete mode 100644 solr/licenses/mockito-core-2.23.4.jar.sha1
 create mode 100644 solr/licenses/mockito-core-3.8.0.jar.sha1
 delete mode 100644 solr/licenses/objenesis-2.6.jar.sha1
 create mode 100644 solr/licenses/objenesis-3.1.jar.sha1
 create mode 100644 solr/licenses/opencensus-api-0.28.0.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/opencensus-api-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/opencensus-api-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/opencensus-contrib-http-util-0.28.0.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/opencensus-contrib-http-util-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/opencensus-contrib-http-util-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/proto-google-common-protos-2.1.0.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/proto-google-common-protos-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/proto-google-common-protos-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/proto-google-iam-v1-1.0.10.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/proto-google-iam-v1-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/proto-google-iam-v1-NOTICE.txt} (100%)
 delete mode 100644 solr/licenses/protobuf-java-3.11.0.jar.sha1
 create mode 100644 solr/licenses/protobuf-java-3.15.5.jar.sha1
 create mode 100644 solr/licenses/protobuf-java-util-3.15.5.jar.sha1
 create mode 100644 solr/licenses/threetenbp-1.5.0.jar.sha1
 create mode 100644 solr/licenses/threetenbp-LICENSE-BSD.txt
 copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/threetenbp-NOTICE.txt} (100%)