This is an automated email from the ASF dual-hosted git repository. cpoerschke pushed a commit to branch ishan/upgrade-to-lucene-10 in repository https://gitbox.apache.org/repos/asf/solr.git
commit 5fdc9004d371caa5b3b7aafa605e1e187eb55f3f Merge: fe548f7f47a cc9a0f81b5a Author: Christine Poerschke <[email protected]> AuthorDate: Mon Feb 3 15:08:59 2025 +0000 Merge remote-tracking branch 'origin/main' into ishan/upgrade-to-lucene-10 Resolved Conflicts: solr/core/src/java/org/apache/solr/schema/DenseVectorField.java solr/core/src/test/org/apache/solr/core/TestCodecSupport.java .gitattributes | 3 +- .github/labeler.yml | 9 +- .github/renovate.json | 2 +- .github/workflows/bin-solr-test.yml | 4 +- .github/workflows/docker-test.yml | 4 +- .github/workflows/gradle-precommit.yml | 4 +- .github/workflows/solrj-test.yml | 4 +- .github/workflows/tests-via-crave.yml | 10 +- .../java/org/apache/lucene/gradle/Checksum.java | 4 +- build.gradle | 12 - dev-docs/FAQ.adoc | 2 +- dev-docs/dependency-upgrades.adoc | 51 +- dev-docs/lucene-upgrade.md | 4 +- dev-docs/v2-api-conventions.adoc | 25 +- dev-tools/doap/solr.rdf | 7 + dev-tools/scripts/README.md | 2 +- dev-tools/scripts/addVersion.py | 4 +- dev-tools/scripts/parseContributorsFromChanges.py | 2 +- dev-tools/scripts/releaseWizard.py | 4 +- dev-tools/scripts/releaseWizard.yaml | 2 +- dev-tools/scripts/scriptutil.py | 13 +- dev-tools/scripts/smokeTestRelease.py | 111 +- gradle.lockfile | 16 + gradle/ant-compat/artifact-naming.gradle | 21 - gradle/ant-compat/misc.gradle | 24 - gradle/ant-compat/solr.folder-layout.gradle | 23 - gradle/develocity.gradle | 2 +- gradle/documentation/render-javadoc.gradle | 54 +- .../render-javadoc/{java11 => java17}/package-list | 0 .../render-javadoc/{java11 => java21}/package-list | 20 +- gradle/globals.gradle | 5 +- gradle/java/javac.gradle | 24 +- gradle/libs.versions.toml | 21 +- gradle/maven/defaults-maven.gradle | 139 +- gradle/template.gradle.properties | 2 +- gradle/testing/defaults-tests.gradle | 5 +- gradle/testing/failed-tests-at-end.gradle | 2 +- gradle/validation/dependencies.gradle | 305 +- gradle/validation/error-prone.gradle | 5 +- gradle/validation/validate-log-calls.gradle | 2 +- help/dependencies.txt | 53 +- .../build.gradle | 22 +- platform/gradle.lockfile | 4 + settings.gradle | 3 +- solr/CHANGES.txt | 64 +- solr/api/build.gradle | 3 + solr/api/gradle.lockfile | 189 + .../solr/client/api/endpoint/ConfigsetsApi.java | 1 + .../solr/client/api/endpoint/ReplicationApis.java | 9 +- .../client/api/endpoint/ZooKeeperReadApis.java | 15 +- .../org/apache/solr/client/api/util/Constants.java | 5 + solr/benchmark/gradle.lockfile | 161 + solr/core/build.gradle | 1 + solr/core/gradle.lockfile | 197 + .../client/solrj/embedded/EmbeddedSolrServer.java | 5 +- .../src/java/org/apache/solr/cloud/Overseer.java | 24 +- .../apache/solr/cloud/ZkSolrResourceLoader.java | 6 +- .../api/collections/ReindexCollectionCmd.java | 276 +- .../apache/solr/core/CachingDirectoryFactory.java | 6 +- .../java/org/apache/solr/core/CoreDescriptor.java | 6 +- .../org/apache/solr/core/DirectoryFactory.java | 93 +- .../src/java/org/apache/solr/core/PluginInfo.java | 48 +- .../src/java/org/apache/solr/core/SolrConfig.java | 4 +- .../src/java/org/apache/solr/core/SolrCore.java | 31 +- .../src/java/org/apache/solr/core/SolrPaths.java | 4 +- .../org/apache/solr/core/SolrResourceLoader.java | 13 +- .../java/org/apache/solr/core/SolrXmlConfig.java | 6 +- .../org/apache/solr/core/backup/BackupManager.java | 5 +- .../apache/solr/filestore/DistribFileStore.java | 195 +- .../java/org/apache/solr/filestore/FileStore.java | 2 +- .../java/org/apache/solr/handler/IndexFetcher.java | 60 +- .../solr/handler/admin/CoreAdminHandler.java | 8 - .../solr/handler/admin/CoreAdminOperation.java | 4 +- .../solr/handler/admin/ShowFileRequestHandler.java | 79 +- .../apache/solr/handler/admin/ZookeeperRead.java | 27 +- .../handler/component/PivotFacetProcessor.java | 8 +- .../src/java/org/apache/solr/pkg/PackageAPI.java | 55 +- .../org/apache/solr/pkg/SolrPackageLoader.java | 2 +- .../apache/solr/rest/ManagedResourceStorage.java | 6 +- .../org/apache/solr/schema/DenseVectorField.java | 6 +- .../apache/solr/schema/FieldTypePluginLoader.java | 24 +- .../java/org/apache/solr/schema/IndexSchema.java | 25 +- .../solr/schema/ManagedIndexSchemaFactory.java | 14 +- .../similarities/RawTFSimilarityFactory.java | 51 + .../solr/security/PKIAuthenticationPlugin.java | 29 +- .../java/org/apache/solr/servlet/HttpSolrCall.java | 19 + .../solr/spelling/AbstractLuceneSpellChecker.java | 16 +- .../suggest/fst/AnalyzingInfixLookupFactory.java | 14 +- .../suggest/fst/BlendedInfixLookupFactory.java | 14 +- .../java/org/apache/solr/util/DOMConfigNode.java | 10 +- .../java/org/apache/solr/util/DataConfigNode.java | 8 +- .../src/java/org/apache/solr/util/FileUtils.java | 14 + .../java/org/apache/solr/util/RegexFileFilter.java | 10 +- .../org/apache/solr/util/SystemIdResolver.java | 4 +- .../java/org/apache/solr/util/VersionedFile.java | 65 +- .../solr/util/plugin/AbstractPluginLoader.java | 11 +- .../apache/solr/util/plugin/MapPluginLoader.java | 3 +- .../solr/util/plugin/NamedListPluginLoader.java | 3 +- .../solr/collection1/conf/schema-rawtf.xml | 51 + .../conf/solrconfig-tieredmergepolicyfactory.xml | 1 + .../solr/cloud/CollectionStateZnodeTest.java | 3 +- .../apache/solr/cloud/CollectionsAPISolrJTest.java | 31 +- .../solr/cloud/DeleteInactiveReplicaTest.java | 6 +- .../cloud/DeleteLastCustomShardedReplicaTest.java | 4 +- .../org/apache/solr/cloud/DeleteReplicaTest.java | 27 +- .../org/apache/solr/cloud/DeleteShardTest.java | 12 +- .../DistribDocExpirationUpdateProcessorTest.java | 11 +- .../solr/cloud/LeaderElectionIntegrationTest.java | 2 +- .../apache/solr/cloud/LeaderTragicEventTest.java | 4 +- .../solr/cloud/LeaderVoteWaitTimeoutTest.java | 4 +- .../org/apache/solr/cloud/MigrateRouteKeyTest.java | 2 +- .../apache/solr/cloud/ReindexCollectionTest.java | 21 +- .../test/org/apache/solr/cloud/SplitShardTest.java | 28 +- .../apache/solr/cloud/TestCloudConsistency.java | 10 +- .../org/apache/solr/cloud/TestCloudRecovery2.java | 2 +- .../solr/cloud/TestCloudSearcherWarming.java | 6 +- .../cloud/TestDeleteCollectionOnDownNodes.java | 3 +- .../org/apache/solr/cloud/TestPrepRecovery.java | 4 +- .../org/apache/solr/cloud/TestPullReplica.java | 5 +- .../apache/solr/cloud/TestRebalanceLeaders.java | 50 +- .../solr/cloud/TestTlogReplayVsRecovery.java | 4 +- .../org/apache/solr/cloud/TestTlogReplica.java | 22 +- .../org/apache/solr/cloud/ZkControllerTest.java | 4 +- .../api/collections/CollectionReloadTest.java | 2 +- .../collections/CollectionTooManyReplicasTest.java | 2 +- .../CollectionsAPIAsyncDistributedZkTest.java | 35 +- .../api/collections/CustomCollectionTest.java | 6 +- .../cloud/api/collections/TestCollectionAPI.java | 2 +- .../impl/CollectionsRepairEventListenerTest.java | 13 + .../maintenance/InactiveShardRemoverTest.java | 12 +- .../apache/solr/handler/ReplicationTestHelper.java | 4 +- .../solr/handler/TestReplicationHandler.java | 4 +- .../solr/handler/admin/ZookeeperReadAPITest.java | 93 +- .../apache/solr/search/TestCoordinatorRole.java | 8 +- .../similarities/TestRawTFSimilarityFactory.java | 50 + .../DirectUpdateHandlerWithUpdateLogTest.java | 1 + .../processor/RoutedAliasUpdateProcessorTest.java | 2 +- .../org/apache/solr/util/RegexFileFilterTest.java | 30 +- solr/cross-dc-manager/build.gradle | 1 + solr/cross-dc-manager/gradle.lockfile | 206 + solr/distribution/gradle.lockfile | 4 + solr/docker/gradle.lockfile | 4 + solr/documentation/gradle.lockfile | 9 + .../src/markdown/SYSTEM_REQUIREMENTS.md | 2 +- solr/example/gradle.lockfile | 4 + solr/gradle.lockfile | 4 + solr/licenses/byte-buddy-1.14.15.jar.sha1 | 1 - solr/licenses/byte-buddy-1.15.11.jar.sha1 | 1 + solr/licenses/byte-buddy-LICENSE-ASL.txt | 26 - solr/licenses/byte-buddy-NOTICE.txt | 15 +- solr/licenses/byte-buddy-agent-1.14.15.jar.sha1 | 1 - solr/licenses/byte-buddy-agent-1.15.11.jar.sha1 | 1 + solr/licenses/hsqldb-2.7.2.jar.sha1 | 1 - solr/licenses/hsqldb-2.7.4.jar.sha1 | 1 + solr/licenses/jackson-annotations-2.18.0.jar.sha1 | 1 - solr/licenses/jackson-annotations-2.18.2.jar.sha1 | 1 + solr/licenses/jackson-core-2.18.0.jar.sha1 | 1 - solr/licenses/jackson-core-2.18.2.jar.sha1 | 1 + solr/licenses/jackson-databind-2.18.0.jar.sha1 | 1 - solr/licenses/jackson-databind-2.18.2.jar.sha1 | 1 + .../jackson-dataformat-cbor-2.18.0.jar.sha1 | 1 - .../jackson-dataformat-cbor-2.18.2.jar.sha1 | 1 + .../jackson-dataformat-csv-2.18.0.jar.sha1 | 1 - .../jackson-dataformat-csv-2.18.2.jar.sha1 | 1 + .../jackson-dataformat-smile-2.18.0.jar.sha1 | 1 - .../jackson-dataformat-smile-2.18.2.jar.sha1 | 1 + .../jackson-dataformat-xml-2.18.0.jar.sha1 | 1 - .../jackson-dataformat-xml-2.18.2.jar.sha1 | 1 + .../licenses/jackson-datatype-jdk8-2.18.0.jar.sha1 | 1 - .../licenses/jackson-datatype-jdk8-2.18.2.jar.sha1 | 1 + .../jackson-datatype-jsr310-2.18.0.jar.sha1 | 1 - .../jackson-datatype-jsr310-2.18.2.jar.sha1 | 1 + ...ule-jakarta-xmlbind-annotations-2.18.0.jar.sha1 | 1 - ...ule-jakarta-xmlbind-annotations-2.18.2.jar.sha1 | 1 + .../licenses/jackson-module-kotlin-2.18.0.jar.sha1 | 1 - .../licenses/jackson-module-kotlin-2.18.2.jar.sha1 | 1 + .../jackson-module-parameter-names-2.18.0.jar.sha1 | 1 - .../jackson-module-parameter-names-2.18.2.jar.sha1 | 1 + .../jackson-module-scala_2.13-2.18.0.jar.sha1 | 1 - .../jackson-module-scala_2.13-2.18.2.jar.sha1 | 1 + solr/licenses/jcl-over-slf4j-2.0.13.jar.sha1 | 1 - solr/licenses/jcl-over-slf4j-2.0.16.jar.sha1 | 1 + solr/licenses/jul-to-slf4j-2.0.13.jar.sha1 | 1 - solr/licenses/jul-to-slf4j-2.0.16.jar.sha1 | 1 + solr/licenses/mockito-core-5.12.0.jar.sha1 | 1 - solr/licenses/mockito-core-5.15.2.jar.sha1 | 1 + solr/licenses/mockito-subclass-5.12.0.jar.sha1 | 1 - solr/licenses/mockito-subclass-5.15.2.jar.sha1 | 1 + solr/licenses/nimbus-jose-jwt-9.30.2.jar.sha1 | 1 - solr/licenses/nimbus-jose-jwt-9.48.jar.sha1 | 1 + solr/licenses/opentelemetry-api-1.40.0.jar.sha1 | 1 - solr/licenses/opentelemetry-api-1.46.0.jar.sha1 | 1 + ...entelemetry-api-incubator-1.40.0-alpha.jar.sha1 | 1 - ...entelemetry-api-incubator-1.46.0-alpha.jar.sha1 | 1 + .../licenses/opentelemetry-context-1.40.0.jar.sha1 | 1 - .../licenses/opentelemetry-context-1.46.0.jar.sha1 | 1 + .../opentelemetry-exporter-common-1.40.0.jar.sha1 | 1 - .../opentelemetry-exporter-common-1.46.0.jar.sha1 | 1 + .../opentelemetry-exporter-otlp-1.40.0.jar.sha1 | 1 - .../opentelemetry-exporter-otlp-1.46.0.jar.sha1 | 1 + ...ntelemetry-exporter-otlp-common-1.40.0.jar.sha1 | 1 - ...ntelemetry-exporter-otlp-common-1.46.0.jar.sha1 | 1 + ...elemetry-exporter-sender-okhttp-1.40.0.jar.sha1 | 1 - ...elemetry-exporter-sender-okhttp-1.46.0.jar.sha1 | 1 + solr/licenses/opentelemetry-sdk-1.40.0.jar.sha1 | 1 - solr/licenses/opentelemetry-sdk-1.46.0.jar.sha1 | 1 + .../opentelemetry-sdk-common-1.40.0.jar.sha1 | 1 - .../opentelemetry-sdk-common-1.46.0.jar.sha1 | 1 + ...try-sdk-extension-autoconfigure-1.40.0.jar.sha1 | 1 - ...try-sdk-extension-autoconfigure-1.46.0.jar.sha1 | 1 + ...sdk-extension-autoconfigure-spi-1.40.0.jar.sha1 | 1 - ...sdk-extension-autoconfigure-spi-1.46.0.jar.sha1 | 1 + .../opentelemetry-sdk-logs-1.40.0.jar.sha1 | 1 - .../opentelemetry-sdk-logs-1.46.0.jar.sha1 | 1 + .../opentelemetry-sdk-metrics-1.40.0.jar.sha1 | 1 - .../opentelemetry-sdk-metrics-1.46.0.jar.sha1 | 1 + .../opentelemetry-sdk-testing-1.40.0.jar.sha1 | 1 - .../opentelemetry-sdk-testing-1.46.0.jar.sha1 | 1 + .../opentelemetry-sdk-trace-1.40.0.jar.sha1 | 1 - .../opentelemetry-sdk-trace-1.46.0.jar.sha1 | 1 + solr/licenses/slf4j-api-2.0.13.jar.sha1 | 1 - solr/licenses/slf4j-api-2.0.16.jar.sha1 | 1 + solr/modules/analysis-extras/gradle.lockfile | 175 + solr/modules/clustering/build.gradle | 1 + solr/modules/clustering/gradle.lockfile | 161 + solr/modules/cross-dc/build.gradle | 2 +- solr/modules/cross-dc/gradle.lockfile | 167 + .../org/apache/solr/crossdc/common/ConfUtil.java | 2 +- .../solr/crossdc/common/KafkaMirroringSink.java | 3 +- .../update/processor/MirroringUpdateProcessor.java | 13 +- solr/modules/extraction/build.gradle | 1 + solr/modules/extraction/gradle.lockfile | 240 + solr/modules/gcs-repository/build.gradle | 1 + solr/modules/gcs-repository/gradle.lockfile | 212 + solr/modules/gradle.lockfile | 4 + solr/modules/hdfs/build.gradle | 1 + solr/modules/hdfs/gradle.lockfile | 195 + .../solr/hdfs/cloud/HdfsCollectionsApiTest.java | 4 +- solr/modules/jwt-auth/build.gradle | 3 +- solr/modules/jwt-auth/gradle.lockfile | 194 + solr/modules/langid/gradle.lockfile | 164 + solr/modules/llm/build.gradle | 1 + solr/modules/llm/gradle.lockfile | 180 + solr/modules/ltr/gradle.lockfile | 164 + solr/modules/opentelemetry/build.gradle | 1 + solr/modules/opentelemetry/gradle.lockfile | 200 + solr/modules/s3-repository/build.gradle | 1 + solr/modules/s3-repository/gradle.lockfile | 241 + solr/modules/scripting/build.gradle | 1 + solr/modules/scripting/gradle.lockfile | 160 + solr/modules/sql/build.gradle | 1 + solr/modules/sql/gradle.lockfile | 192 + .../apache/solr/handler/sql/SolrEnumerator.java | 3 +- solr/packaging/gradle.lockfile | 4 + solr/prometheus-exporter/build.gradle | 1 + solr/prometheus-exporter/gradle.lockfile | 164 + solr/server/build.gradle | 1 + solr/server/gradle.lockfile | 155 + solr/solr-ref-guide/build.gradle | 2 +- solr/solr-ref-guide/gradle.lockfile | 156 + .../ROOT/images/diagrams/splitshard-seq.puml | 2 +- .../configuration-guide/pages/coreadmin-api.adoc | 2 +- .../pages/index-segments-merging.adoc | 3 +- .../pages/requestdispatcher.adoc | 2 +- .../configuration-guide/pages/schema-factory.adoc | 2 +- .../pages/update-request-processors.adoc | 2 +- .../authentication-and-authorization-plugins.adoc | 2 +- .../deployment-guide/pages/backup-restore.adoc | 4 +- .../pages/basic-authentication-plugin.adoc | 2 +- .../pages/collection-management.adoc | 2 +- .../deployment-guide/pages/installing-solr.adoc | 2 +- .../monitoring-with-prometheus-and-grafana.adoc | 2 +- .../deployment-guide/pages/securing-solr.adoc | 2 +- .../pages/solr-control-script-reference.adoc | 4 +- .../deployment-guide/pages/solr-on-hdfs.adoc | 4 +- .../pages/solrcloud-shards-indexing.adoc | 2 +- .../modules/deployment-guide/pages/solrj.adoc | 2 +- .../pages/taking-solr-to-production.adoc | 2 +- .../pages/zookeeper-access-control.adoc | 4 +- .../indexing-guide/pages/language-analysis.adoc | 41 +- .../indexing-guide/pages/language-detection.adoc | 2 +- .../pages/partial-document-updates.adoc | 2 +- .../modules/indexing-guide/pages/reindexing.adoc | 2 +- .../modules/indexing-guide/pages/schema-api.adoc | 2 +- .../transforming-and-indexing-custom-json.adoc | 2 +- .../modules/query-guide/pages/other-parsers.adoc | 2 +- .../query-guide/pages/pagination-of-results.adoc | 2 +- .../query-guide/pages/result-clustering.adoc | 4 +- .../modules/query-guide/pages/search-sample.adoc | 2 +- .../pages/searching-nested-documents.adoc | 2 +- .../modules/query-guide/pages/spatial-search.adoc | 2 +- .../modules/query-guide/pages/sql-query.adoc | 2 +- .../query-guide/pages/standard-query-parser.adoc | 2 +- .../pages/stream-decorator-reference.adoc | 2 +- .../pages/stream-evaluator-reference.adoc | 2 +- .../query-guide/pages/stream-source-reference.adoc | 2 +- .../pages/major-changes-in-solr-9.adoc | 2 +- solr/solrj-streaming/gradle.lockfile | 186 + .../client/solrj/io/stream/JSONTupleStream.java | 2 +- .../solr/client/solrj/io/stream/SolrStream.java | 2 +- .../client/solrj/io/graph/GraphExpressionTest.java | 2 +- .../client/solrj/io/stream/BadClusterTest.java | 23 +- solr/solrj-zookeeper/gradle.lockfile | 174 + .../apache/solr/common/cloud/ZkStateReader.java | 23 +- solr/solrj/gradle.lockfile | 178 + .../solr/client/solrj/InputStreamResponse.java | 132 + .../solrj/impl/BaseHttpClusterStateProvider.java | 81 +- .../solrj/impl/ConcurrentUpdateSolrClient.java | 2 +- .../solr/client/solrj/impl/Http2SolrClient.java | 28 +- .../solr/client/solrj/impl/HttpJdkSolrClient.java | 6 +- .../solr/client/solrj/impl/HttpSolrClient.java | 19 +- .../solr/client/solrj/impl/HttpSolrClientBase.java | 7 +- .../solrj/impl/InputStreamResponseParser.java | 18 +- .../solr/client/solrj/impl/LBHttp2SolrClient.java | 2 +- .../solr/client/solrj/impl/LBSolrClient.java | 7 +- .../java/org/apache/solr/common/ConfigNode.java | 103 +- .../java/org/apache/solr/common/util/DOMUtil.java | 65 +- .../org/apache/solr/common/util/NamedList.java | 19 +- .../apache/solr/common/util/SimpleOrderedMap.java | 121 +- .../java/org/apache/solr/common/util/URLUtil.java | 59 + .../java/org/apache/solr/common/util/Utils.java | 20 +- .../solrj/src/resources/java-template/api.mustache | 14 +- .../solr/client/solrj/InputStreamResponseTest.java | 80 + .../client/solrj/impl/BasicHttpSolrClientTest.java | 40 +- .../solrj/impl/ClusterStateProviderTest.java | 93 +- .../client/solrj/impl/Http2SolrClientTest.java | 5 +- .../client/solrj/impl/HttpJdkSolrClientTest.java | 20 +- .../client/solrj/impl/HttpSolrClientTestBase.java | 38 +- .../cloud/PerReplicaStatesIntegrationTest.java | 54 +- .../solr/common/util/SimpleOrderedMapTest.java | 169 + .../org/apache/solr/common/util/URLUtilTest.java | 30 + solr/test-framework/gradle.lockfile | 156 + .../apache/solr/cloud/MiniSolrCloudCluster.java | 33 +- .../org/apache/solr/cloud/SolrCloudTestCase.java | 54 +- solr/webapp/build.gradle | 2 + solr/webapp/gradle.lockfile | 154 + versions.lock | 19984 ------------------- 337 files changed, 7505 insertions(+), 21918 deletions(-)
