You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ab...@apache.org on 2021/06/02 10:43:14 UTC
[solr] 01/02: Merge remote-tracking branch 'origin/main' into
jira/solr-15449
This is an automated email from the ASF dual-hosted git repository.
abenedetti pushed a commit to branch jira/solr-15449
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 2c0d864340bbc73241e616072fa61ff5357a9d82
Merge: 8679ce2 3f8456f
Author: Alessandro Benedetti <a....@sease.io>
AuthorDate: Wed Jun 2 11:30:45 2021 +0100
Merge remote-tracking branch 'origin/main' into jira/solr-15449
.github/PULL_REQUEST_TEMPLATE.md | 2 +
README.md | 31 +
gradle/defaults.gradle | 6 +-
gradle/help.gradle | 1 +
help/dependencies.txt | 24 +
solr/CHANGES.txt | 45 +-
.../apache/solr/ltr/feature/FieldValueFeature.java | 189 +++-
.../solr/ltr/model/MultipleAdditiveTreesModel.java | 152 ++--
.../test-files/solr/collection1/conf/schema.xml | 30 +
.../org/apache/solr/ltr/TestLTROnSolrCloud.java | 155 +++-
.../apache/solr/ltr/TestLTRReRankingPipeline.java | 345 +++----
.../solr/ltr/feature/TestFieldValueFeature.java | 350 ++++++--
.../org/apache/solr/ltr/model/TestLinearModel.java | 8 +-
.../conf/grafana-solr-dashboard.json | 2 -
solr/core/build.gradle | 2 -
.../java/org/apache/solr/cloud/ConfigSetCmds.java | 4 -
.../org/apache/solr/cloud/ReplicateFromLeader.java | 18 +-
.../org/apache/solr/cloud/ZkConfigSetService.java | 6 +-
.../cloud/api/collections/DeleteCollectionCmd.java | 14 -
.../cloud/api/collections/DeleteReplicaCmd.java | 1 -
.../api/collections/ReindexCollectionCmd.java | 16 +-
.../java/org/apache/solr/core/CoreContainer.java | 71 --
.../solr/core/FileSystemConfigSetService.java | 4 +-
.../java/org/apache/solr/core/MetricsConfig.java | 19 +-
.../java/org/apache/solr/core/SolrXmlConfig.java | 4 -
.../solr/handler/admin/CollectionsHandler.java | 2 -
.../solr/handler/admin/CoreAdminOperation.java | 23 -
.../solr/handler/admin/MetricsHistoryHandler.java | 992 ---------------------
.../reporters/solr/SolrClusterReporter.java | 295 ------
.../metrics/reporters/solr/SolrShardReporter.java | 189 ----
.../apache/solr/metrics/rrd/SolrRrdBackend.java | 273 ------
.../solr/metrics/rrd/SolrRrdBackendFactory.java | 468 ----------
.../org/apache/solr/metrics/rrd/package-info.java | 22 -
.../solr/security/PermissionNameProvider.java | 1 -
.../apache/solr/servlet/SolrDispatchFilter.java | 3 +-
.../apache/solr/servlet/SolrRequestParsers.java | 33 +-
.../src/java/org/apache/solr/util/CryptoKeys.java | 142 ---
.../core/src/test-files/solr/solr-solrreporter.xml | 69 --
.../solr/cloud/MetricsHistoryIntegrationTest.java | 190 ----
.../MetricsHistoryWithAuthIntegrationTest.java | 93 --
.../OverseerCollectionConfigSetProcessorTest.java | 3 +-
.../org/apache/solr/cloud/TestConfigSetsAPI.java | 13 +-
.../org/apache/solr/cloud/TestPullReplica.java | 47 +-
.../apache/solr/cloud/TestPullReplicaWithAuth.java | 3 +-
.../apache/solr/handler/V2ApiIntegrationTest.java | 16 +-
.../handler/admin/MetricsHistoryHandlerTest.java | 116 ---
.../reporters/solr/SolrCloudReportersTest.java | 191 ----
.../reporters/solr/SolrShardReporterTest.java | 130 ---
.../metrics/rrd/SolrRrdBackendFactoryTest.java | 256 ------
.../apache/solr/security/JWTAuthPluginTest.java | 2 +-
solr/docker/build.gradle | 382 ++++++--
solr/docker/gradle-help.txt | 27 +
.../Dockerfile.body.template} | 43 +-
.../templates/Dockerfile.local.header.template | 29 +
.../templates/Dockerfile.official.header.template | 79 ++
solr/licenses/commons-lang-2.6.jar.sha1 | 1 -
solr/licenses/commons-lang-LICENSE-ASL.txt | 202 -----
solr/licenses/commons-lang-NOTICE.txt | 5 -
.../http2-client-9.4.34.v20201102.jar.sha1 | 1 -
.../http2-client-9.4.41.v20210516.jar.sha1 | 1 +
.../http2-common-9.4.34.v20201102.jar.sha1 | 1 -
.../http2-common-9.4.41.v20210516.jar.sha1 | 1 +
.../licenses/http2-hpack-9.4.34.v20201102.jar.sha1 | 1 -
.../licenses/http2-hpack-9.4.41.v20210516.jar.sha1 | 1 +
...http-client-transport-9.4.34.v20201102.jar.sha1 | 1 -
...http-client-transport-9.4.41.v20210516.jar.sha1 | 1 +
.../http2-server-9.4.34.v20201102.jar.sha1 | 1 -
.../http2-server-9.4.41.v20210516.jar.sha1 | 1 +
.../jetty-alpn-client-9.4.34.v20201102.jar.sha1 | 1 -
.../jetty-alpn-client-9.4.41.v20210516.jar.sha1 | 1 +
...etty-alpn-java-client-9.4.34.v20201102.jar.sha1 | 1 -
...etty-alpn-java-client-9.4.41.v20210516.jar.sha1 | 1 +
...etty-alpn-java-server-9.4.34.v20201102.jar.sha1 | 1 -
...etty-alpn-java-server-9.4.41.v20210516.jar.sha1 | 1 +
.../jetty-alpn-server-9.4.34.v20201102.jar.sha1 | 1 -
.../jetty-alpn-server-9.4.41.v20210516.jar.sha1 | 1 +
.../jetty-client-9.4.34.v20201102.jar.sha1 | 1 -
.../jetty-client-9.4.41.v20210516.jar.sha1 | 1 +
.../jetty-continuation-9.4.34.v20201102.jar.sha1 | 1 -
.../jetty-continuation-9.4.41.v20210516.jar.sha1 | 1 +
.../jetty-deploy-9.4.34.v20201102.jar.sha1 | 1 -
.../jetty-deploy-9.4.41.v20210516.jar.sha1 | 1 +
solr/licenses/jetty-http-9.4.34.v20201102.jar.sha1 | 1 -
solr/licenses/jetty-http-9.4.41.v20210516.jar.sha1 | 1 +
solr/licenses/jetty-io-9.4.34.v20201102.jar.sha1 | 1 -
solr/licenses/jetty-io-9.4.41.v20210516.jar.sha1 | 1 +
solr/licenses/jetty-jmx-9.4.34.v20201102.jar.sha1 | 1 -
solr/licenses/jetty-jmx-9.4.41.v20210516.jar.sha1 | 1 +
.../jetty-rewrite-9.4.34.v20201102.jar.sha1 | 1 -
.../jetty-rewrite-9.4.41.v20210516.jar.sha1 | 1 +
.../jetty-security-9.4.34.v20201102.jar.sha1 | 1 -
.../jetty-security-9.4.41.v20210516.jar.sha1 | 1 +
.../jetty-server-9.4.34.v20201102.jar.sha1 | 1 -
.../jetty-server-9.4.41.v20210516.jar.sha1 | 1 +
.../jetty-servlet-9.4.34.v20201102.jar.sha1 | 1 -
.../jetty-servlet-9.4.41.v20210516.jar.sha1 | 1 +
.../jetty-servlets-9.4.34.v20201102.jar.sha1 | 1 -
.../jetty-servlets-9.4.41.v20210516.jar.sha1 | 1 +
.../jetty-start-9.4.34.v20201102-shaded.jar.sha1 | 1 -
.../jetty-start-9.4.41.v20210516-shaded.jar.sha1 | 1 +
solr/licenses/jetty-util-9.4.34.v20201102.jar.sha1 | 1 -
solr/licenses/jetty-util-9.4.41.v20210516.jar.sha1 | 1 +
.../jetty-util-ajax-9.4.41.v20210516.jar.sha1 | 1 +
.../jetty-webapp-9.4.34.v20201102.jar.sha1 | 1 -
.../jetty-webapp-9.4.41.v20210516.jar.sha1 | 1 +
solr/licenses/jetty-xml-9.4.34.v20201102.jar.sha1 | 1 -
solr/licenses/jetty-xml-9.4.41.v20210516.jar.sha1 | 1 +
solr/licenses/jose4j-0.6.5.jar.sha1 | 1 -
solr/licenses/jose4j-0.7.7.jar.sha1 | 1 +
solr/licenses/netty-buffer-4.1.50.Final.jar.sha1 | 1 -
solr/licenses/netty-buffer-4.1.59.Final.jar.sha1 | 1 +
solr/licenses/netty-codec-4.1.50.Final.jar.sha1 | 1 -
solr/licenses/netty-codec-4.1.59.Final.jar.sha1 | 1 +
solr/licenses/netty-common-4.1.50.Final.jar.sha1 | 1 -
solr/licenses/netty-common-4.1.59.Final.jar.sha1 | 1 +
solr/licenses/netty-handler-4.1.50.Final.jar.sha1 | 1 -
solr/licenses/netty-handler-4.1.59.Final.jar.sha1 | 1 +
solr/licenses/netty-resolver-4.1.50.Final.jar.sha1 | 1 -
solr/licenses/netty-resolver-4.1.59.Final.jar.sha1 | 1 +
.../licenses/netty-transport-4.1.50.Final.jar.sha1 | 1 -
.../licenses/netty-transport-4.1.59.Final.jar.sha1 | 1 +
...ty-transport-native-epoll-4.1.50.Final.jar.sha1 | 1 -
...ty-transport-native-epoll-4.1.59.Final.jar.sha1 | 1 +
...nsport-native-unix-common-4.1.50.Final.jar.sha1 | 1 -
...nsport-native-unix-common-4.1.59.Final.jar.sha1 | 1 +
solr/licenses/rrd4j-3.5.jar.sha1 | 1 -
solr/licenses/rrd4j-LICENSE-ASL.txt | 202 -----
solr/licenses/rrd4j-NOTICE.txt | 2 -
solr/licenses/zookeeper-3.6.2.jar.sha1 | 1 -
solr/licenses/zookeeper-3.7.0.jar.sha1 | 1 +
solr/licenses/zookeeper-jute-3.6.2.jar.sha1 | 1 -
solr/licenses/zookeeper-jute-3.7.0.jar.sha1 | 1 +
solr/packaging/build.gradle | 6 +
.../combining-distribution-and-replication.adoc | 2 +-
.../distributed-replication.png | Bin 0 -> 38896 bytes
.../worddav4101c16174820e932b44baa22abcfcd1.png | Bin 54328 -> 0 bytes
.../leader-follower-replication.png | Bin 0 -> 18224 bytes
.../worddav2b7e14725d898b4104cdd9c502fc77cd.png | Bin 26388 -> 0 bytes
.../images/suggestions-screen/no-violations.png | Bin 73333 -> 0 bytes
.../suggestions-screen/violations-with-action.png | Bin 152486 -> 0 bytes
.../src/images/suggestions-screen/violations.png | Bin 123009 -> 0 bytes
solr/solr-ref-guide/src/index-replication.adoc | 2 +-
solr/solr-ref-guide/src/language-analysis.adoc | 46 +-
.../src/major-changes-in-solr-8.adoc | 2 +-
.../src/major-changes-in-solr-9.adoc | 2 +
.../src/making-and-restoring-backups.adoc | 2 +-
solr/solr-ref-guide/src/metrics-history.adoc | 488 ----------
solr/solr-ref-guide/src/metrics-reporting.adoc | 174 +---
solr/solr-ref-guide/src/monitoring-solr.adoc | 4 +-
.../src/rule-based-authorization-plugin.adoc | 1 -
solr/solr-ref-guide/src/solr-tutorial.adoc | 2 +-
.../solr/client/solrj/io/stream/DrillStream.java | 4 +-
.../solr/client/solrj/request/V2Request.java | 2 +-
.../java/org/apache/solr/common/SolrException.java | 3 +-
.../solr/common/cloud/ZkMaintenanceUtils.java | 15 +-
.../apache/solr/common/params/CommonParams.java | 4 +-
.../apache/solr/common/params/CoreAdminParams.java | 2 -
.../src/java/org/apache/solr/util/TestHarness.java | 4 -
solr/webapp/web/css/angular/replication.css | 4 +-
.../web/js/angular/controllers/collections.js | 8 +-
solr/webapp/web/js/angular/services.js | 5 +
versions.lock | 125 ++-
versions.props | 11 +-
163 files changed, 1756 insertions(+), 5277 deletions(-)