This is an automated email from the ASF dual-hosted git repository. dsmiley pushed a commit to branch feature/SOLR-17458-rebased in repository https://gitbox.apache.org/repos/asf/solr.git
commit d5c7882265da74552a8526b80f84d6b3dca3a075 Merge: 06c6f7b8930 2aa21a19e6d Author: David Smiley <[email protected]> AuthorDate: Tue Oct 14 13:25:27 2025 -0400 Merge branch 'refs/heads/main' into feature/SOLR-17458-rebased # Conflicts: # solr/core/src/java/org/apache/solr/core/CoreContainer.java # solr/core/src/java/org/apache/solr/core/HttpSolrClientProvider.java # solr/core/src/java/org/apache/solr/core/SolrCores.java # solr/core/src/java/org/apache/solr/core/TransientSolrCores.java # solr/core/src/test/org/apache/solr/core/TestLazyCores.java # solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java # solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java # solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriter.java # solr/docker/templates/Dockerfile.body.template # solr/modules/analysis-extras/gradle.lockfile # solr/modules/clustering/gradle.lockfile # solr/modules/cross-dc/gradle.lockfile # solr/modules/gcs-repository/gradle.lockfile # solr/modules/jwt-auth/gradle.lockfile # solr/modules/langid/gradle.lockfile # solr/modules/ltr/gradle.lockfile # solr/modules/opentelemetry/gradle.lockfile # solr/modules/s3-repository/gradle.lockfile # solr/modules/scripting/gradle.lockfile # solr/modules/sql/gradle.lockfile # solr/prometheus-exporter/gradle.lockfile # solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrClientFactory.java # solr/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrScraper.java # solr/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrStandaloneScraper.java # solr/prometheus-exporter/src/test/org/apache/solr/prometheus/utils/Helpers.java # solr/server/gradle.lockfile # solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc # solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/NodeValueFetcher.java # solr/webapp/gradle.lockfile .github/workflows/dependency-graph-submission.yml | 2 +- .github/workflows/gradle-precommit.yml | 2 +- .github/workflows/tests-via-crave.yml | 2 +- dev-docs/dependency-upgrades.adoc | 8 +- dev-docs/gradle-help/README.md | 24 + {help => dev-docs/gradle-help}/ant.txt | 0 {help => dev-docs/gradle-help}/dependencies.txt | 0 .../gradle-help/docker.txt | 0 {help => dev-docs/gradle-help}/forbiddenApis.txt | 0 {help => dev-docs/gradle-help}/formatting.txt | 0 {help => dev-docs/gradle-help}/git.txt | 0 {help => dev-docs/gradle-help}/localSettings.txt | 0 {help => dev-docs/gradle-help}/publishing.txt | 0 {help => dev-docs/gradle-help}/tests.txt | 0 .../gradle-help}/validateLogCalls.txt | 0 {help => dev-docs/gradle-help}/workflow.txt | 0 dev-docs/lucene-upgrade.md | 14 +- dev-docs/overseer/overseer.adoc | 7 +- dev-tools/scripts/addDepsToChanges.py | 102 ++++- dev-tools/scripts/releaseWizard.yaml | 4 +- gradle/globals.gradle | 5 + gradle/help.gradle | 22 +- gradle/libs.versions.toml | 20 +- .../randomization/policies/solr-tests.policy | 2 + gradle/validation/spotless.gradle | 2 +- settings.gradle | 1 + solr/CHANGES.txt | 38 +- solr/api/gradle.lockfile | 84 ++-- .../solr/client/api/model/CreateCoreParams.java | 5 - solr/benchmark/build.gradle | 1 + solr/benchmark/gradle.lockfile | 84 ++-- .../search/ExitableDirectoryReaderSearch.java | 192 ++++++++ .../org/apache/solr/bench/search/JsonFaceting.java | 20 +- .../solr/bench/search/QueryResponseWriters.java | 4 +- solr/bin/solr | 2 +- solr/bin/solr.cmd | 8 +- solr/core/gradle.lockfile | 102 ++--- .../src/java/org/apache/solr/cli/CLIUtils.java | 2 +- .../src/java/org/apache/solr/cli/DeleteTool.java | 3 +- .../src/java/org/apache/solr/cli/ExportTool.java | 2 +- .../src/java/org/apache/solr/cloud/Overseer.java | 93 ++-- .../java/org/apache/solr/cloud/ZkController.java | 58 ++- .../apache/solr/cloud/ZkSolrResourceLoader.java | 9 - .../api/collections/CollectionHandlingUtils.java | 9 - .../cloud/api/collections/OverseerStatusCmd.java | 19 +- .../java/org/apache/solr/core/CoreContainer.java | 110 +---- .../java/org/apache/solr/core/CoreDescriptor.java | 8 - .../org/apache/solr/core/DirectoryFactory.java | 2 +- .../apache/solr/core/HttpSolrClientProvider.java | 3 +- .../solr/core/IndexDeletionPolicyWrapper.java | 17 - .../src/java/org/apache/solr/core/NodeConfig.java | 18 - .../org/apache/solr/core/SchemaCodecFactory.java | 6 +- .../src/java/org/apache/solr/core/SolrCores.java | 117 +---- .../org/apache/solr/core/SolrResourceLoader.java | 8 - .../java/org/apache/solr/core/SolrXmlConfig.java | 4 - .../apache/solr/core/TransientSolrCoreCache.java | 119 ----- .../solr/core/TransientSolrCoreCacheDefault.java | 184 -------- .../org/apache/solr/core/TransientSolrCores.java | 173 -------- .../solr/handler/admin/CoreAdminHandler.java | 26 +- .../solr/handler/admin/ShowFileRequestHandler.java | 18 +- .../handler/component/HttpShardHandlerFactory.java | 7 - .../solr/handler/component/QueryComponent.java | 15 +- .../solr/handler/component/ResponseBuilder.java | 22 +- .../solr/handler/component/SearchHandler.java | 17 +- .../solr/index/SlowCompositeReaderWrapper.java | 7 +- .../org/apache/solr/internal/csv/CharBuffer.java | 21 +- .../apache/solr/search/DelegatingCollector.java | 18 +- .../java/org/apache/solr/search/QueryCommand.java | 10 - .../java/org/apache/solr/search/QueryLimit.java | 14 + .../java/org/apache/solr/search/QueryLimits.java | 84 +++- .../org/apache/solr/search/SolrIndexSearcher.java | 13 +- .../org/apache/solr/search/TimeAllowedLimit.java | 67 ++- .../apache/solr/security/AllowListUrlChecker.java | 25 +- .../org/apache/solr/security/MultiAuthPlugin.java | 14 +- .../org/apache/solr/update/UpdateShardHandler.java | 4 +- .../util/circuitbreaker/CPUCircuitBreaker.java | 5 - .../solr/collection1/conf/schema_codec.xml | 2 +- .../conf/solrconfig-implicitproperties.xml | 1 - ...auth_plugin_with_basic_and_xbasic_security.json | 26 ++ ...multi_auth_plugin_with_basic_only_security.json | 17 + ...i_auth_plugin_with_mock_and_basic_security.json | 22 + .../multi_auth_plugin_with_xbasic_security.json | 22 + solr/core/src/test-files/solr/solr-50-all.xml | 1 - .../src/test-files/solr/solr-transientCores.xml | 20 - .../test/org/apache/solr/TestCpuTimeSearch.java | 120 ++--- .../test/org/apache/solr/TestTolerantSearch.java | 4 +- .../api/NodeConfigClusterPluginsSourceTest.java | 4 +- .../apache/solr/blockcache/BlockDirectoryTest.java | 2 +- .../OverseerCollectionConfigSetProcessorTest.java | 1 - .../test/org/apache/solr/cloud/OverseerTest.java | 109 +---- .../apache/solr/cloud/TestRandomFlRTGCloud.java | 10 +- .../AsyncCallRequestStatusResponseTest.java | 28 +- .../cloud/api/collections/TestCollectionAPI.java | 8 +- .../solr/core/ExitableDirectoryReaderTest.java | 52 +-- .../org/apache/solr/core/TestCodecSupport.java | 4 +- .../org/apache/solr/core/TestCoreDiscovery.java | 139 ++---- .../solr/core/TestImplicitCoreProperties.java | 6 +- .../test/org/apache/solr/core/TestLazyCores.java | 491 +-------------------- .../apache/solr/core/TestMergePolicyConfig.java | 2 +- .../src/test/org/apache/solr/core/TestSolrXml.java | 1 - .../solr/filestore/TestDistribFileStore.java | 2 +- .../apache/solr/handler/TestContainerPlugin.java | 2 +- .../handler/TestHealthCheckHandlerLegacyMode.java | 2 +- .../solr/handler/TestReplicationHandler.java | 6 +- .../TestUserManagedReplicationWithAuth.java | 2 +- .../apache/solr/handler/V2ApiIntegrationTest.java | 11 +- .../handler/admin/ShowFileRequestHandlerTest.java | 31 +- .../solr/handler/admin/V2CoresAPIMappingTest.java | 2 - .../component/DistributedDebugComponentTest.java | 4 +- .../apache/solr/internal/csv/CharBufferTest.java | 3 - .../solr/metrics/SolrMetricsIntegrationTest.java | 1 - .../src/test/org/apache/solr/pkg/TestPackages.java | 4 +- .../response/TestPrometheusResponseWriter.java | 5 +- .../apache/solr/response/TestRawTransformer.java | 40 +- .../test/org/apache/solr/search/TestDocSet.java | 5 +- .../org/apache/solr/search/TestQueryLimits.java | 73 ++- .../org/apache/solr/search/TestSmileRequest.java | 4 +- .../solr/search/facet/TestJsonFacetErrors.java | 14 +- .../solr/search/facet/TestJsonFacetRefinement.java | 16 +- .../apache/solr/search/facet/TestJsonFacets.java | 28 +- .../facet/TestJsonFacetsWithNestedObjects.java | 2 +- .../solr/search/facet/TestJsonRangeFacets.java | 12 +- .../apache/solr/search/json/TestJsonRequest.java | 6 +- .../apache/solr/security/MultiAuthPluginTest.java | 235 ++++++++++ solr/cross-dc-manager/gradle.lockfile | 96 ++-- solr/docker/build.gradle | 2 +- solr/docker/templates/Dockerfile.body.template | 3 +- solr/documentation/gradle.lockfile | 14 +- solr/licenses/commons-compress-1.26.1.jar.sha1 | 1 - solr/licenses/commons-compress-1.28.0.jar.sha1 | 1 + solr/licenses/commons-io-2.17.0.jar.sha1 | 1 - solr/licenses/commons-io-2.20.0.jar.sha1 | 1 + solr/licenses/commons-lang3-3.18.0.jar.sha1 | 1 - solr/licenses/commons-lang3-3.19.0.jar.sha1 | 1 + solr/licenses/cuvs-java-25.10.0.jar.sha1 | 1 + solr/licenses/cuvs-java-LICENSE-ASL.txt | 201 +++++++++ solr/licenses/cuvs-java-NOTICE.txt | 0 solr/licenses/cuvs-lucene-25.10.0.jar.sha1 | 1 + solr/licenses/cuvs-lucene-LICENSE-ASL.txt | 201 +++++++++ solr/licenses/cuvs-lucene-NOTICE.txt | 0 solr/licenses/jetty-alpn-client-12.0.19.jar.sha1 | 1 - solr/licenses/jetty-alpn-client-12.0.27.jar.sha1 | 1 + .../jetty-alpn-java-client-12.0.19.jar.sha1 | 1 - .../jetty-alpn-java-client-12.0.27.jar.sha1 | 1 + .../jetty-alpn-java-server-12.0.19.jar.sha1 | 1 - .../jetty-alpn-java-server-12.0.27.jar.sha1 | 1 + solr/licenses/jetty-alpn-server-12.0.19.jar.sha1 | 1 - solr/licenses/jetty-alpn-server-12.0.27.jar.sha1 | 1 + solr/licenses/jetty-client-12.0.19.jar.sha1 | 1 - solr/licenses/jetty-client-12.0.27.jar.sha1 | 1 + solr/licenses/jetty-deploy-12.0.19.jar.sha1 | 1 - solr/licenses/jetty-deploy-12.0.27.jar.sha1 | 1 + solr/licenses/jetty-ee-12.0.19.jar.sha1 | 1 - solr/licenses/jetty-ee-12.0.27.jar.sha1 | 1 + solr/licenses/jetty-ee10-servlet-12.0.19.jar.sha1 | 1 - solr/licenses/jetty-ee10-servlet-12.0.27.jar.sha1 | 1 + solr/licenses/jetty-ee10-servlets-12.0.19.jar.sha1 | 1 - solr/licenses/jetty-ee10-servlets-12.0.27.jar.sha1 | 1 + solr/licenses/jetty-ee10-webapp-12.0.19.jar.sha1 | 1 - solr/licenses/jetty-ee10-webapp-12.0.27.jar.sha1 | 1 + solr/licenses/jetty-http-12.0.19.jar.sha1 | 1 - solr/licenses/jetty-http-12.0.27.jar.sha1 | 1 + solr/licenses/jetty-http2-client-12.0.19.jar.sha1 | 1 - solr/licenses/jetty-http2-client-12.0.27.jar.sha1 | 1 + .../jetty-http2-client-transport-12.0.19.jar.sha1 | 1 - .../jetty-http2-client-transport-12.0.27.jar.sha1 | 1 + solr/licenses/jetty-http2-common-12.0.19.jar.sha1 | 1 - solr/licenses/jetty-http2-common-12.0.27.jar.sha1 | 1 + solr/licenses/jetty-http2-hpack-12.0.19.jar.sha1 | 1 - solr/licenses/jetty-http2-hpack-12.0.27.jar.sha1 | 1 + solr/licenses/jetty-http2-server-12.0.19.jar.sha1 | 1 - solr/licenses/jetty-http2-server-12.0.27.jar.sha1 | 1 + solr/licenses/jetty-io-12.0.19.jar.sha1 | 1 - solr/licenses/jetty-io-12.0.27.jar.sha1 | 1 + solr/licenses/jetty-jmx-12.0.19.jar.sha1 | 1 - solr/licenses/jetty-jmx-12.0.27.jar.sha1 | 1 + solr/licenses/jetty-rewrite-12.0.19.jar.sha1 | 1 - solr/licenses/jetty-rewrite-12.0.27.jar.sha1 | 1 + solr/licenses/jetty-security-12.0.19.jar.sha1 | 1 - solr/licenses/jetty-security-12.0.27.jar.sha1 | 1 + solr/licenses/jetty-server-12.0.19.jar.sha1 | 1 - solr/licenses/jetty-server-12.0.27.jar.sha1 | 1 + solr/licenses/jetty-session-12.0.19.jar.sha1 | 1 - solr/licenses/jetty-session-12.0.27.jar.sha1 | 1 + solr/licenses/jetty-start-12.0.19-shaded.jar.sha1 | 1 - solr/licenses/jetty-start-12.0.27-shaded.jar.sha1 | 1 + solr/licenses/jetty-util-12.0.19.jar.sha1 | 1 - solr/licenses/jetty-util-12.0.27.jar.sha1 | 1 + solr/licenses/jetty-xml-12.0.19.jar.sha1 | 1 - solr/licenses/jetty-xml-12.0.27.jar.sha1 | 1 + .../lucene-analysis-common-10.2.1.jar.sha1 | 1 - .../lucene-analysis-common-10.3.1.jar.sha1 | 1 + solr/licenses/lucene-analysis-icu-10.2.1.jar.sha1 | 1 - solr/licenses/lucene-analysis-icu-10.3.1.jar.sha1 | 1 + .../lucene-analysis-kuromoji-10.2.1.jar.sha1 | 1 - .../lucene-analysis-kuromoji-10.3.1.jar.sha1 | 1 + .../lucene-analysis-morfologik-10.2.1.jar.sha1 | 1 - .../lucene-analysis-morfologik-10.3.1.jar.sha1 | 1 + solr/licenses/lucene-analysis-nori-10.2.1.jar.sha1 | 1 - solr/licenses/lucene-analysis-nori-10.3.1.jar.sha1 | 1 + .../lucene-analysis-opennlp-10.2.1.jar.sha1 | 1 - .../lucene-analysis-opennlp-10.3.1.jar.sha1 | 1 + .../lucene-analysis-phonetic-10.2.1.jar.sha1 | 1 - .../lucene-analysis-phonetic-10.3.1.jar.sha1 | 1 + .../lucene-analysis-smartcn-10.2.1.jar.sha1 | 1 - .../lucene-analysis-smartcn-10.3.1.jar.sha1 | 1 + .../lucene-analysis-stempel-10.2.1.jar.sha1 | 1 - .../lucene-analysis-stempel-10.3.1.jar.sha1 | 1 + .../lucene-backward-codecs-10.2.1.jar.sha1 | 1 - .../lucene-backward-codecs-10.3.1.jar.sha1 | 1 + .../licenses/lucene-classification-10.2.1.jar.sha1 | 1 - .../licenses/lucene-classification-10.3.1.jar.sha1 | 1 + solr/licenses/lucene-codecs-10.2.1.jar.sha1 | 1 - solr/licenses/lucene-codecs-10.3.1.jar.sha1 | 1 + solr/licenses/lucene-core-10.2.1.jar.sha1 | 1 - solr/licenses/lucene-core-10.3.1.jar.sha1 | 1 + solr/licenses/lucene-expressions-10.2.1.jar.sha1 | 1 - solr/licenses/lucene-expressions-10.3.1.jar.sha1 | 1 + solr/licenses/lucene-facet-10.2.1.jar.sha1 | 1 - solr/licenses/lucene-facet-10.3.1.jar.sha1 | 1 + solr/licenses/lucene-grouping-10.2.1.jar.sha1 | 1 - solr/licenses/lucene-grouping-10.3.1.jar.sha1 | 1 + solr/licenses/lucene-highlighter-10.2.1.jar.sha1 | 1 - solr/licenses/lucene-highlighter-10.3.1.jar.sha1 | 1 + solr/licenses/lucene-join-10.2.1.jar.sha1 | 1 - solr/licenses/lucene-join-10.3.1.jar.sha1 | 1 + solr/licenses/lucene-memory-10.2.1.jar.sha1 | 1 - solr/licenses/lucene-memory-10.3.1.jar.sha1 | 1 + solr/licenses/lucene-misc-10.2.1.jar.sha1 | 1 - solr/licenses/lucene-misc-10.3.1.jar.sha1 | 1 + solr/licenses/lucene-queries-10.2.1.jar.sha1 | 1 - solr/licenses/lucene-queries-10.3.1.jar.sha1 | 1 + solr/licenses/lucene-queryparser-10.2.1.jar.sha1 | 1 - solr/licenses/lucene-queryparser-10.3.1.jar.sha1 | 1 + solr/licenses/lucene-sandbox-10.2.1.jar.sha1 | 1 - solr/licenses/lucene-sandbox-10.3.1.jar.sha1 | 1 + .../licenses/lucene-spatial-extras-10.2.1.jar.sha1 | 1 - .../licenses/lucene-spatial-extras-10.3.1.jar.sha1 | 1 + solr/licenses/lucene-spatial3d-10.2.1.jar.sha1 | 1 - solr/licenses/lucene-spatial3d-10.3.1.jar.sha1 | 1 + solr/licenses/lucene-suggest-10.2.1.jar.sha1 | 1 - solr/licenses/lucene-suggest-10.3.1.jar.sha1 | 1 + .../licenses/lucene-test-framework-10.2.1.jar.sha1 | 1 - .../licenses/lucene-test-framework-10.3.1.jar.sha1 | 1 + solr/licenses/onnxruntime-1.22.0.jar.sha1 | 1 - solr/licenses/onnxruntime-1.23.0.jar.sha1 | 1 + solr/licenses/opennlp-dl-2.5.4.jar.sha1 | 1 - solr/licenses/opennlp-dl-2.5.6.jar.sha1 | 1 + solr/licenses/opennlp-tools-2.5.4.jar.sha1 | 1 - solr/licenses/opennlp-tools-2.5.6.jar.sha1 | 1 + solr/modules/analysis-extras/gradle.lockfile | 100 ++--- solr/modules/clustering/gradle.lockfile | 84 ++-- solr/modules/cross-dc/gradle.lockfile | 84 ++-- solr/modules/cuvs/README.md | 26 ++ .../QueryLimit.java => modules/cuvs/build.gradle} | 27 +- solr/modules/{scripting => cuvs}/gradle.lockfile | 86 ++-- .../src/java/org/apache/solr/cuvs/CuVSCodec.java | 124 ++++++ .../org/apache/solr/cuvs/CuVSCodecFactory.java | 59 +++ .../java/org/apache/solr/cuvs/package-info.java} | 18 +- solr/modules/cuvs/src/java/overview.html | 21 + .../cuvs/src/test-files/log4j2.xml} | 19 +- .../test-files/solr/collection1/conf/schema.xml | 34 ++ .../solr/collection1/conf/solrconfig.xml | 41 ++ solr/modules/cuvs/src/test-files/solr/solr.xml | 41 ++ .../apache/solr/cuvs/TestCuVSCodecSupportIT.java | 166 +++++++ solr/modules/extraction/gradle.lockfile | 88 ++-- solr/modules/gcs-repository/gradle.lockfile | 84 ++-- solr/modules/jwt-auth/gradle.lockfile | 84 ++-- .../apache/solr/security/jwt/JWTAuthPlugin.java | 11 - solr/modules/langid/gradle.lockfile | 86 ++-- .../apache/solr/update/processor/LangIdParams.java | 3 - .../LanguageIdentifierUpdateProcessor.java | 12 +- ...geIdentifierUpdateProcessorFactoryTestCase.java | 13 - solr/modules/llm/gradle.lockfile | 84 ++-- solr/modules/ltr/gradle.lockfile | 84 ++-- .../java/org/apache/solr/ltr/feature/Feature.java | 8 + solr/modules/opentelemetry/gradle.lockfile | 84 ++-- solr/modules/s3-repository/gradle.lockfile | 92 ++-- solr/modules/scripting/gradle.lockfile | 84 ++-- solr/modules/sql/gradle.lockfile | 100 ++--- solr/server/etc/security.policy | 3 + solr/server/gradle.lockfile | 96 ++-- solr/server/resources/log4j2-console.xml | 6 +- solr/server/resources/log4j2.xml | 4 +- .../solr/configsets/_default/conf/solrconfig.xml | 2 +- .../conf/solrconfig.xml | 2 +- solr/solr-ref-guide/gradle.lockfile | 86 ++-- .../pages/configuring-solr-xml.adoc | 10 - .../configuration-guide/pages/core-discovery.adoc | 11 - .../modules/configuration-guide/pages/libs.adoc | 31 +- .../pages/property-substitution.adoc | 1 - .../pages/basic-authentication-plugin.adoc | 31 +- .../pages/cluster-node-management.adoc | 1 - .../deployment-guide/pages/metrics-reporting.adoc | 1 - .../query-guide/pages/common-query-parameters.adoc | 4 + .../query-guide/pages/dense-vector-search.adoc | 279 +++++++++++- .../pages/stream-decorator-reference.adoc | 196 ++++++-- .../pages/major-changes-in-solr-10.adoc | 5 + .../pages/major-changes-in-solr-8.adoc | 2 +- solr/solrj-streaming/gradle.lockfile | 85 ++-- .../java/org/apache/solr/client/solrj/io/Lang.java | 2 + .../solr/client/solrj/io/SolrClientCache.java | 2 +- .../solrj/io/stream/FullOuterJoinStream.java | 126 ++++++ .../org/apache/solr/client/solrj/io/TestLang.java | 1 + .../solrj/io/stream/StreamDecoratorTest.java | 158 +++++++ solr/solrj-zookeeper/gradle.lockfile | 87 ++-- solr/solrj/gradle.lockfile | 91 ++-- .../solrj/impl/BaseHttpClusterStateProvider.java | 4 +- .../solr/client/solrj/impl/BaseHttpSolrClient.java | 41 +- .../client/solrj/impl/CloudHttp2SolrClient.java | 55 +-- .../solrj/impl/Http2ClusterStateProvider.java | 34 +- .../solr/client/solrj/impl/Http2SolrClient.java | 121 ++--- .../solr/client/solrj/impl/HttpJdkSolrClient.java | 21 +- .../solr/client/solrj/impl/HttpSolrClientBase.java | 15 +- .../solrj/impl/HttpSolrClientBuilderBase.java | 31 ++ .../solrj/impl/InputStreamResponseParser.java | 30 +- .../solr/client/solrj/impl/LBHttp2SolrClient.java | 2 +- .../solr/client/solrj/impl/LBSolrClient.java | 2 +- .../solr/client/solrj/impl/NoOpResponseParser.java | 76 ---- .../solrj/impl/RemoteExecutionException.java | 59 +++ .../client/solrj/request/CoreAdminRequest.java | 13 - .../solrj/request/DelegationTokenRequest.java | 4 +- .../org/apache/solr/common/cloud/ZkNodeProps.java | 8 - .../apache/solr/common/params/CoreAdminParams.java | 2 - .../apache/solr/common/util/SolrJSONWriter.java | 7 +- .../DeprecatedSystemPropertyMappings.properties | 5 +- .../apache/solr/client/solrj/SolrExampleTests.java | 22 +- .../impl/CloudHttp2SolrClientBuilderTest.java | 8 +- .../solrj/impl/CloudHttp2SolrClientTest.java | 9 + .../solrj/impl/ClusterStateProviderTest.java | 121 +++-- .../solrj/impl/HttpSolrClientBuilderTest.java | 2 +- .../solrj/impl/LBHttpSolrClientBuilderTest.java | 2 +- .../solr/client/solrj/request/TestCoreAdmin.java | 4 - ...est.java => InputStreamResponseParserTest.java} | 35 +- solr/test-framework/gradle.lockfile | 86 ++-- .../apache/solr/BaseDistributedSearchTestCase.java | 9 +- .../src/java/org/apache/solr/SolrTestCaseHS.java | 86 +--- .../src/java/org/apache/solr/SolrTestCaseJ4.java | 8 +- .../solr/search/CallerSpecificQueryLimit.java | 178 +------- .../java/org/apache/solr/util/CallerMatcher.java | 270 +++++++++++ .../solr/search/CallerSpecificQueryLimitTest.java | 6 +- .../commonMain/composeResources/values/strings.xml | 1 + .../solr/ui/components/auth/BasicAuthComponent.kt | 2 +- .../integration/DefaultAuthenticationComponent.kt | 13 +- .../start/integration/HttpStartStoreClient.kt | 41 +- .../kotlin/org/apache/solr/ui/domain/AuthMethod.kt | 4 +- .../kotlin/org/apache/solr/ui/domain/AuthOption.kt | 4 +- .../org/apache/solr/ui/utils/HttpClientUtils.kt | 8 +- .../apache/solr/ui/views/auth/BasicAuthContent.kt | 5 +- solr/webapp/gradle.lockfile | 94 ++-- solr/webapp/web/WEB-INF/web.xml | 2 +- 351 files changed, 5046 insertions(+), 4019 deletions(-) diff --cc gradle/testing/randomization/policies/solr-tests.policy index 5e7f2f81d0b,5dbd7f3449f..763a1330846 --- a/gradle/testing/randomization/policies/solr-tests.policy +++ b/gradle/testing/randomization/policies/solr-tests.policy @@@ -276,8 -276,6 +276,10 @@@ grant permission java.io.FilePermission "${lucene-dev-path.dir}${/}-", "read"; // Allow testing effects of customized or bug-fixed dependencies locally (also need to add mavenLocal() to build) permission java.io.FilePermission "${user.home}${/}.m2${/}repository${/}-", "read"; + + permission java.lang.RuntimePermission "loadLibrary.cudart"; }; + +grant { + permission jdk.jfr.FlightRecorderPermission "accessFlightRecorder"; +}; diff --cc solr/api/gradle.lockfile index 075f7569725,61979b70daa..f0f31acca93 --- a/solr/api/gradle.lockfile +++ b/solr/api/gradle.lockfile @@@ -36,11 -36,14 +36,11 @@@ com.sun.activation:jakarta.activation:2 com.tdunning:t-digest:3.3=jarValidation,testRuntimeClasspath commons-cli:commons-cli:1.10.0=jarValidation,testRuntimeClasspath commons-codec:commons-codec:1.19.0=jarValidation,testRuntimeClasspath - commons-io:commons-io:2.17.0=jarValidation,testCompileClasspath,testRuntimeClasspath + commons-io:commons-io:2.20.0=jarValidation,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,testRuntimeClasspath io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,testRuntimeClasspath io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,testRuntimeClasspath io.github.classgraph:classgraph:4.8.165=swaggerBuild io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor diff --cc solr/benchmark/gradle.lockfile index 1328e055999,a00c748c3d3..bedee55d6b8 --- a/solr/benchmark/gradle.lockfile +++ b/solr/benchmark/gradle.lockfile @@@ -32,11 -32,14 +32,11 @@@ com.lmax:disruptor:3.4.4=jarValidation, com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,testRuntimeClasspath commons-cli:commons-cli:1.10.0=jarValidation,runtimeClasspath,testRuntimeClasspath commons-codec:commons-codec:1.19.0=jarValidation,runtimeClasspath,testRuntimeClasspath - commons-io:commons-io:2.17.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath + commons-io:commons-io:2.20.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,runtimeClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,runtimeClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,runtimeClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,runtimeClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,runtimeClasspath,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.6.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --cc solr/core/gradle.lockfile index 9f57ccd697b,9a55f70e08b..857f486daf5 --- a/solr/core/gradle.lockfile +++ b/solr/core/gradle.lockfile @@@ -37,11 -37,14 +37,11 @@@ com.microsoft.onnxruntime:onnxruntime:1 com.tdunning:t-digest:3.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath commons-cli:commons-cli:1.10.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath commons-codec:commons-codec:1.19.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath - commons-io:commons-io:2.17.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath + commons-io:commons-io:2.20.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.26=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-graphite:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,testRuntimeClasspath io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jmx:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-jvm:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.6.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath diff --cc solr/core/src/java/org/apache/solr/core/HttpSolrClientProvider.java index 43edb25ca82,2e0d348aa0f..a8c27f27ffa --- a/solr/core/src/java/org/apache/solr/core/HttpSolrClientProvider.java +++ b/solr/core/src/java/org/apache/solr/core/HttpSolrClientProvider.java @@@ -16,8 -16,6 +16,7 @@@ */ package org.apache.solr.core; +import io.opentelemetry.api.common.Attributes; - import java.util.List; import java.util.concurrent.TimeUnit; import org.apache.solr.client.solrj.impl.Http2SolrClient; import org.apache.solr.common.util.IOUtils; diff --cc solr/core/src/java/org/apache/solr/core/SolrCores.java index 74c06e11961,18213cd55ea..3a8d7a058ba --- a/solr/core/src/java/org/apache/solr/core/SolrCores.java +++ b/solr/core/src/java/org/apache/solr/core/SolrCores.java @@@ -39,7 -37,7 +39,7 @@@ import org.slf4j.Logger import org.slf4j.LoggerFactory; /** AKA CoreManager: Holds/manages {@link SolrCore}s within {@link CoreContainer}. */ - public class SolrCores implements SolrInfoBean { -class SolrCores { ++class SolrCores implements SolrInfoBean { private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); @@@ -92,9 -81,8 +83,9 @@@ // We are shutting down. You can't hold the lock on the various lists of cores while they shut // down, so we need to make a temporary copy of the names and shut them down outside the lock. - protected void close() { + @Override + public void close() { - waitForLoadingCoresToFinish(30 * 1000); + waitForLoadingCoresToFinish(30_000); // It might be possible for one of the cores to move from one list to another while we're // closing them. So loop through the lists until they're all empty. In particular, the core @@@ -484,48 -416,4 +415,38 @@@ public boolean isCoreLoading(String name) { return currentlyLoadingCores.contains(name); } + - public void queueCoreToClose(SolrCore coreToClose) { - synchronized (modifyLock) { - pendingCloses.add(coreToClose); // Essentially just queue this core up for closing. - modifyLock.notifyAll(); // Wakes up closer thread too - } - } - + @Override + public void initializeMetrics(SolrMetricsContext parentContext, Attributes attributes) { + parentContext.observableLongGauge( + "solr_cores_loaded", + "Number of Solr cores loaded by CoreContainer", + measurement -> { + measurement.record( + getNumLoadedPermanentCores(), + attributes.toBuilder().put(TYPE_ATTR, "permanent").build()); - measurement.record( - getNumLoadedTransientCores(), - attributes.toBuilder().put(TYPE_ATTR, "transient").build()); + measurement.record( + getNumUnloadedCores(), attributes.toBuilder().put(TYPE_ATTR, "unloaded").build()); + }); + } + + @Override + public SolrMetricsContext getSolrMetricsContext() { + return this.container.solrMetricsContext; + } + + @Override + public String getName() { + return this.getClass().getName(); + } + + @Override + public String getDescription() { + return "Manager for Solr cores within a CoreContainer"; + } + + @Override + public Category getCategory() { + return Category.CONTAINER; + } } diff --cc solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java index a65d61c19bc,18f3bb39217..7c54856a061 --- a/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java +++ b/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java @@@ -78,23 -153,75 +78,22 @@@ public class SolrMetricsIntegrationTes } @Test - public void testConfigureReporter() throws Exception { - Random random = random(); - - String metricName = - SolrMetricManager.mkName(METRIC_NAME, HANDLER_CATEGORY.toString(), HANDLER_NAME); - SolrCoreMetricManager coreMetricManager = h.getCore().getCoreMetricManager(); - Timer timer = metricManager.timer(null, coreMetricManager.getRegistryName(), metricName); - - long initialCount = timer.getCount(); - - int iterations = TestUtil.nextInt(random, 0, MAX_ITERATIONS); - for (int i = 0; i < iterations; ++i) { - h.query(req("*")); - } - - long finalCount = timer.getCount(); - assertEquals("metric counter incorrect", iterations, finalCount - initialCount); - Map<String, SolrMetricReporter> reporters = - metricManager.getReporters(coreMetricManager.getRegistryName()); - assertEquals(RENAMED_REPORTERS.length + jmxReporter, reporters.size()); + public void testCoreContainerMetrics() { + var reader = metricManager.getPrometheusMetricReader("solr.node"); - // SPECIFIC and MULTIREGISTRY were skipped because they were - // specific to collection1 - for (String reporterName : RENAMED_REPORTERS) { - SolrMetricReporter reporter = reporters.get(reporterName + "@" + tag); - assertNotNull("Reporter " + reporterName + " was not found.", reporter); - assertTrue(reporter instanceof MockMetricReporter); + assertNotNull(getGaugeOpt(reader, "solr_cores_loaded", "permanent")); - assertNotNull(getGaugeOpt(reader, "solr_cores_loaded", "transient")); + assertNotNull(getGaugeOpt(reader, "solr_cores_loaded", "unloaded")); - MockMetricReporter mockReporter = (MockMetricReporter) reporter; - assertTrue( - "Reporter " + reporterName + " was not initialized: " + mockReporter, - mockReporter.didInit); - assertTrue( - "Reporter " + reporterName + " was not validated: " + mockReporter, - mockReporter.didValidate); - assertFalse( - "Reporter " + reporterName + " was incorrectly closed: " + mockReporter, - mockReporter.didClose); - } + assertNotNull(getGaugeOpt(reader, "solr_disk_space_bytes", "total_space")); + assertNotNull(getGaugeOpt(reader, "solr_disk_space_bytes", "usable_space")); } - @Test - public void testCoreContainerMetrics() { - String registryName = SolrMetricManager.getRegistryName(SolrInfoBean.Group.node); - assertTrue( - cc.getMetricManager().registryNames().toString(), - cc.getMetricManager().registryNames().contains(registryName)); - MetricRegistry registry = cc.getMetricManager().registry(registryName); - Map<String, Metric> metrics = registry.getMetrics(); - assertTrue(metrics.containsKey("CONTAINER.cores.loaded")); - assertTrue(metrics.containsKey("CONTAINER.cores.unloaded")); - assertTrue(metrics.containsKey("CONTAINER.fs.totalSpace")); - assertTrue(metrics.containsKey("CONTAINER.fs.usableSpace")); - assertTrue(metrics.containsKey("CONTAINER.fs.path")); - assertTrue(metrics.containsKey("CONTAINER.fs.coreRoot.totalSpace")); - assertTrue(metrics.containsKey("CONTAINER.fs.coreRoot.usableSpace")); - assertTrue(metrics.containsKey("CONTAINER.fs.coreRoot.path")); - assertTrue(metrics.containsKey("CONTAINER.version.specification")); - assertTrue(metrics.containsKey("CONTAINER.version.implementation")); - Gauge<?> g = (Gauge<?>) metrics.get("CONTAINER.fs.path"); - assertEquals(g.getValue(), cc.getSolrHome().toString()); + private static GaugeDataPointSnapshot getGaugeOpt( + PrometheusMetricReader reader, String metricName, String type) { + return SolrMetricTestUtils.getGaugeDatapoint( + reader, + metricName, + Labels.of("category", "CONTAINER", "otel_scope_name", "org.apache.solr", "type", type)); } @Test diff --cc solr/cross-dc-manager/gradle.lockfile index 2e830b1a254,befc517c1df..b22aacffe76 --- a/solr/cross-dc-manager/gradle.lockfile +++ b/solr/cross-dc-manager/gradle.lockfile @@@ -45,16 -45,18 +45,16 @@@ commons-cli:commons-cli:1.10.0=jarValid commons-codec:commons-codec:1.19.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-collections:commons-collections:3.2.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath commons-digester:commons-digester:2.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath - commons-io:commons-io:2.17.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath + commons-io:commons-io:2.20.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath commons-validator:commons-validator:1.7=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath +io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.dropwizard.metrics:metrics-healthchecks:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-jakarta-servlets:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,testRuntimeClasspath io.dropwizard.metrics:metrics-json:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-jvm:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +io.dropwizard.metrics:metrics-jvm:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.6.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath diff --cc solr/docker/templates/Dockerfile.body.template index ce7c292ed56,d060096fb7a..6a88683cf83 --- a/solr/docker/templates/Dockerfile.body.template +++ b/solr/docker/templates/Dockerfile.body.template @@@ -65,8 -65,8 +65,7 @@@ RUN set -ex; mv /opt/solr/bin/solr.in.cmd /opt/solr/bin/solr.in.cmd.orig; \ chmod 0664 /etc/default/solr.in.sh; \ mkdir -p -m0770 /var/solr; \ -- chown -R "$SOLR_USER:0" /var/solr; \ - test ! -e /opt/solr/modules || ln -s /opt/solr/modules /opt/solr/contrib; - test ! -e /opt/solr/prometheus-exporter || ln -s /opt/solr/prometheus-exporter /opt/solr/modules/prometheus-exporter; ++ chown -R "$SOLR_USER:0" /var/solr; RUN set -ex; \ apt-get update; \ diff --cc solr/modules/analysis-extras/gradle.lockfile index 6ba985ac16b,083387732a1..0109dfc55be --- a/solr/modules/analysis-extras/gradle.lockfile +++ b/solr/modules/analysis-extras/gradle.lockfile @@@ -34,11 -34,14 +34,11 @@@ com.microsoft.onnxruntime:onnxruntime:1 com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.10.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.19.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath - commons-io:commons-io:2.17.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath + commons-io:commons-io:2.20.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.26=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-graphite:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jmx:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jvm:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.6.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath diff --cc solr/modules/clustering/gradle.lockfile index 522235c36e1,6216ab677bb..3fb93cf4366 --- a/solr/modules/clustering/gradle.lockfile +++ b/solr/modules/clustering/gradle.lockfile @@@ -32,11 -32,14 +32,11 @@@ com.lmax:disruptor:3.4.4=solrPlatformLi com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.19.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath - commons-io:commons-io:2.17.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath + commons-io:commons-io:2.20.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.6.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath diff --cc solr/modules/cross-dc/gradle.lockfile index ce5cb4f8305,5808bb93497..e5307fbe55a --- a/solr/modules/cross-dc/gradle.lockfile +++ b/solr/modules/cross-dc/gradle.lockfile @@@ -33,11 -33,14 +33,11 @@@ com.lmax:disruptor:3.4.4=solrPlatformLi com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.10.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.19.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath - commons-io:commons-io:2.17.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath + commons-io:commons-io:2.20.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath +io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath io.dropwizard.metrics:metrics-core:4.2.26=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-graphite:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jmx:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jvm:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.6.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath diff --cc solr/modules/cuvs/gradle.lockfile index a3299bf057c,b9c29f7aad8..0def87f8749 --- a/solr/modules/cuvs/gradle.lockfile +++ b/solr/modules/cuvs/gradle.lockfile @@@ -32,11 -34,14 +34,11 @@@ com.nvidia.cuvs:cuvs-java:25.10.0=compi com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.19.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath - commons-io:commons-io:2.17.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath + commons-io:commons-io:2.20.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.6.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath diff --cc solr/modules/gcs-repository/gradle.lockfile index 429c4598cad,fabf520f290..d871a7328af --- a/solr/modules/gcs-repository/gradle.lockfile +++ b/solr/modules/gcs-repository/gradle.lockfile @@@ -61,11 -61,14 +61,11 @@@ com.lmax:disruptor:3.4.4=solrPlatformLi com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.10.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.19.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath - commons-io:commons-io:2.17.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath + commons-io:commons-io:2.20.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.26=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-graphite:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jmx:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jvm:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.grpc:grpc-alts:1.65.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath diff --cc solr/modules/jwt-auth/gradle.lockfile index f5f3c7c119b,d9ede90128e..f205f4a73bb --- a/solr/modules/jwt-auth/gradle.lockfile +++ b/solr/modules/jwt-auth/gradle.lockfile @@@ -42,11 -42,14 +42,11 @@@ com.squareup.okio:okio:3.6.0=jarValidat com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.19.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath - commons-io:commons-io:2.17.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath + commons-io:commons-io:2.20.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.github.microutils:kotlin-logging-jvm:3.0.5=jarValidation,testRuntimeClasspath diff --cc solr/modules/langid/gradle.lockfile index 7de8758bf52,8af1334e0f3..6a560903424 --- a/solr/modules/langid/gradle.lockfile +++ b/solr/modules/langid/gradle.lockfile @@@ -33,11 -33,14 +33,11 @@@ com.lmax:disruptor:3.4.4=solrPlatformLi com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.19.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath - commons-io:commons-io:2.17.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath + commons-io:commons-io:2.20.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.6.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath diff --cc solr/modules/ltr/gradle.lockfile index c0e1b6f02d9,32f586f15a9..de00f483d4d --- a/solr/modules/ltr/gradle.lockfile +++ b/solr/modules/ltr/gradle.lockfile @@@ -32,11 -32,14 +32,11 @@@ com.lmax:disruptor:3.4.4=solrPlatformLi com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.19.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath - commons-io:commons-io:2.17.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath + commons-io:commons-io:2.20.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.6.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath diff --cc solr/modules/opentelemetry/gradle.lockfile index 75d96d82e94,5631430fa4f..78e279a77b1 --- a/solr/modules/opentelemetry/gradle.lockfile +++ b/solr/modules/opentelemetry/gradle.lockfile @@@ -38,11 -38,14 +38,11 @@@ com.squareup.okio:okio:3.15.0=jarValida com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.19.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath - commons-io:commons-io:2.17.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath + commons-io:commons-io:2.20.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.grpc:grpc-api:1.65.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath diff --cc solr/modules/s3-repository/gradle.lockfile index 058305c28e4,b8cdcd1cf33..433df8f62ec --- a/solr/modules/s3-repository/gradle.lockfile +++ b/solr/modules/s3-repository/gradle.lockfile @@@ -45,11 -45,14 +45,11 @@@ com.sun.istack:istack-commons-runtime:4 com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.10.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.19.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath - commons-io:commons-io:2.17.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath + commons-io:commons-io:2.20.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.26=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-graphite:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jmx:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jvm:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.micrometer:micrometer-commons:1.13.3=jarValidation,testCompileClasspath,testRuntimeClasspath diff --cc solr/modules/scripting/gradle.lockfile index a3299bf057c,68cdb5d709d..2e6aa241656 --- a/solr/modules/scripting/gradle.lockfile +++ b/solr/modules/scripting/gradle.lockfile @@@ -32,11 -32,14 +32,11 @@@ com.lmax:disruptor:3.4.4=solrPlatformLi com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.19.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath - commons-io:commons-io:2.17.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath + commons-io:commons-io:2.20.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.6.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath diff --cc solr/modules/sql/gradle.lockfile index 872bf209d08,4f7a3ec979e..c9aa391d53e --- a/solr/modules/sql/gradle.lockfile +++ b/solr/modules/sql/gradle.lockfile @@@ -35,11 -35,14 +35,11 @@@ com.microsoft.onnxruntime:onnxruntime:1 com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.19.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath - commons-io:commons-io:2.17.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath + commons-io:commons-io:2.20.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.6.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath diff --cc solr/server/etc/security.policy index a779dfbc7a2,bd0be0fc42c..df5550df7f1 --- a/solr/server/etc/security.policy +++ b/solr/server/etc/security.policy @@@ -216,9 -217,7 +216,12 @@@ grant // expanded to a wildcard if set, allows all networking everywhere permission java.net.SocketPermission "${solr.internal.network.permission}", "accept,listen,connect,resolve"; + + // CUDA for GPU module (cuVS) + permission java.lang.RuntimePermission "loadLibrary.cudart"; }; + +// Permissions for OTEL Runtime Java 17 telemetry and metrics +grant { + permission jdk.jfr.FlightRecorderPermission "accessFlightRecorder"; +}; diff --cc solr/server/gradle.lockfile index 1c6f8882b35,d4d98e90fd0..9d8af037e3e --- a/solr/server/gradle.lockfile +++ b/solr/server/gradle.lockfile @@@ -31,8 -31,14 +31,8 @@@ com.lmax:disruptor:3.4.4=jarValidation, com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,solrCore commons-cli:commons-cli:1.10.0=jarValidation,runtimeClasspath,solrCore commons-codec:commons-codec:1.19.0=jarValidation,runtimeClasspath,solrCore - commons-io:commons-io:2.17.0=jarValidation,runtimeClasspath,solrCore + commons-io:commons-io:2.20.0=jarValidation,runtimeClasspath,solrCore -io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,libExt,runtimeClasspath -io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,libExt,runtimeClasspath,solrCore -io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,libExt,runtimeClasspath,solrCore -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,libExt,runtimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,libExt,runtimeClasspath -io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,libExt,runtimeClasspath,solrCore -io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,libExt,runtimeClasspath,solrCore +io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,runtimeClasspath,solrCore io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.6.Final=jarValidation,runtimeClasspath,solrCore diff --cc solr/solr-ref-guide/gradle.lockfile index 27b8bb20261,e7eb4fb4e60..4d08f6c81a0 --- a/solr/solr-ref-guide/gradle.lockfile +++ b/solr/solr-ref-guide/gradle.lockfile @@@ -31,11 -31,14 +31,11 @@@ com.jayway.jsonpath:json-path:2.9.0=tes com.tdunning:t-digest:3.3=testRuntimeClasspath commons-cli:commons-cli:1.10.0=testRuntimeClasspath commons-codec:commons-codec:1.19.0=testRuntimeClasspath - commons-io:commons-io:2.17.0=testCompileClasspath,testRuntimeClasspath + commons-io:commons-io:2.20.0=testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.26=testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-graphite:4.2.26=testRuntimeClasspath +io.dropwizard.metrics:metrics-core:4.2.26=testRuntimeClasspath io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=testRuntimeClasspath io.dropwizard.metrics:metrics-jetty12:4.2.26=testRuntimeClasspath -io.dropwizard.metrics:metrics-jmx:4.2.26=testRuntimeClasspath -io.dropwizard.metrics:metrics-jvm:4.2.26=testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.6.Final=testCompileClasspath,testRuntimeClasspath diff --cc solr/solrj-streaming/gradle.lockfile index e31190a11f1,37977ad8da0..4ae0c77a17e --- a/solr/solrj-streaming/gradle.lockfile +++ b/solr/solrj-streaming/gradle.lockfile @@@ -32,11 -32,15 +32,12 @@@ com.jayway.jsonpath:json-path:2.9.0=jar com.tdunning:t-digest:3.3=jarValidation,testRuntimeClasspath commons-cli:commons-cli:1.10.0=jarValidation,testRuntimeClasspath commons-codec:commons-codec:1.19.0=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath - commons-io:commons-io:2.17.0=jarValidation,permitTestUnusedDeclared,testCompileClasspath,testRuntimeClasspath + commons-io:commons-io:2.17.0=permitTestUnusedDeclared + commons-io:commons-io:2.20.0=jarValidation,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,testRuntimeClasspath io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,testRuntimeClasspath io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.1.119.Final=permitTestUnusedDeclared diff --cc solr/solrj-zookeeper/gradle.lockfile index 3ec15c0be57,7b33a3b18f2..42a6f950feb --- a/solr/solrj-zookeeper/gradle.lockfile +++ b/solr/solrj-zookeeper/gradle.lockfile @@@ -37,11 -37,15 +37,12 @@@ com.jayway.jsonpath:json-path:2.9.0=jar com.tdunning:t-digest:3.3=jarValidation,testRuntimeClasspath commons-cli:commons-cli:1.10.0=jarValidation,testRuntimeClasspath commons-codec:commons-codec:1.19.0=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath - commons-io:commons-io:2.17.0=apiHelper,compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath + commons-io:commons-io:2.17.0=apiHelper + commons-io:commons-io:2.20.0=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,testRuntimeClasspath io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,testRuntimeClasspath io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.1.119.Final=apiHelper diff --cc solr/solrj/gradle.lockfile index 813b5e6eafc,662c65771f5..f61d0f435e9 --- a/solr/solrj/gradle.lockfile +++ b/solr/solrj/gradle.lockfile @@@ -32,11 -32,15 +32,12 @@@ com.jayway.jsonpath:json-path:2.9.0=jar com.tdunning:t-digest:3.3=jarValidation,testRuntimeClasspath commons-cli:commons-cli:1.10.0=jarValidation,testRuntimeClasspath commons-codec:commons-codec:1.19.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath - commons-io:commons-io:2.17.0=jarValidation,permitTestUnusedDeclared,testCompileClasspath,testRuntimeClasspath + commons-io:commons-io:2.17.0=permitTestUnusedDeclared + commons-io:commons-io:2.20.0=jarValidation,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,testRuntimeClasspath io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,testRuntimeClasspath io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.1.119.Final=permitTestUnusedDeclared diff --cc solr/test-framework/gradle.lockfile index e842bb7bb3e,0bb0613d310..038a3a23c1c --- a/solr/test-framework/gradle.lockfile +++ b/solr/test-framework/gradle.lockfile @@@ -33,11 -33,14 +33,11 @@@ com.jayway.jsonpath:json-path:2.9.0=api com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath commons-cli:commons-cli:1.10.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-codec:commons-codec:1.19.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath - commons-io:commons-io:2.17.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath + commons-io:commons-io:2.20.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-annotation:4.2.26=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-core:4.2.26=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-graphite:4.2.26=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-jetty12:4.2.26=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-jmx:4.2.26=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-jvm:4.2.26=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.6.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --cc solr/webapp/gradle.lockfile index 799b470da00,00fe39f1403..de329280360 --- a/solr/webapp/gradle.lockfile +++ b/solr/webapp/gradle.lockfile @@@ -31,8 -31,14 +31,8 @@@ com.lmax:disruptor:3.4.4=serverLi com.tdunning:t-digest:3.3=permitUnusedDeclared,solrCore commons-cli:commons-cli:1.10.0=permitUnusedDeclared,solrCore commons-codec:commons-codec:1.19.0=permitUnusedDeclared,solrCore - commons-io:commons-io:2.17.0=permitUnusedDeclared,solrCore + commons-io:commons-io:2.20.0=permitUnusedDeclared,solrCore -io.dropwizard.metrics:metrics-annotation:4.2.26=serverLib -io.dropwizard.metrics:metrics-core:4.2.26=permitUnusedDeclared,serverLib,solrCore -io.dropwizard.metrics:metrics-graphite:4.2.26=permitUnusedDeclared,serverLib,solrCore -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=serverLib -io.dropwizard.metrics:metrics-jetty12:4.2.26=serverLib -io.dropwizard.metrics:metrics-jmx:4.2.26=permitUnusedDeclared,serverLib,solrCore -io.dropwizard.metrics:metrics-jvm:4.2.26=permitUnusedDeclared,serverLib,solrCore +io.dropwizard.metrics:metrics-core:4.2.26=permitUnusedDeclared,solrCore io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.6.Final=permitUnusedDeclared,solrCore
