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:56 UTC
[solr] branch jira/SOLR-6312 updated (029260f9888 -> 4e122456731)
This is an automated email from the ASF dual-hosted git repository.
hossman pushed a change to branch jira/SOLR-6312
in repository https://gitbox.apache.org/repos/asf/solr.git
from 029260f9888 Merge branch 'main' into jira/SOLR-6312
add 0cc18eb4cae SOLR-16611: fix collapse hint=top_fc bug (#1274)
add a2f3f7f33ef A transformer that appends the core name (#1276)
add c40ee9182b6 A testcase for Solr coordinator role (#1277)
add a662e349108 SOLR-16588: set default knn algorithm (#1255)
add 3247803ea6e Add a trivial validator for the new CoreAugmenter transformer (#1281)
add 5d724b80f1e SOLR-15787: Fix FileSystemConfigSetService test failure on Windows (#1239)
add d2c4788065b DocRouter: strengthen abstraction (#1215)
add 28d6b016331 SOLR-16480: Add overridable allow-list for ConfigSet file types
add bb94e78dc66 SOLR-16480: Fix major changes section
add 248dc3c3542 SOLR-16613: CryptoKeys should handle RSA padding for OpenJ9 (#1279)
add a187c9e86cc SOLR-16457: Use pwd -P (#1282)
add 1a9a8dc336e SOLR-13243: Correct initial capacity of ops (#1232)
add 773f1f473ff Null check added in package loader. It was just throwing an NPE
add d4845d82af9 SOLR-16617: DocSetBuilder should use DocSetUtil#smallSetSize (#1285)
add c10f47a3da2 usage of package loaded class in the wrong tests
add 5d65a80287b tolerance can fail as it is random
add ddecfe07204 tidy
add ee117dc8e65 test files in wrong dir
add bb1c6371e85 SOLR-16616: JWTAuthPlugin: Read trusted X509 certificates from multi files (#1284)
add 72a9acac721 Replace I'll with Let's, since its more proffesional to not say I in a documentation (#1110)
add 73a56cf5860 SOLR-16347: Skip JerseyApp creation when v2 disabled (#1210)
add f37d08719d6 SOLR-14540: add an example clarifying the use case. (#499)
add ac32afdd825 update releaseWizard.py to support offline gpg key (#1288)
add 08d9da0f78a SOLR-16544: Adding documentation for how to contribute to Solr (#1177)
add 939b0639b1a SOLR-16544 Linking to CONTRIBUTING.md from README.md, linking to Wiki from CONTRIBUTING.md
add 1d65ab6633b releaseWizard: allow explicitly setting MANIFEST.MF userid (e.g., to apache id) (#1290)
add 8b24b6b35e5 buildAndPushRelease should optionally pause before assembleRelease (#1291)
add 13857ba4dd7 SOLR-16593 : Redundant fields are present in the replica object of state.json (#1293)
add 935024f753d restore nightly test now that bug is fixed (#1265)
add 9c5bceed15f SOLR-16624: Remove Gradle Groovy version override (#1298)
add b11b054807d SOLR-16626: Upgrade to Netty 4.1.87.Final (#1300)
add eb7c423b389 SOLR-16625: Upgrade OWASP Dependency Check to 8.0.1 (#1299)
add f8812ae6599 Correcting default minimalFreeDiskGB (#1292)
add 0e33bfe3169 SOLR-16532 Further improvements to opentelemetry module (#1275)
add 2296d7ebe2d SOLR-14336 Warn users running old version of Solr (#1297)
add ee8c18188eb SOLR-15772 More visible security warnings in Admin UI (#1296)
add 6ba00a484bc SOLR-16621: Admin UI fails to grant user permissions that have wildcard role (#1294)
add 1fafbb55a53 SOLR-16627: Upgrade google-cloud-bom to 0.184.0, re2j to 1.6, and grpc to 1.51.0 (#1301)
new fe8a8dddfd2 Merge branch 'main' into jira/SOLR-6312
new 4e122456731 jdoc typo
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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 +-
.../configsets/{conf2 => conf3}/conf/schema.xml | 0
.../{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} | 0
...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} | 0
...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 -
.../impl/SendUpdatesToLeadersOverrideTest.java | 2 +-
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 +-
202 files changed, 1681 insertions(+), 562 deletions(-)
create mode 100644 CONTRIBUTING.md
rename help/IDEs.txt => dev-docs/IDEs.adoc (79%)
create mode 100644 dev-docs/how-to-contribute.adoc
create mode 100644 dev-docs/jvms.adoc
create mode 100644 dev-docs/running-in-docker.adoc
create mode 100644 dev-docs/solr-source-code.adoc
delete mode 100644 help/jvms.txt
create mode 100644 solr/core/src/java/org/apache/solr/response/transform/CoreAugmenterFactory.java
copy solr/core/src/test-files/solr/configsets/{conf2 => conf3}/conf/schema.xml (100%)
copy solr/core/src/test-files/solr/configsets/{conf2 => conf3}/conf/solrconfig.xml (100%)
create mode 100644 solr/core/src/test/org/apache/solr/handler/api/V2ApiUtilsTest.java
delete mode 100644 solr/licenses/api-common-2.2.1.jar.sha1
create mode 100644 solr/licenses/api-common-2.2.2.jar.sha1
create mode 100644 solr/licenses/auto-value-annotations-1.10.1.jar.sha1
delete mode 100644 solr/licenses/auto-value-annotations-1.9.jar.sha1
delete mode 100644 solr/licenses/checker-qual-3.27.0.jar.sha1
create mode 100644 solr/licenses/checker-qual-3.28.0.jar.sha1
create mode 100644 solr/licenses/conscrypt-openjdk-uber-2.5.2.jar.sha1
rename solr/licenses/{opencensus-api-LICENSE-ASL.txt => conscrypt-openjdk-uber-LICENSE-ASL.txt} (100%)
create mode 100644 solr/licenses/conscrypt-openjdk-uber-NOTICE.txt
copy solr/licenses/{accessors-smart-LICENSE-ASL.txt => gapic-google-cloud-storage-LICENSE-ASL.txt} (100%)
rename solr/licenses/{opencensus-api-NOTICE.txt => gapic-google-cloud-storage-NOTICE.txt} (100%)
create mode 100644 solr/licenses/gapic-google-cloud-storage-v2-2.16.0-alpha.jar.sha1
delete mode 100644 solr/licenses/gax-2.18.7.jar.sha1
create mode 100644 solr/licenses/gax-2.20.1.jar.sha1
create mode 100644 solr/licenses/gax-grpc-2.20.1.jar.sha1
delete mode 100644 solr/licenses/gax-httpjson-0.103.7.jar.sha1
create mode 100644 solr/licenses/gax-httpjson-0.105.1.jar.sha1
delete mode 100644 solr/licenses/google-api-client-2.0.0.jar.sha1
create mode 100644 solr/licenses/google-api-client-2.1.1.jar.sha1
create mode 100644 solr/licenses/google-auth-library-credentials-1.13.0.jar.sha1
delete mode 100644 solr/licenses/google-auth-library-credentials-1.8.1.jar.sha1
create mode 100644 solr/licenses/google-auth-library-oauth2-http-1.13.0.jar.sha1
delete mode 100644 solr/licenses/google-auth-library-oauth2-http-1.8.1.jar.sha1
delete mode 100644 solr/licenses/google-cloud-core-2.8.6.jar.sha1
create mode 100644 solr/licenses/google-cloud-core-2.9.0.jar.sha1
create mode 100644 solr/licenses/google-cloud-core-grpc-2.9.0.jar.sha1
delete mode 100644 solr/licenses/google-cloud-core-http-2.8.6.jar.sha1
create mode 100644 solr/licenses/google-cloud-core-http-2.9.0.jar.sha1
delete mode 100644 solr/licenses/google-cloud-nio-0.124.14.jar.sha1
create mode 100644 solr/licenses/google-cloud-nio-0.126.0.jar.sha1
delete mode 100644 solr/licenses/google-cloud-storage-2.11.3.jar.sha1
create mode 100644 solr/licenses/google-cloud-storage-2.16.0.jar.sha1
delete mode 100644 solr/licenses/google-http-client-1.42.2.jar.sha1
create mode 100644 solr/licenses/google-http-client-1.42.3.jar.sha1
delete mode 100644 solr/licenses/google-http-client-apache-v2-1.42.2.jar.sha1
create mode 100644 solr/licenses/google-http-client-apache-v2-1.42.3.jar.sha1
delete mode 100644 solr/licenses/google-http-client-appengine-1.42.2.jar.sha1
create mode 100644 solr/licenses/google-http-client-appengine-1.42.3.jar.sha1
delete mode 100644 solr/licenses/google-http-client-gson-1.42.2.jar.sha1
create mode 100644 solr/licenses/google-http-client-gson-1.42.3.jar.sha1
delete mode 100644 solr/licenses/google-http-client-jackson2-1.42.2.jar.sha1
create mode 100644 solr/licenses/google-http-client-jackson2-1.42.3.jar.sha1
create mode 100644 solr/licenses/grpc-alts-1.51.0.jar.sha1
delete mode 100644 solr/licenses/grpc-api-1.50.2.jar.sha1
create mode 100644 solr/licenses/grpc-api-1.51.0.jar.sha1
create mode 100644 solr/licenses/grpc-auth-1.51.0.jar.sha1
delete mode 100644 solr/licenses/grpc-context-1.50.2.jar.sha1
create mode 100644 solr/licenses/grpc-context-1.51.0.jar.sha1
delete mode 100644 solr/licenses/grpc-core-1.50.2.jar.sha1
create mode 100644 solr/licenses/grpc-core-1.51.0.jar.sha1
create mode 100644 solr/licenses/grpc-google-cloud-storage-v2-2.16.0-alpha.jar.sha1
create mode 100644 solr/licenses/grpc-google-iam-v1-1.6.22.jar.sha1
create mode 100644 solr/licenses/grpc-googleapis-1.51.0.jar.sha1
create mode 100644 solr/licenses/grpc-grpclb-1.51.0.jar.sha1
delete mode 100644 solr/licenses/grpc-netty-1.50.2.jar.sha1
create mode 100644 solr/licenses/grpc-netty-1.51.0.jar.sha1
create mode 100644 solr/licenses/grpc-netty-shaded-1.51.0.jar.sha1
delete mode 100644 solr/licenses/grpc-protobuf-1.50.2.jar.sha1
create mode 100644 solr/licenses/grpc-protobuf-1.51.0.jar.sha1
delete mode 100644 solr/licenses/grpc-protobuf-lite-1.50.2.jar.sha1
create mode 100644 solr/licenses/grpc-protobuf-lite-1.51.0.jar.sha1
create mode 100644 solr/licenses/grpc-services-1.51.0.jar.sha1
delete mode 100644 solr/licenses/grpc-stub-1.50.2.jar.sha1
create mode 100644 solr/licenses/grpc-stub-1.51.0.jar.sha1
create mode 100644 solr/licenses/grpc-xds-1.51.0.jar.sha1
create mode 100644 solr/licenses/gson-2.10.jar.sha1
delete mode 100644 solr/licenses/gson-2.9.1.jar.sha1
delete mode 100644 solr/licenses/netty-buffer-4.1.82.Final.jar.sha1
create mode 100644 solr/licenses/netty-buffer-4.1.87.Final.jar.sha1
delete mode 100644 solr/licenses/netty-codec-4.1.82.Final.jar.sha1
create mode 100644 solr/licenses/netty-codec-4.1.87.Final.jar.sha1
delete mode 100644 solr/licenses/netty-codec-http-4.1.82.Final.jar.sha1
create mode 100644 solr/licenses/netty-codec-http-4.1.87.Final.jar.sha1
delete mode 100644 solr/licenses/netty-codec-http2-4.1.82.Final.jar.sha1
create mode 100644 solr/licenses/netty-codec-http2-4.1.87.Final.jar.sha1
delete mode 100644 solr/licenses/netty-codec-socks-4.1.82.Final.jar.sha1
create mode 100644 solr/licenses/netty-codec-socks-4.1.87.Final.jar.sha1
delete mode 100644 solr/licenses/netty-common-4.1.82.Final.jar.sha1
create mode 100644 solr/licenses/netty-common-4.1.87.Final.jar.sha1
delete mode 100644 solr/licenses/netty-handler-4.1.82.Final.jar.sha1
create mode 100644 solr/licenses/netty-handler-4.1.87.Final.jar.sha1
delete mode 100644 solr/licenses/netty-handler-proxy-4.1.82.Final.jar.sha1
create mode 100644 solr/licenses/netty-handler-proxy-4.1.87.Final.jar.sha1
delete mode 100644 solr/licenses/netty-resolver-4.1.82.Final.jar.sha1
create mode 100644 solr/licenses/netty-resolver-4.1.87.Final.jar.sha1
delete mode 100644 solr/licenses/netty-transport-4.1.82.Final.jar.sha1
create mode 100644 solr/licenses/netty-transport-4.1.87.Final.jar.sha1
delete mode 100644 solr/licenses/netty-transport-classes-epoll-4.1.82.Final.jar.sha1
create mode 100644 solr/licenses/netty-transport-classes-epoll-4.1.87.Final.jar.sha1
delete mode 100644 solr/licenses/netty-transport-native-epoll-4.1.82.Final.jar.sha1
create mode 100644 solr/licenses/netty-transport-native-epoll-4.1.87.Final.jar.sha1
delete mode 100644 solr/licenses/netty-transport-native-unix-common-4.1.82.Final.jar.sha1
create mode 100644 solr/licenses/netty-transport-native-unix-common-4.1.87.Final.jar.sha1
rename solr/licenses/{opencensus-contrib-http-util-LICENSE-ASL.txt => opencensus-LICENSE-ASL.txt} (100%)
rename solr/licenses/{opencensus-contrib-http-util-NOTICE.txt => opencensus-NOTICE.txt} (100%)
create mode 100644 solr/licenses/opencensus-proto-0.2.0.jar.sha1
delete mode 100644 solr/licenses/perfmark-api-0.25.0.jar.sha1
create mode 100644 solr/licenses/perfmark-api-0.26.0.jar.sha1
create mode 100644 solr/licenses/proto-google-cloud-storage-v2-2.16.0-alpha.jar.sha1
copy solr/licenses/{accessors-smart-LICENSE-ASL.txt => proto-google-cloud-storage-v2-LICENSE-ASL.txt} (100%)
copy solr/licenses/{SparseBitSet-NOTICE.txt => proto-google-cloud-storage-v2-NOTICE.txt} (100%)
create mode 100644 solr/licenses/proto-google-common-protos-2.11.0.jar.sha1
delete mode 100644 solr/licenses/proto-google-common-protos-2.9.2.jar.sha1
delete mode 100644 solr/licenses/proto-google-iam-v1-1.5.2.jar.sha1
create mode 100644 solr/licenses/proto-google-iam-v1-1.6.22.jar.sha1
create mode 100644 solr/licenses/protobuf-java-3.21.10.jar.sha1
delete mode 100644 solr/licenses/protobuf-java-3.21.12.jar.sha1
create mode 100644 solr/licenses/protobuf-java-util-3.21.10.jar.sha1
delete mode 100644 solr/licenses/protobuf-java-util-3.21.12.jar.sha1
delete mode 100644 solr/licenses/re2j-1.2.jar.sha1
create mode 100644 solr/licenses/re2j-1.6.jar.sha1
delete mode 100644 solr/licenses/threetenbp-1.6.0.jar.sha1
create mode 100644 solr/licenses/threetenbp-1.6.4.jar.sha1
create mode 100644 solr/solr-ref-guide/modules/how-to-contribute/how-to-contribute-nav.adoc
create mode 100644 solr/solr-ref-guide/modules/how-to-contribute/pages/how-to-contribute.adoc
[solr] 01/02: Merge branch 'main' into jira/SOLR-6312
Posted by ho...@apache.org.
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(-)
[solr] 02/02: jdoc typo
Posted by ho...@apache.org.
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 4e12245673172dda5d5187b02a2ce89e96b20dd0
Author: Chris Hostetter <ho...@apache.org>
AuthorDate: Fri Jan 20 11:04:12 2023 -0700
jdoc typo
---
.../apache/solr/client/solrj/impl/SendUpdatesToLeadersOverrideTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/SendUpdatesToLeadersOverrideTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/SendUpdatesToLeadersOverrideTest.java
index 8d4abab9042..12009c6592f 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/SendUpdatesToLeadersOverrideTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/SendUpdatesToLeadersOverrideTest.java
@@ -52,7 +52,7 @@ import org.slf4j.LoggerFactory;
* IsUpdateRequest#isSendToLeaders}.
*
* <p>This class uses {@link TrackingUpdateProcessorFactory} instances (configured both before, and
- * after the <code>distrib</code> processor) to inspect which replicas recieve various {@link
+ * after the <code>distrib</code> processor) to inspect which replicas receive various {@link
* UpdateRequest}s from variously configured {@link CloudSolrClient}s. In some requests, <code>
* shards.preference=replica.type:PULL</code> is specified to confirm that typical routing
* prefrences are respected (when the effective value of <code>isSendToLeaders</code> is <code>false