You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ho...@apache.org on 2023/01/20 18:47:57 UTC
[solr] 01/02: Merge branch 'main' into jira/SOLR-6312
This is an automated email from the ASF dual-hosted git repository.
hossman pushed a commit to branch jira/SOLR-6312
in repository https://gitbox.apache.org/repos/asf/solr.git
commit fe8a8dddfd29dcb34e51b33d060311f44d91a7c9
Merge: 029260f9888 1fafbb55a53
Author: Chris Hostetter <ho...@apache.org>
AuthorDate: Fri Jan 20 11:00:51 2023 -0700
Merge branch 'main' into jira/SOLR-6312
CONTRIBUTING.md | 58 +++
README.md | 3 +-
build.gradle | 11 +-
dev-docs/FAQ.adoc | 38 +-
help/IDEs.txt => dev-docs/IDEs.adoc | 12 +-
dev-docs/README.adoc | 81 ----
dev-docs/how-to-contribute.adoc | 26 ++
dev-docs/jvms.adoc | 14 +
dev-docs/running-in-docker.adoc | 28 ++
dev-docs/solr-source-code.adoc | 48 +++
dev-tools/scripts/buildAndPushRelease.py | 13 +-
dev-tools/scripts/releaseWizard.py | 4 +-
dev-tools/scripts/releaseWizard.yaml | 2 +-
gradle/help.gradle | 2 -
gradle/java/jar-manifest.gradle | 4 +-
gradle/validation/owasp-dependency-check.gradle | 5 +-
help/jvms.txt | 18 -
solr/CHANGES.txt | 29 +-
solr/bin/solr | 14 +-
.../solr/cloud/ShardLeaderElectionContextBase.java | 19 +-
.../org/apache/solr/cloud/ZkConfigSetService.java | 24 +-
.../solr/cloud/api/collections/MigrateCmd.java | 5 +-
.../org/apache/solr/core/ConfigSetService.java | 8 +-
.../java/org/apache/solr/core/CoreContainer.java | 84 +++--
.../solr/core/FileSystemConfigSetService.java | 43 ++-
.../src/java/org/apache/solr/core/PluginBag.java | 11 +-
.../org/apache/solr/core/SchemaCodecFactory.java | 14 +-
.../src/java/org/apache/solr/core/SolrCore.java | 5 +-
.../org/apache/solr/core/backup/BackupManager.java | 37 +-
.../backup/repository/BackupRepositoryFactory.java | 1 -
.../org/apache/solr/handler/admin/SplitOp.java | 63 ++--
.../org/apache/solr/handler/api/V2ApiUtils.java | 4 +
.../handler/configsets/UploadConfigSetFileAPI.java | 7 +
.../solr/pkg/PackageListeningClassLoader.java | 10 +-
.../response/transform/CoreAugmenterFactory.java | 29 ++
.../response/transform/TransformerFactory.java | 1 +
.../org/apache/solr/schema/DenseVectorField.java | 3 +-
.../solr/search/CollapsingQParserPlugin.java | 7 +-
.../java/org/apache/solr/search/DocSetBuilder.java | 6 +-
.../java/org/apache/solr/search/DocSetUtil.java | 8 +-
.../apache/solr/servlet/CoreContainerProvider.java | 5 -
.../apache/solr/servlet/SolrDispatchFilter.java | 3 +-
.../org/apache/solr/update/SolrIndexSplitter.java | 22 +-
.../processor/DistributedZkUpdateProcessor.java | 3 +-
.../src/java/org/apache/solr/util/CryptoKeys.java | 32 +-
.../solr/configsets/conf2/conf/solrconfig.xml | 2 +-
.../solr/configsets/conf3/conf/schema.xml | 43 +++
.../{conf2 => conf3}/conf/solrconfig.xml | 0
.../apache/solr/cloud/PackageManagerCLITest.java | 4 +-
.../org/apache/solr/cloud/TestConfigSetsAPI.java | 162 +++++++-
.../test/org/apache/solr/cloud/TestRSAKeyPair.java | 22 +-
.../apache/solr/cloud/TestRandomFlRTGCloud.java | 42 +++
.../SimpleCollectionCreateDeleteTest.java | 28 ++
.../org/apache/solr/core/TestConfigSetService.java | 19 +-
.../solr/handler/admin/SplitHandlerTest.java | 2 +-
.../apache/solr/handler/api/V2ApiUtilsTest.java | 39 ++
.../src/test/org/apache/solr/pkg/TestPackages.java | 2 +-
.../apache/solr/schema/DenseVectorFieldTest.java | 3 +-
.../solr/search/TestCollapseQParserPlugin.java | 8 +-
.../apache/solr/search/TestCoordinatorRole.java | 412 +++++++++++++++++++--
solr/docker/templates/Dockerfile.body.template | 1 -
solr/licenses/api-common-2.2.1.jar.sha1 | 1 -
solr/licenses/api-common-2.2.2.jar.sha1 | 1 +
.../auto-value-annotations-1.10.1.jar.sha1 | 1 +
solr/licenses/auto-value-annotations-1.9.jar.sha1 | 1 -
solr/licenses/checker-qual-3.27.0.jar.sha1 | 1 -
solr/licenses/checker-qual-3.28.0.jar.sha1 | 1 +
.../licenses/conscrypt-openjdk-uber-2.5.2.jar.sha1 | 1 +
....txt => conscrypt-openjdk-uber-LICENSE-ASL.txt} | 0
solr/licenses/conscrypt-openjdk-uber-NOTICE.txt | 30 ++
... => gapic-google-cloud-storage-LICENSE-ASL.txt} | 1 -
...E.txt => gapic-google-cloud-storage-NOTICE.txt} | 0
...c-google-cloud-storage-v2-2.16.0-alpha.jar.sha1 | 1 +
solr/licenses/gax-2.18.7.jar.sha1 | 1 -
solr/licenses/gax-2.20.1.jar.sha1 | 1 +
solr/licenses/gax-grpc-2.20.1.jar.sha1 | 1 +
solr/licenses/gax-httpjson-0.103.7.jar.sha1 | 1 -
solr/licenses/gax-httpjson-0.105.1.jar.sha1 | 1 +
solr/licenses/google-api-client-2.0.0.jar.sha1 | 1 -
solr/licenses/google-api-client-2.1.1.jar.sha1 | 1 +
...google-auth-library-credentials-1.13.0.jar.sha1 | 1 +
.../google-auth-library-credentials-1.8.1.jar.sha1 | 1 -
...google-auth-library-oauth2-http-1.13.0.jar.sha1 | 1 +
.../google-auth-library-oauth2-http-1.8.1.jar.sha1 | 1 -
solr/licenses/google-cloud-core-2.8.6.jar.sha1 | 1 -
solr/licenses/google-cloud-core-2.9.0.jar.sha1 | 1 +
.../licenses/google-cloud-core-grpc-2.9.0.jar.sha1 | 1 +
.../licenses/google-cloud-core-http-2.8.6.jar.sha1 | 1 -
.../licenses/google-cloud-core-http-2.9.0.jar.sha1 | 1 +
solr/licenses/google-cloud-nio-0.124.14.jar.sha1 | 1 -
solr/licenses/google-cloud-nio-0.126.0.jar.sha1 | 1 +
solr/licenses/google-cloud-storage-2.11.3.jar.sha1 | 1 -
solr/licenses/google-cloud-storage-2.16.0.jar.sha1 | 1 +
solr/licenses/google-http-client-1.42.2.jar.sha1 | 1 -
solr/licenses/google-http-client-1.42.3.jar.sha1 | 1 +
.../google-http-client-apache-v2-1.42.2.jar.sha1 | 1 -
.../google-http-client-apache-v2-1.42.3.jar.sha1 | 1 +
.../google-http-client-appengine-1.42.2.jar.sha1 | 1 -
.../google-http-client-appengine-1.42.3.jar.sha1 | 1 +
.../google-http-client-gson-1.42.2.jar.sha1 | 1 -
.../google-http-client-gson-1.42.3.jar.sha1 | 1 +
.../google-http-client-jackson2-1.42.2.jar.sha1 | 1 -
.../google-http-client-jackson2-1.42.3.jar.sha1 | 1 +
solr/licenses/grpc-alts-1.51.0.jar.sha1 | 1 +
solr/licenses/grpc-api-1.50.2.jar.sha1 | 1 -
solr/licenses/grpc-api-1.51.0.jar.sha1 | 1 +
solr/licenses/grpc-auth-1.51.0.jar.sha1 | 1 +
solr/licenses/grpc-context-1.50.2.jar.sha1 | 1 -
solr/licenses/grpc-context-1.51.0.jar.sha1 | 1 +
solr/licenses/grpc-core-1.50.2.jar.sha1 | 1 -
solr/licenses/grpc-core-1.51.0.jar.sha1 | 1 +
...c-google-cloud-storage-v2-2.16.0-alpha.jar.sha1 | 1 +
solr/licenses/grpc-google-iam-v1-1.6.22.jar.sha1 | 1 +
solr/licenses/grpc-googleapis-1.51.0.jar.sha1 | 1 +
solr/licenses/grpc-grpclb-1.51.0.jar.sha1 | 1 +
solr/licenses/grpc-netty-1.50.2.jar.sha1 | 1 -
solr/licenses/grpc-netty-1.51.0.jar.sha1 | 1 +
solr/licenses/grpc-netty-shaded-1.51.0.jar.sha1 | 1 +
solr/licenses/grpc-protobuf-1.50.2.jar.sha1 | 1 -
solr/licenses/grpc-protobuf-1.51.0.jar.sha1 | 1 +
solr/licenses/grpc-protobuf-lite-1.50.2.jar.sha1 | 1 -
solr/licenses/grpc-protobuf-lite-1.51.0.jar.sha1 | 1 +
solr/licenses/grpc-services-1.51.0.jar.sha1 | 1 +
solr/licenses/grpc-stub-1.50.2.jar.sha1 | 1 -
solr/licenses/grpc-stub-1.51.0.jar.sha1 | 1 +
solr/licenses/grpc-xds-1.51.0.jar.sha1 | 1 +
solr/licenses/gson-2.10.jar.sha1 | 1 +
solr/licenses/gson-2.9.1.jar.sha1 | 1 -
solr/licenses/netty-buffer-4.1.82.Final.jar.sha1 | 1 -
solr/licenses/netty-buffer-4.1.87.Final.jar.sha1 | 1 +
solr/licenses/netty-codec-4.1.82.Final.jar.sha1 | 1 -
solr/licenses/netty-codec-4.1.87.Final.jar.sha1 | 1 +
.../netty-codec-http-4.1.82.Final.jar.sha1 | 1 -
.../netty-codec-http-4.1.87.Final.jar.sha1 | 1 +
.../netty-codec-http2-4.1.82.Final.jar.sha1 | 1 -
.../netty-codec-http2-4.1.87.Final.jar.sha1 | 1 +
.../netty-codec-socks-4.1.82.Final.jar.sha1 | 1 -
.../netty-codec-socks-4.1.87.Final.jar.sha1 | 1 +
solr/licenses/netty-common-4.1.82.Final.jar.sha1 | 1 -
solr/licenses/netty-common-4.1.87.Final.jar.sha1 | 1 +
solr/licenses/netty-handler-4.1.82.Final.jar.sha1 | 1 -
solr/licenses/netty-handler-4.1.87.Final.jar.sha1 | 1 +
.../netty-handler-proxy-4.1.82.Final.jar.sha1 | 1 -
.../netty-handler-proxy-4.1.87.Final.jar.sha1 | 1 +
solr/licenses/netty-resolver-4.1.82.Final.jar.sha1 | 1 -
solr/licenses/netty-resolver-4.1.87.Final.jar.sha1 | 1 +
.../licenses/netty-transport-4.1.82.Final.jar.sha1 | 1 -
.../licenses/netty-transport-4.1.87.Final.jar.sha1 | 1 +
...y-transport-classes-epoll-4.1.82.Final.jar.sha1 | 1 -
...y-transport-classes-epoll-4.1.87.Final.jar.sha1 | 1 +
...ty-transport-native-epoll-4.1.82.Final.jar.sha1 | 1 -
...ty-transport-native-epoll-4.1.87.Final.jar.sha1 | 1 +
...nsport-native-unix-common-4.1.82.Final.jar.sha1 | 1 -
...nsport-native-unix-common-4.1.87.Final.jar.sha1 | 1 +
...-LICENSE-ASL.txt => opencensus-LICENSE-ASL.txt} | 0
...-http-util-NOTICE.txt => opencensus-NOTICE.txt} | 0
solr/licenses/opencensus-proto-0.2.0.jar.sha1 | 1 +
solr/licenses/perfmark-api-0.25.0.jar.sha1 | 1 -
solr/licenses/perfmark-api-0.26.0.jar.sha1 | 1 +
...o-google-cloud-storage-v2-2.16.0-alpha.jar.sha1 | 1 +
... proto-google-cloud-storage-v2-LICENSE-ASL.txt} | 1 -
...xt => proto-google-cloud-storage-v2-NOTICE.txt} | 0
.../proto-google-common-protos-2.11.0.jar.sha1 | 1 +
.../proto-google-common-protos-2.9.2.jar.sha1 | 1 -
solr/licenses/proto-google-iam-v1-1.5.2.jar.sha1 | 1 -
solr/licenses/proto-google-iam-v1-1.6.22.jar.sha1 | 1 +
solr/licenses/protobuf-java-3.21.10.jar.sha1 | 1 +
solr/licenses/protobuf-java-3.21.12.jar.sha1 | 1 -
solr/licenses/protobuf-java-util-3.21.10.jar.sha1 | 1 +
solr/licenses/protobuf-java-util-3.21.12.jar.sha1 | 1 -
solr/licenses/re2j-1.2.jar.sha1 | 1 -
solr/licenses/re2j-1.6.jar.sha1 | 1 +
solr/licenses/threetenbp-1.6.0.jar.sha1 | 1 -
solr/licenses/threetenbp-1.6.4.jar.sha1 | 1 +
.../solr/gcs/ConcurrentDelegatingStorage.java | 1 +
.../apache/solr/hdfs/cloud/HdfsRecoveryZkTest.java | 2 -
.../apache/solr/security/jwt/JWTAuthPlugin.java | 72 ++--
.../solr/security/jwt/JWTAuthPluginTest.java | 35 ++
.../solr/opentelemetry/ClosableTracerShim.java | 2 +-
.../solr/opentelemetry/OtelTracerConfigurator.java | 16 +-
.../opentelemetry/OtelTracerConfiguratorTest.java | 7 +
solr/solr-ref-guide/antora.template.yml | 1 +
.../configuration-guide/pages/config-sets.adoc | 19 +
.../configuration-guide/pages/configsets-api.adoc | 2 +
.../pages/replica-placement-plugins.adoc | 2 +-
.../modules/deployment-guide/pages/docker-faq.adoc | 2 +-
.../pages/jwt-authentication-plugin.adoc | 4 +-
.../how-to-contribute/how-to-contribute-nav.adoc | 18 +
.../how-to-contribute/pages/how-to-contribute.adoc | 25 ++
.../modules/query-guide/pages/json-query-dsl.adoc | 6 +-
.../pages/major-changes-in-solr-9.adoc | 3 +
.../solr/common/cloud/ZkMaintenanceUtils.java | 44 ++-
.../solr/common/cloud/CompositeIdRouter.java | 68 +++-
.../org/apache/solr/common/cloud/DocRouter.java | 8 +-
.../java/org/apache/solr/common/cloud/Replica.java | 5 -
solr/webapp/web/js/angular/app.js | 1 +
solr/webapp/web/js/angular/controllers/index.js | 7 +
solr/webapp/web/js/angular/controllers/security.js | 10 +-
solr/webapp/web/partials/index.html | 10 +-
versions.lock | 117 +++---
versions.props | 9 +-
201 files changed, 1723 insertions(+), 563 deletions(-)