You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ct...@apache.org on 2021/11/23 21:20:17 UTC
[solr] branch jira/solr-15556-antora updated (c8df19f -> b2a9a87)
This is an automated email from the ASF dual-hosted git repository.
ctargett pushed a change to branch jira/solr-15556-antora
in repository https://gitbox.apache.org/repos/asf/solr.git.
from c8df19f Update location to UI bundle
add 6452154 SOLR-15648 ManagedSchema#GetZkSchemaVersionCallable can get into a loop that wants to go on for 10 minutes before it cuts off. (#352)
add 5ce9e8f SOLR-15638: AffinityPlacementFactoryTest is ridiculous long on a non nightly test runs. (#354)
add a32eaf8 SOLR-15697: Add ErrorLogMuter to test-framework, deprecating SolrException.ignorePatterns
add e686024 SOLR-13671 Allow 'var' keyword in Java sources (#366)
add d65a69d SOLR-15628: Update changes on main branch to reflect backport to 8x for 8.11
add caf22f1 SOLR-15572: Improve the default Prometheus exporter config performance.
add 1be2efd SOLR-15716: Remove deprecated SolrException.ignorePatterns and related code
add 2e12ce4 SOLR-15699: remove unused updateHandler/indexWriter/closeWaitsForMerges element (#350)
add 79e15be SOLR-15719: LongSet.add to return boolean; add LongSetTest; (#370)
add 3d9adf6 SOLR-15676: UpdateLog.RecentUpdates.getDeleteByQuery to not return duplicate versions (#329)
add be2db72 SOLR-15676: UpdateLog.RecentUpdates.getVersions to not return duplicate versions (#331)
add 8c3bf90 SOLR-15676: add solr/CHANGES.txt entry
add 7076359 SOLR-15722 (#374)
add a25c531 Add recovery check before querying in backup-restore test.
add 291068d SOLR-15608: Remove deprecated methods, classes and constructors from SolrJ (#369)
add 06be1ac SOLR-15707: Add the ability to set the AWS Profile per S3Repository (#357)
add 28139d2 SOLR-15337: Avoid XPath in solrconfig.xml parsing (#160)
add f0139e5 SOLR-12666: Add authn & authz plugins that supports multiple authentication schemes, such as Bearer and Basic (#355)
add 8075bff Bump owasp-dependencycheck to 6.4.1.1 (#381)
add ab9bec6 SOLR-15728: Remove dead, unused log rotation code from SolrCLI (#375)
add 4fdde44 gradle: Dependency tune-up of solr-core & solrj (#349)
add 6320e3f SOLR-15647: TestRebalanceLeaders#testRebalanceLeaders can be abysmally slow. (#367)
add 6e680a2 SOLR-15761: Remove JdbcStream from Lang
add 3172327 SOLR-15721: Support editing Basic auth config when using the MultiAuthPlugin (#393)
add 23b07ef SOLR-15764 (based on LUCENE-10218): Extend validateSourcePatterns task to scan for LTR/RTL unicode to catch "Trojan Source" source code attacks
add c3be04d SOLR-15757: 1st pass at some light organization structure
add c7592dc SOLR-15728 Clean up remains of "utils" tool in SolrCLI (#392)
add b3835dc SOLR-15766: MultiAuthPlugin should send non-AJAX anonymous requests to the plugin that allows anonymous requests (#394)
add e7f025a SOLR-15763 : Fix documentation in indexing with tika (#391)
add 1fffc52 SOLR-15467: Rename Parrallel SQL to just SQL throughout Solr docs (#364)
add b532f4d SOLR-15706: Fix incorrect path in backup purging
add df70f90 SOLR-10529: Solr UI Health Check enable/disable ping Button doesn't work (#398)
add 03af2de SOLR-15351: Rewrite GET /v2/c/collName using annotations (#396)
add a363acd LUCENE-9229 fixed jdk9 equals method link (#401)
add f589607 SOLR-15705: A deleteById request without _route_ param for compositeid router could be sent to all shard leaders (#288)
add 2d39598 SOLR-15762 Error on Join Query with sync cache
add 9fe0ce4 SOLR-15762 Always async cache for join query tests
add 93c36a8 fixed esri link (#400)
add 67c55b5 LUCENE-9229 fixed 3 javadoc links 1) google guave, 2&3) Two links relocated away from "aggregateknowledge" (#402)
add 2d2d4c4 SOLR-10529 Revert change to solrconfig for techproducts example as it introduced test failures
add 79f3d18 SOLR-15663: JsonFaceting benchmark should flush by doc count for better reproducible behavior. (#388)
add 5c6d12d Fix githubPRs.py to query the new solr repo (#405)
add 1c80803 SOLR-15660: Remove universal 10 second test thread leak linger. (#377)
add 401da35 SOLR-15711: Fix GCSRepository to follow createDirectory API contract (#373)
add 2e5f89a SOLR-15783: Prevent Logging MDC values from leaking between request threads, and set 'trace_id' in MDC as soon as it's available
add 7646353 SOLR-15793: ref-guide jrubyPrepare fails due to gems trying to compile native code (#412)
add aea698b SOLR-15790: SearchHandler now includes the value in the Logging MDC for the duration of the request, allowing custom logging configurations to include it.
add 9ee30f1 SOLR-15791: Remove remaining <admin> clauses from solrconfigs (#411)
add f088857 Switching a PRS collection from true -> false -> true results in INACTIVE replicas (#413)
add dbdd2d4 SOLR-15635: don't repeat close hooks if SRI cleared twice due to using MDCThreadPool (#376)
add 0f9e482 SOLR-15774: Avoid weird off-by-one errors with Angular's 'chosen' select box directive for the security and schema-designer screens in Admin UI (#404)
add 81d3478 SOLR-15536: Rewrite /c/<coll>/shards v2 APIs using annotations (#218)
add 9b1f8dd SOLR-15792: Rewrite shardname APIs using annotation framework (#415)
add 8479055 SOLR-14781: Delete unused classes (#330)
add d18e247 SOLR-15619: add Long support for @JsonProperty annotations (#285)
add c2dcba1 SOLR-15635: move to 8.11.1 in CHANGES.txt (#417)
add ccb7d4d DOAP changes for release 8.11.0
add bfee656 SOLR-15784 Remove SolrJ dep on commons-io (#407)
add 111bd91 SOLR-15785: Load custom endpoints from solr/lib (#408)
add 70a19f9 SOLR-15795: Fix REPLACENODE to not use source node (#414)
add be96b2b a very embarrasing misspelling of the name of a contributor
add c214e07 SOLR-15376: Accept "Long" values for CollectionAdminRequest.CreateTimeRoutedAlias.setMaxFutureMs to support durations greater than ~25 days. (#202)
add a8290de SOLR-13138: Remove deprecated spatial (#382)
add 1ba86a8 SOLR-15806: expand UpdateLogCloudTest coverage w.r.t. Ephemeral vs. Standard DirectoryFactory use (#421)
add 46d2ad2 SOLR-15804 Allow content-types with ;charset in ShowFileRequestHandler (#418)
add e90f50f SOLR-11623 Every request handler in Solr implement PermissionNameProvider (#372)
add 5866f80 SOLR-15774: Move changes entry to 8.11.1 section
add 3ec2fa0 SOLR-15808: The jattach tool for Docker image is now installed with apt (#423)
add cee22de SOLR-15700: Make include paths in bin/solr consistent (#358)
add 55f6fbf Revert "SOLR-11623 Every request handler in Solr implement PermissionNameProvider (#372)"
add 5f34dbb SOLR-15182: Remove orphaned apispec file
add 058f2b6 Logging: SpellCheckComponent shouldn't log at info level (#422)
add 0cb23c7 SOLR-15427: Nested docs: [child limit=...] now defaults to -1 (#144)
add bf39765 SOLR-15182: replica API conversion to annotations (#429)
add fc5fb26 Ref Guide: 8.11 upgrade notes
add 4bbc25f fixed comment (#430)
new b2a9a87 Merge branch 'main' into jira/solr-15556-antora
The 1 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:
build.gradle | 2 +-
dev-tools/doap/solr.rdf | 7 +
dev-tools/scripts/githubPRs.py | 10 +-
gradle/validation/forbidden-apis.gradle | 23 +-
gradle/validation/forbidden-apis/defaults.all.txt | 6 +
gradle/validation/validate-source-patterns.gradle | 55 +-
help/dependencies.txt | 4 +-
solr/CHANGES.txt | 83 ++-
solr/benchmark/build.gradle | 1 +
.../configs/cloud-minimal/conf/solrconfig.xml | 3 +-
.../solr/bench/MiniClusterBenchStateTest.java | 2 +
solr/bin/solr | 14 +-
solr/bin/solr.cmd | 25 -
solr/bin/solr.in.cmd | 5 -
solr/bin/solr.in.sh | 5 -
solr/contrib/analysis-extras/build.gradle | 1 +
.../apache/solr/schema/TestICUCollationField.java | 7 +-
.../schema/TestICUCollationFieldDocValues.java | 8 +-
solr/contrib/analytics/build.gradle | 2 +
.../analytics/function/reduction/MeanFunction.java | 7 -
.../analytics/function/reduction/SumFunction.java | 7 -
.../solr/analytics/util/OldAnalyticsParams.java | 34 --
.../solr/analytics/facet/PivotFacetTest.java | 2 +
.../legacy/LegacyAbstractAnalyticsTest.java | 3 +-
.../legacy/facet/LegacyFieldFacetCloudTest.java | 2 +
.../legacy/facet/LegacyRangeFacetCloudTest.java | 3 +-
.../util/OldAnalyticsRequestConverterUnitTest.java | 2 +
solr/contrib/clustering/build.gradle | 2 +
.../solr/handler/clustering/EngineParameters.java | 3 +-
solr/contrib/extraction/build.gradle | 1 +
.../solr/collection1/conf/solrconfig.xml | 11 +-
solr/contrib/gcs-repository/build.gradle | 1 +
.../org/apache/solr/gcs/GCSBackupRepository.java | 21 +-
.../apache/solr/gcs/GCSIncrementalBackupTest.java | 2 +
.../apache/solr/jaeger/TestJaegerConfigurator.java | 2 +
solr/contrib/langid/build.gradle | 2 +-
...penNLPLangDetectUpdateProcessorFactoryTest.java | 2 +
solr/contrib/ltr/build.gradle | 1 +
.../org/apache/solr/ltr/TestLTROnSolrCloud.java | 2 +
solr/contrib/prometheus-exporter/build.gradle | 8 +-
.../conf/solr-exporter-config.xml | 21 +-
.../solr/prometheus/exporter/MetricsQuery.java | 15 +-
.../solr/prometheus/scraper/SolrCloudScraper.java | 2 +-
...theus-solr-exporter-integration-test-config.xml | 17 +-
...rometheus-solr-exporter-scraper-test-config.xml | 15 +-
.../prometheus/PrometheusExporterTestBase.java | 26 +-
.../prometheus/collector/MetricSamplesTest.java | 35 +-
.../exporter/SolrExporterIntegrationTest.java | 2 +-
.../prometheus/scraper/SolrCloudScraperTest.java | 2 +
solr/contrib/s3-repository/build.gradle | 5 +
.../apache/solr/s3/S3BackupRepositoryConfig.java | 15 +-
.../java/org/apache/solr/s3/S3StorageClient.java | 64 ++-
.../org/apache/solr/s3/AbstractS3ClientTest.java | 8 +-
.../apache/solr/s3/S3IncrementalBackupTest.java | 7 +-
solr/contrib/scripting/build.gradle | 2 +
solr/core/build.gradle | 193 ++++---
.../apache/solr/api/ContainerPluginsRegistry.java | 6 +-
.../org/apache/solr/cloud/RecoveryStrategy.java | 14 +-
.../apache/solr/cloud/api/collections/Assign.java | 28 +-
.../cloud/api/collections/DeleteBackupCmd.java | 30 +-
.../solr/cloud/api/collections/ReplaceNodeCmd.java | 151 ++---
.../apache/solr/cloud/overseer/SliceMutator.java | 3 +-
.../java/org/apache/solr/core/ConfigOverlay.java | 4 +
.../org/apache/solr/core/ConfigSetService.java | 6 +
.../java/org/apache/solr/core/CoreContainer.java | 7 +-
.../org/apache/solr/core/OverlaidConfigNode.java | 109 ++++
.../src/java/org/apache/solr/core/PluginInfo.java | 24 +
.../src/java/org/apache/solr/core/SolrConfig.java | 493 ++++++++++-------
.../src/java/org/apache/solr/core/SolrCore.java | 4 +-
.../java/org/apache/solr/core/XmlConfigFile.java | 15 +-
.../solr/core/backup/ShardBackupMetadata.java | 8 +
.../org/apache/solr/filestore/PackageStoreAPI.java | 14 +-
.../org/apache/solr/handler/CollectionsAPI.java | 10 +-
.../apache/solr/handler/ContentStreamLoader.java | 49 --
.../apache/solr/handler/DumpRequestHandler.java | 1 +
.../apache/solr/handler/MoreLikeThisHandler.java | 4 +-
.../solr/handler/admin/BaseHandlerApiSupport.java | 4 +-
.../solr/handler/admin/CollectionHandlerApi.java | 77 ---
.../solr/handler/admin/CollectionsHandler.java | 17 +-
.../solr/handler/admin/CoreAdminHandlerApi.java | 4 +-
.../solr/handler/admin/ShowFileRequestHandler.java | 10 +-
...ModifyCollectionAPI.java => AddReplicaAPI.java} | 57 +-
.../handler/admin/api/CollectionStatusAPI.java | 61 +++
...odifyCollectionAPI.java => CreateShardAPI.java} | 59 +-
.../solr/handler/admin/api/DeleteReplicaAPI.java | 61 +++
.../solr/handler/admin/api/DeleteShardAPI.java | 63 +++
.../solr/handler/admin/api/ForceLeaderAPI.java | 68 +++
.../handler/admin/api/ModifyCollectionAPI.java | 10 +-
...ModifyCollectionAPI.java => SplitShardAPI.java} | 57 +-
.../solr/handler/admin/api/SyncShardAPI.java | 68 +++
.../org/apache/solr/handler/api/ApiRegistrar.java | 23 +-
.../org/apache/solr/handler/api/V2ApiUtils.java} | 19 +-
.../handler/component/RealTimeGetComponent.java | 5 +-
.../solr/handler/component/SearchHandler.java | 16 +-
.../solr/handler/component/ShardResponse.java | 3 +-
.../handler/component/SpellCheckComponent.java | 6 +-
.../java/org/apache/solr/legacy/BBoxStrategy.java | 3 +-
.../org/apache/solr/legacy/BBoxValueSource.java | 1 +
.../apache/solr/legacy/DistanceValueSource.java | 120 ----
.../apache/solr/legacy/PointVectorStrategy.java | 289 ----------
.../java/org/apache/solr/logging/MDCSnapshot.java | 58 ++
.../org/apache/solr/request/SolrRequestInfo.java | 70 ++-
.../apache/solr/response/RawResponseWriter.java | 5 +-
.../transform/ChildDocTransformerFactory.java | 22 +-
.../org/apache/solr/schema/AbstractEnumField.java | 2 +-
.../apache/solr/schema/FieldTypePluginLoader.java | 6 +-
.../java/org/apache/solr/schema/GeoHashField.java | 103 ----
.../java/org/apache/solr/schema/IndexSchema.java | 25 +-
.../org/apache/solr/schema/IndexSchemaFactory.java | 14 +-
.../java/org/apache/solr/schema/LatLonType.java | 606 ---------------------
.../org/apache/solr/schema/ManagedIndexSchema.java | 14 +-
.../src/java/org/apache/solr/schema/PointType.java | 4 +-
.../solr/schema/SpatialPointVectorFieldType.java | 106 ----
.../org/apache/solr/schema/SpatialQueryable.java | 2 +-
.../SpatialTermQueryPrefixTreeFieldType.java | 33 --
.../java/org/apache/solr/search/CacheConfig.java | 40 +-
.../java/org/apache/solr/search/CaffeineCache.java | 5 +
.../org/apache/solr/search/JoinQParserPlugin.java | 2 +-
.../src/java/org/apache/solr/search/JoinQuery.java | 5 +
.../src/java/org/apache/solr/search/SolrCache.java | 11 +
.../solr/search/SpatialFilterQParserPlugin.java | 8 +-
.../apache/solr/search/facet/FacetFieldMerger.java | 42 --
.../distance/GeoDistValueSourceParser.java | 2 +-
.../search/function/distance/GeohashFunction.java | 1 +
.../distance/GeohashHaversineFunction.java | 3 +-
.../org/apache/solr/security/BasicAuthPlugin.java | 2 +-
.../org/apache/solr/security/MultiAuthPlugin.java | 280 ++++++++++
.../MultiAuthRuleBasedAuthorizationPlugin.java | 150 +++++
.../java/org/apache/solr/servlet/HttpSolrCall.java | 7 +-
.../apache/solr/servlet/SolrDispatchFilter.java | 11 +-
.../apache/solr/update/DirectUpdateHandler2.java | 4 -
.../org/apache/solr/update/SolrCmdDistributor.java | 4 -
.../org/apache/solr/update/SolrIndexConfig.java | 82 ++-
.../src/java/org/apache/solr/update/UpdateLog.java | 22 +-
.../java/org/apache/solr/update/VersionInfo.java | 4 +-
.../processor/DistributedZkUpdateProcessor.java | 103 ++--
.../HTMLStripFieldUpdateProcessorFactory.java | 2 +-
.../java/org/apache/solr/util/DOMConfigNode.java | 12 +-
.../java/org/apache/solr/util/DataConfigNode.java | 71 +--
.../src/java/org/apache/solr/util/LongSet.java | 15 +-
.../java/org/apache/solr/util/RedactionUtils.java | 55 --
.../src/java/org/apache/solr/util/SolrCLI.java | 326 ++---------
.../src/java/org/apache/solr/util/hll/HLL.java | 6 +-
.../resources/EditableSolrConfigAttributes.json | 7 +-
.../solr/collection1/conf/schema-hash.xml | 28 -
.../solr/collection1/conf/schema-minhash.xml | 28 -
.../solr/collection1/conf/schema-rest.xml | 15 -
.../solr/collection1/conf/schema-spatial.xml | 23 +-
.../solr/collection1/conf/schema-sql.xml | 28 -
.../test-files/solr/collection1/conf/schema.xml | 21 +-
.../test-files/solr/collection1/conf/schema11.xml | 17 -
.../test-files/solr/collection1/conf/schema12.xml | 22 +-
.../test-files/solr/collection1/conf/schema15.xml | 18 +-
.../solr/collection1/conf/schema_latest.xml | 35 +-
.../solr/collection1/conf/schemasurround.xml | 17 -
.../conf/solrconfig-analytics-query.xml | 6 -
.../conf/solrconfig-collapseqparser.xml | 6 -
.../conf/solrconfig-components-name.xml | 7 +-
.../conf/solrconfig-doctransformers.xml | 6 -
.../solr/collection1/conf/solrconfig-elevate.xml | 11 +-
.../solr/collection1/conf/solrconfig-hash.xml | 6 -
.../solr/collection1/conf/solrconfig-minhash.xml | 30 +-
.../collection1/conf/solrconfig-plugcollector.xml | 5 -
.../solr/collection1/conf/solrconfig-sql.xml | 6 -
.../solr/collection1/conf/solrconfig-test-misc.xml | 8 +-
.../solr/collection1/conf/solrconfig.xml | 34 +-
.../solr/configsets/cloud-dynamic/conf/schema.xml | 14 +-
.../solr/configsets/doc-expiry/conf/schema.xml | 18 -
.../test-files/solr/configsets/sql/conf/schema.xml | 15 -
.../src/test-files/solr/crazy-path-to-config.xml | 5 -
.../solr/security/multi_auth_plugin_security.json | 71 +++
.../src/test/org/apache/hadoop/fs/HardLink.java | 14 -
.../test/org/apache/solr/ConvertedLegacyTest.java | 41 +-
.../test/org/apache/solr/TestCrossCoreJoin.java | 30 +-
.../test/org/apache/solr/TestGroupingSearch.java | 14 +-
solr/core/src/test/org/apache/solr/TestJoin.java | 1 +
.../apache/solr/cloud/CollectionsAPISolrJTest.java | 2 -
.../solr/cloud/FullSolrCloudDistribCmdsTest.java | 35 +-
.../cloud/HttpPartitionWithTlogReplicasTest.java | 2 +
.../org/apache/solr/cloud/ReplaceNodeTest.java | 73 ++-
.../apache/solr/cloud/TestCloudConsistency.java | 2 +
.../solr/cloud/TestLeaderElectionZkExpiry.java | 8 +-
.../apache/solr/cloud/TestRebalanceLeaders.java | 33 +-
.../org/apache/solr/cloud/TestStressLiveNodes.java | 2 +
.../ConcurrentDeleteAndCreateCollectionTest.java | 21 +-
.../HdfsCloudIncrementalBackupTest.java | 8 +-
.../solr/cloud/api/collections/PurgeGraphTest.java | 266 ++++-----
.../collections/TestHdfsCloudBackupRestore.java | 2 +
.../solr/cloud/hdfs/HDFSCollectionsAPITest.java | 2 +
.../cloud/hdfs/HdfsBasicDistributedZk2Test.java | 2 +
.../cloud/hdfs/HdfsBasicDistributedZkTest.java | 2 +
.../hdfs/HdfsChaosMonkeyNothingIsSafeTest.java | 2 +
.../cloud/hdfs/HdfsChaosMonkeySafeLeaderTest.java | 2 +
.../apache/solr/cloud/hdfs/HdfsNNFailoverTest.java | 2 +
.../solr/cloud/hdfs/HdfsRecoverLeaseTest.java | 2 +
.../apache/solr/cloud/hdfs/HdfsRecoveryZkTest.java | 2 +
.../cloud/hdfs/HdfsRestartWhileUpdatingTest.java | 2 +
.../apache/solr/cloud/hdfs/HdfsSyncSliceTest.java | 2 +
.../org/apache/solr/cloud/hdfs/HdfsTestUtil.java | 2 +
.../apache/solr/cloud/hdfs/HdfsThreadLeakTest.java | 2 +
.../HdfsTlogReplayBufferedWhileIndexingTest.java | 2 +
.../cloud/hdfs/HdfsUnloadDistributedZkTest.java | 2 +
.../hdfs/HdfsWriteToMultipleCollectionsTest.java | 2 +
.../org/apache/solr/cloud/hdfs/StressHdfsTest.java | 2 +
.../cluster/events/ClusterEventProducerTest.java | 4 +-
.../plugins/AffinityPlacementFactoryTest.java | 42 +-
.../solr/core/BlobRepositoryMockingTest.java | 4 +-
.../solr/core/BlobStoreTestRequestHandler.java | 62 ---
.../apache/solr/core/HdfsDirectoryFactoryTest.java | 2 +
.../test/org/apache/solr/core/MockInfoBean.java | 65 ---
.../test/org/apache/solr/core/TestBadConfig.java | 12 -
.../org/apache/solr/core/TestCodecSupport.java | 6 +-
.../org/apache/solr/core/TestConfLoadPerf.java | 88 +++
.../src/test/org/apache/solr/core/TestConfig.java | 55 +-
.../org/apache/solr/core/TestConfigOverlay.java | 5 -
.../org/apache/solr/core/TestSimpleTextCodec.java | 2 +-
.../HdfsBackupRepositoryIntegrationTest.java | 2 +
.../org/apache/solr/handler/TestBlobHandler.java | 2 +
.../solr/handler/TestHdfsBackupRestoreCore.java | 2 +
.../org/apache/solr/handler/TestRequestId.java | 103 ++++
.../solr/handler/admin/DaemonStreamApiTest.java | 2 +
.../solr/handler/admin/MBeansHandlerTest.java | 3 +
.../handler/admin/ShowFileRequestHandlerTest.java | 7 +
.../solr/handler/admin/TestApiFramework.java | 5 +-
.../solr/handler/admin/TestCollectionAPIs.java | 30 +-
.../admin/api/V2CollectionAPIMappingTest.java | 39 +-
.../handler/admin/api/V2ShardsAPIMappingTest.java | 291 ++++++++++
.../DistributedQueryComponentCustomSortTest.java | 2 +
.../handler/component/SuggestComponentTest.java | 122 +++--
.../solr/handler/component/UpdateLogCloudTest.java | 22 +-
.../apache/solr/request/TestRemoteStreaming.java | 2 +-
.../apache/solr/request/TestSolrRequestInfo.java | 80 +++
.../solr/response/TestGeoJSONResponseWriter.java | 9 +-
.../transform/TestSubQueryTransformerDistrib.java | 7 +-
.../rest/schema/TestFieldCollectionResource.java | 24 +-
.../test/org/apache/solr/schema/RankFieldTest.java | 34 +-
.../org/apache/solr/search/QueryEqualityTest.java | 40 +-
.../org/apache/solr/search/ReturnFieldsTest.java | 22 +-
.../org/apache/solr/search/SpatialFilterTest.java | 21 +-
.../org/apache/solr/search/TestSolr4Spatial.java | 5 +-
.../apache/solr/search/TestSolrQueryParser.java | 1 +
.../apache/solr/search/TestValueSourceCache.java | 6 +-
.../function/distance/DistanceFunctionTest.java | 80 ++-
.../search/join/InvalidConfigJoinQueryTest.java | 47 ++
.../solr/search/join/TestScoreJoinQPNoScore.java | 1 +
.../solr/search/join/TestScoreJoinQPScore.java | 1 +
.../solr/security/BasicAuthStandaloneTest.java | 32 +-
.../apache/solr/security/MultiAuthPluginTest.java | 263 +++++++++
.../apache/solr/store/hdfs/HdfsDirectoryTest.java | 2 +
.../apache/solr/update/SolrIndexConfigTest.java | 12 +-
.../AbstractAtomicUpdatesMultivalueTestBase.java | 6 +-
.../TimeRoutedAliasUpdateProcessorTest.java | 43 ++
.../src/test/org/apache/solr/util/LongSetTest.java | 94 ++++
.../solr/util/TestSolrJacksonAnnotation.java | 6 +
.../test/org/apache/solr/util/UtilsToolTest.java | 206 -------
solr/docker/templates/Dockerfile.body.template | 7 +-
solr/licenses/annotations-2.16.93.jar.sha1 | 1 -
solr/licenses/annotations-2.17.63.jar.sha1 | 1 +
solr/licenses/apache-client-2.16.93.jar.sha1 | 1 -
solr/licenses/apache-client-2.17.63.jar.sha1 | 1 +
solr/licenses/arns-2.16.93.jar.sha1 | 1 -
solr/licenses/arns-2.17.63.jar.sha1 | 1 +
solr/licenses/auth-2.16.93.jar.sha1 | 1 -
solr/licenses/auth-2.17.63.jar.sha1 | 1 +
solr/licenses/aws-core-2.16.93.jar.sha1 | 1 -
solr/licenses/aws-core-2.17.63.jar.sha1 | 1 +
solr/licenses/aws-query-protocol-2.16.93.jar.sha1 | 1 -
solr/licenses/aws-query-protocol-2.17.63.jar.sha1 | 1 +
solr/licenses/aws-xml-protocol-2.16.93.jar.sha1 | 1 -
solr/licenses/aws-xml-protocol-2.17.63.jar.sha1 | 1 +
solr/licenses/commons-compiler-3.0.11.jar.sha1 | 1 +
solr/licenses/commons-compiler-3.0.9.jar.sha1 | 1 -
solr/licenses/eigenbase-properties-1.1.5.jar.sha1 | 1 -
solr/licenses/eigenbase-properties-LICENSE-ASL.txt | 202 -------
solr/licenses/eigenbase-properties-NOTICE.txt | 20 -
solr/licenses/http-client-spi-2.16.93.jar.sha1 | 1 -
solr/licenses/http-client-spi-2.17.63.jar.sha1 | 1 +
solr/licenses/janino-3.0.11.jar.sha1 | 1 +
solr/licenses/janino-3.0.9.jar.sha1 | 1 -
solr/licenses/json-utils-2.17.63.jar.sha1 | 1 +
...-LICENSE-ASL.txt => json-utils-LICENSE-ASL.txt} | 0
.../{utils-NOTICE.txt => json-utils-NOTICE.txt} | 0
solr/licenses/kerby-kdc-1.0.1.jar.sha1 | 1 -
solr/licenses/kerby-kdc-LICENSE-ASL.txt | 201 -------
solr/licenses/kerby-kdc-NOTICE.txt | 5 -
solr/licenses/metrics-spi-2.16.93.jar.sha1 | 1 -
solr/licenses/metrics-spi-2.17.63.jar.sha1 | 1 +
solr/licenses/profiles-2.16.93.jar.sha1 | 1 -
solr/licenses/profiles-2.17.63.jar.sha1 | 1 +
solr/licenses/protocol-core-2.16.93.jar.sha1 | 1 -
solr/licenses/protocol-core-2.17.63.jar.sha1 | 1 +
solr/licenses/regions-2.16.93.jar.sha1 | 1 -
solr/licenses/regions-2.17.63.jar.sha1 | 1 +
solr/licenses/s3-2.16.93.jar.sha1 | 1 -
solr/licenses/s3-2.17.63.jar.sha1 | 1 +
solr/licenses/sdk-core-2.16.93.jar.sha1 | 1 -
solr/licenses/sdk-core-2.17.63.jar.sha1 | 1 +
.../third-party-jackson-core-2.17.63.jar.sha1 | 1 +
...xt => third-party-jackson-core-LICENSE-ASL.txt} | 0
...ICE.txt => third-party-jackson-core-NOTICE.txt} | 0
.../url-connection-client-2.16.93.jar.sha1 | 1 -
.../url-connection-client-2.17.63.jar.sha1 | 1 +
solr/licenses/utils-2.16.93.jar.sha1 | 1 -
solr/licenses/utils-2.17.63.jar.sha1 | 1 +
.../conf/managed-schema | 9 +-
.../conf/solrconfig.xml | 1 -
solr/solr-ref-guide/build.gradle | 3 +
.../configuration-guide/pages/config-api.adoc | 1 -
.../pages/implicit-requesthandlers.adoc | 4 +-
.../deployment-guide/pages/backup-restore.adoc | 61 ++-
.../pages/basic-authentication-plugin.adoc | 64 +++
.../pages/configuring-logging.adoc | 1 -
.../pages/jwt-authentication-plugin.adoc | 6 +
.../pages/rule-based-authorization-plugin.adoc | 37 +-
.../getting-started/pages/solr-admin-ui.adoc | 1 +
.../pages/field-types-included-with-solr.adoc | 2 -
.../indexing-guide/pages/indexing-with-tika.adoc | 2 +-
.../pages/partial-document-updates.adoc | 2 +-
.../cluster.png | Bin
.../query-guide/images/sql-screen/sql-query-ui.png | Bin 0 -> 129399 bytes
.../query-guide/pages/document-transformers.adoc | 4 +-
.../pages/query-syntax-and-parsers.adoc | 9 +-
.../modules/query-guide/pages/spatial-search.adoc | 16 +-
...{parallel-sql-interface.adoc => sql-query.adoc} | 309 +++++------
.../modules/query-guide/pages/sql-screen.adoc | 26 +
.../modules/query-guide/querying-nav.adoc | 3 +-
.../pages/major-changes-in-solr-6.adoc | 5 +-
.../pages/major-changes-in-solr-7.adoc | 2 +-
.../pages/major-changes-in-solr-9.adoc | 274 +++++-----
.../upgrade-notes/pages/solr-upgrade-notes.adoc | 39 +-
solr/solr-ref-guide/package-lock.json | 32 +-
solr/solrj/build.gradle | 35 +-
.../client/solrj/impl/BaseCloudSolrClient.java | 29 +-
.../client/solrj/impl/CloudHttp2SolrClient.java | 4 -
.../solr/client/solrj/impl/CloudSolrClient.java | 157 +-----
.../solrj/impl/ConcurrentUpdateSolrClient.java | 74 +--
.../solrj/impl/DelegationTokenHttpSolrClient.java | 58 +-
.../solr/client/solrj/impl/Http2SolrClient.java | 8 +-
.../solrj/impl/HttpClusterStateProvider.java | 3 +
.../solr/client/solrj/impl/HttpSolrClient.java | 121 ++--
.../solr/client/solrj/impl/LBHttpSolrClient.java | 92 +---
.../solr/client/solrj/impl/NoOpResponseParser.java | 6 +-
.../client/solrj/impl/SolrHttpClientBuilder.java | 5 -
.../solrj/impl/ZkClientClusterStateProvider.java | 4 +-
.../java/org/apache/solr/client/solrj/io/Lang.java | 1 -
.../solr/client/solrj/request/ApiMapping.java | 77 +++
.../solrj/request/CollectionAdminRequest.java | 15 +-
.../client/solrj/request/CollectionApiMapping.java | 267 ---------
.../solrj/request/ConfigSetAdminRequest.java | 4 +-
.../solrj/request/ContentStreamUpdateRequest.java | 3 +-
.../solr/client/solrj/request/CoreApiMapping.java | 6 +-
.../solrj/request/MultiContentWriterRequest.java | 2 +-
.../solrj/request/StreamingUpdateRequest.java | 4 +-
.../solr/client/solrj/request/UpdateRequest.java | 21 +-
.../solr/client/solrj/request/V1toV2ApiMapper.java | 145 -----
.../solr/client/solrj/request/V2Request.java | 3 +-
.../solrj/request/beans/AddReplicaPayload.java | 73 +++
.../solrj/request/beans/CreateAliasPayload.java | 2 +-
.../solrj/request/beans/CreateShardPayload.java | 56 ++
.../solrj/request/beans/ForceLeaderPayload.java} | 11 +-
.../solrj/request/beans/SplitShardPayload.java | 63 +++
.../solrj/request/beans/SyncShardPayload.java} | 13 +-
.../org/apache/solr/cluster/api/SimpleMap.java | 13 +-
.../java/org/apache/solr/common/ConfigNode.java | 124 ++++-
.../apache/solr/common/EmptyEntityResolver.java | 8 +-
.../java/org/apache/solr/common/SolrException.java | 114 +---
.../solr/common/cloud/CompositeIdRouter.java | 13 +
.../apache/solr/common/cloud/PerReplicaStates.java | 4 +
.../solr/common/cloud/PerReplicaStatesOps.java | 20 +-
.../org/apache/solr/common/cloud/SolrZkClient.java | 8 +-
.../solr/common/params/CommonAdminParams.java | 2 +
.../common/util/ByteArrayUtf8CharSequence.java | 2 +-
.../java/org/apache/solr/common/util/DOMUtil.java | 10 +-
.../apache/solr/common/util/JsonSchemaCreator.java | 2 +
.../solr/common/util/JsonSchemaValidator.java | 13 +
.../solr/common/util/LinkedSimpleHashMap.java | 34 --
.../apache/solr/common/util/WrappedSimpleMap.java | 11 +
solr/solrj/src/java/org/noggit/CharArr.java | 67 ---
.../cluster.security.MultiPluginAuth.Commands.json | 27 +
.../collections.collection.Commands.modify.json | 16 -
.../resources/apispec/collections.collection.json | 19 -
.../collections.collection.shards.Commands.json | 129 -----
...llections.collection.shards.shard.Commands.json | 24 -
...collections.collection.shards.shard.delete.json | 27 -
...ons.collection.shards.shard.replica.delete.json | 39 --
.../solrj/solr/collection1/conf/schema-sql.xml | 28 -
.../solrj/solr/collection1/conf/schema.xml | 28 -
.../solrj/solr/collection1/conf/solrconfig-sql.xml | 6 -
.../solrj/solr/collection1/conf/solrconfig.xml | 10 +-
.../solrj/solr/configsets/ml/conf/solrconfig.xml | 6 -
.../solr/configsets/shared/conf/solrconfig.xml | 10 +-
.../solr/configsets/streaming/conf/schema.xml | 31 +-
.../solr/configsets/streaming/conf/solrconfig.xml | 6 -
.../solrj/solr/multicore/core0/conf/solrconfig.xml | 20 +-
.../solrj/solr/multicore/core1/conf/solrconfig.xml | 20 +-
.../solrj/impl/CloudSolrClientBuilderTest.java | 7 -
.../solrj/impl/CloudSolrClientCacheTest.java | 4 +-
.../impl/CloudSolrClientMultiConstructorTest.java | 3 +-
.../client/solrj/impl/CloudSolrClientTest.java | 73 ++-
.../solrj/impl/HttpSolrClientConPoolTest.java | 5 +-
.../client/solrj/impl/LBHttpSolrClientTest.java | 7 +-
.../org/apache/solr/client/solrj/io/TestLang.java | 2 +-
.../client/solrj/io/stream/JDBCStreamTest.java | 2 +
.../solrj/io/stream/StreamExpressionTest.java | 2 +
.../io/stream/eval/ConversionEvaluatorsTest.java | 3 +-
.../io/stream/eval/TemporalEvaluatorsTest.java | 4 +-
.../solrj/io/stream/ops/ConcatOperationTest.java | 4 +-
.../client/solrj/io/stream/ops/OperationsTest.java | 4 +-
.../client/solrj/request/TestV1toV2ApiMapper.java | 41 --
.../solr/client/solrj/request/TestV2Request.java | 2 +
.../cloud/PerReplicaStatesIntegrationTest.java | 47 ++
.../apache/solr/common/util/ContentStreamTest.java | 12 +-
.../apache/solr/common/util/JsonValidatorTest.java | 23 +-
.../solr/common/util/TestFastJavabinDecoder.java | 3 +-
.../solr/common/util/TestJsonRecordReader.java | 3 +-
solr/test-framework/build.gradle | 14 +-
.../apache/solr/EmbeddedSolrServerTestBase.java | 32 +-
.../org/apache/solr/SolrIgnoredThreadsFilter.java | 33 +-
.../java/org/apache/solr/SolrJettyTestBase.java | 45 +-
.../src/java/org/apache/solr/SolrTestCase.java | 2 +-
.../src/java/org/apache/solr/SolrTestCaseHS.java | 12 +-
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 115 ++--
.../apache/solr/cloud/MiniSolrCloudCluster.java | 2 +-
.../collections/AbstractIncrementalBackupTest.java | 10 +-
.../solr/core/MockConcurrentMergeScheduler.java | 34 --
.../org/apache/solr/util/BadHdfsThreadsFilter.java | 2 +
.../solr/util/BadMrClusterThreadsFilter.java | 37 --
.../java/org/apache/solr/util/DirectoryUtil.java | 57 ++
.../java/org/apache/solr/util/ErrorLogMuter.java | 256 +++++++++
.../org/apache/solr/util/Log4jListAppender.java | 79 +++
.../src/java/org/apache/solr/util/TestHarness.java | 12 +-
.../solr/cloud/MiniSolrCloudClusterTest.java | 2 +
.../org/apache/solr/util/TestErrorLogMuter.java | 145 +++++
solr/webapp/web/css/angular/security.css | 22 +
.../web/js/angular/controllers/core-overview.js | 2 +
solr/webapp/web/js/angular/controllers/files.js | 6 +-
.../web/js/angular/controllers/schema-designer.js | 9 +
solr/webapp/web/js/angular/controllers/security.js | 180 +++++-
solr/webapp/web/js/angular/services.js | 2 +
solr/webapp/web/partials/core_overview.html | 4 +-
solr/webapp/web/partials/schema-designer.html | 20 +-
solr/webapp/web/partials/security.html | 29 +-
solr/webapp/web/partials/sqlquery.html | 2 +-
versions.lock | 132 ++---
versions.props | 3 +-
445 files changed, 6699 insertions(+), 6845 deletions(-)
create mode 100644 solr/core/src/java/org/apache/solr/core/OverlaidConfigNode.java
delete mode 100644 solr/core/src/java/org/apache/solr/handler/ContentStreamLoader.java
delete mode 100644 solr/core/src/java/org/apache/solr/handler/admin/CollectionHandlerApi.java
copy solr/core/src/java/org/apache/solr/handler/admin/api/{ModifyCollectionAPI.java => AddReplicaAPI.java} (54%)
create mode 100644 solr/core/src/java/org/apache/solr/handler/admin/api/CollectionStatusAPI.java
copy solr/core/src/java/org/apache/solr/handler/admin/api/{ModifyCollectionAPI.java => CreateShardAPI.java} (54%)
create mode 100644 solr/core/src/java/org/apache/solr/handler/admin/api/DeleteReplicaAPI.java
create mode 100644 solr/core/src/java/org/apache/solr/handler/admin/api/DeleteShardAPI.java
create mode 100644 solr/core/src/java/org/apache/solr/handler/admin/api/ForceLeaderAPI.java
copy solr/core/src/java/org/apache/solr/handler/admin/api/{ModifyCollectionAPI.java => SplitShardAPI.java} (56%)
create mode 100644 solr/core/src/java/org/apache/solr/handler/admin/api/SyncShardAPI.java
rename solr/core/src/{test/org/apache/solr/schema/ThrowErrorOnInitFieldType.java => java/org/apache/solr/handler/api/V2ApiUtils.java} (57%)
delete mode 100644 solr/core/src/java/org/apache/solr/legacy/DistanceValueSource.java
delete mode 100644 solr/core/src/java/org/apache/solr/legacy/PointVectorStrategy.java
create mode 100644 solr/core/src/java/org/apache/solr/logging/MDCSnapshot.java
delete mode 100644 solr/core/src/java/org/apache/solr/schema/GeoHashField.java
delete mode 100644 solr/core/src/java/org/apache/solr/schema/LatLonType.java
delete mode 100644 solr/core/src/java/org/apache/solr/schema/SpatialPointVectorFieldType.java
delete mode 100644 solr/core/src/java/org/apache/solr/schema/SpatialTermQueryPrefixTreeFieldType.java
create mode 100644 solr/core/src/java/org/apache/solr/security/MultiAuthPlugin.java
create mode 100644 solr/core/src/java/org/apache/solr/security/MultiAuthRuleBasedAuthorizationPlugin.java
create mode 100644 solr/core/src/test-files/solr/security/multi_auth_plugin_security.json
delete mode 100644 solr/core/src/test/org/apache/solr/core/BlobStoreTestRequestHandler.java
delete mode 100644 solr/core/src/test/org/apache/solr/core/MockInfoBean.java
create mode 100644 solr/core/src/test/org/apache/solr/core/TestConfLoadPerf.java
create mode 100644 solr/core/src/test/org/apache/solr/handler/TestRequestId.java
create mode 100644 solr/core/src/test/org/apache/solr/handler/admin/api/V2ShardsAPIMappingTest.java
create mode 100644 solr/core/src/test/org/apache/solr/request/TestSolrRequestInfo.java
create mode 100644 solr/core/src/test/org/apache/solr/search/join/InvalidConfigJoinQueryTest.java
create mode 100644 solr/core/src/test/org/apache/solr/security/MultiAuthPluginTest.java
create mode 100644 solr/core/src/test/org/apache/solr/util/LongSetTest.java
delete mode 100644 solr/core/src/test/org/apache/solr/util/UtilsToolTest.java
delete mode 100644 solr/licenses/annotations-2.16.93.jar.sha1
create mode 100644 solr/licenses/annotations-2.17.63.jar.sha1
delete mode 100644 solr/licenses/apache-client-2.16.93.jar.sha1
create mode 100644 solr/licenses/apache-client-2.17.63.jar.sha1
delete mode 100644 solr/licenses/arns-2.16.93.jar.sha1
create mode 100644 solr/licenses/arns-2.17.63.jar.sha1
delete mode 100644 solr/licenses/auth-2.16.93.jar.sha1
create mode 100644 solr/licenses/auth-2.17.63.jar.sha1
delete mode 100644 solr/licenses/aws-core-2.16.93.jar.sha1
create mode 100644 solr/licenses/aws-core-2.17.63.jar.sha1
delete mode 100644 solr/licenses/aws-query-protocol-2.16.93.jar.sha1
create mode 100644 solr/licenses/aws-query-protocol-2.17.63.jar.sha1
delete mode 100644 solr/licenses/aws-xml-protocol-2.16.93.jar.sha1
create mode 100644 solr/licenses/aws-xml-protocol-2.17.63.jar.sha1
create mode 100644 solr/licenses/commons-compiler-3.0.11.jar.sha1
delete mode 100644 solr/licenses/commons-compiler-3.0.9.jar.sha1
delete mode 100644 solr/licenses/eigenbase-properties-1.1.5.jar.sha1
delete mode 100644 solr/licenses/eigenbase-properties-LICENSE-ASL.txt
delete mode 100644 solr/licenses/eigenbase-properties-NOTICE.txt
delete mode 100644 solr/licenses/http-client-spi-2.16.93.jar.sha1
create mode 100644 solr/licenses/http-client-spi-2.17.63.jar.sha1
create mode 100644 solr/licenses/janino-3.0.11.jar.sha1
delete mode 100644 solr/licenses/janino-3.0.9.jar.sha1
create mode 100644 solr/licenses/json-utils-2.17.63.jar.sha1
copy solr/licenses/{utils-LICENSE-ASL.txt => json-utils-LICENSE-ASL.txt} (100%)
copy solr/licenses/{utils-NOTICE.txt => json-utils-NOTICE.txt} (100%)
delete mode 100644 solr/licenses/kerby-kdc-1.0.1.jar.sha1
delete mode 100644 solr/licenses/kerby-kdc-LICENSE-ASL.txt
delete mode 100644 solr/licenses/kerby-kdc-NOTICE.txt
delete mode 100644 solr/licenses/metrics-spi-2.16.93.jar.sha1
create mode 100644 solr/licenses/metrics-spi-2.17.63.jar.sha1
delete mode 100644 solr/licenses/profiles-2.16.93.jar.sha1
create mode 100644 solr/licenses/profiles-2.17.63.jar.sha1
delete mode 100644 solr/licenses/protocol-core-2.16.93.jar.sha1
create mode 100644 solr/licenses/protocol-core-2.17.63.jar.sha1
delete mode 100644 solr/licenses/regions-2.16.93.jar.sha1
create mode 100644 solr/licenses/regions-2.17.63.jar.sha1
delete mode 100644 solr/licenses/s3-2.16.93.jar.sha1
create mode 100644 solr/licenses/s3-2.17.63.jar.sha1
delete mode 100644 solr/licenses/sdk-core-2.16.93.jar.sha1
create mode 100644 solr/licenses/sdk-core-2.17.63.jar.sha1
create mode 100644 solr/licenses/third-party-jackson-core-2.17.63.jar.sha1
copy solr/licenses/{utils-LICENSE-ASL.txt => third-party-jackson-core-LICENSE-ASL.txt} (100%)
copy solr/licenses/{utils-NOTICE.txt => third-party-jackson-core-NOTICE.txt} (100%)
delete mode 100644 solr/licenses/url-connection-client-2.16.93.jar.sha1
create mode 100644 solr/licenses/url-connection-client-2.17.63.jar.sha1
delete mode 100644 solr/licenses/utils-2.16.93.jar.sha1
create mode 100644 solr/licenses/utils-2.17.63.jar.sha1
rename solr/solr-ref-guide/modules/query-guide/images/{parallel-sql-interface => sql-query}/cluster.png (100%)
create mode 100644 solr/solr-ref-guide/modules/query-guide/images/sql-screen/sql-query-ui.png
rename solr/solr-ref-guide/modules/query-guide/pages/{parallel-sql-interface.adoc => sql-query.adoc} (96%)
create mode 100644 solr/solr-ref-guide/modules/query-guide/pages/sql-screen.adoc
create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/request/ApiMapping.java
delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionApiMapping.java
delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/request/V1toV2ApiMapper.java
create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/request/beans/AddReplicaPayload.java
create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/request/beans/CreateShardPayload.java
rename solr/{core/src/java/org/apache/solr/search/stats/CachedSearcherStats.java => solrj/src/java/org/apache/solr/client/solrj/request/beans/ForceLeaderPayload.java} (74%)
create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/request/beans/SplitShardPayload.java
rename solr/solrj/src/java/org/apache/solr/{common/cloud/LiveNodesWatcher.java => client/solrj/request/beans/SyncShardPayload.java} (75%)
delete mode 100644 solr/solrj/src/java/org/apache/solr/common/util/LinkedSimpleHashMap.java
create mode 100644 solr/solrj/src/resources/apispec/cluster.security.MultiPluginAuth.Commands.json
delete mode 100644 solr/solrj/src/resources/apispec/collections.collection.Commands.modify.json
delete mode 100644 solr/solrj/src/resources/apispec/collections.collection.json
delete mode 100644 solr/solrj/src/resources/apispec/collections.collection.shards.Commands.json
delete mode 100644 solr/solrj/src/resources/apispec/collections.collection.shards.shard.Commands.json
delete mode 100644 solr/solrj/src/resources/apispec/collections.collection.shards.shard.delete.json
delete mode 100644 solr/solrj/src/resources/apispec/collections.collection.shards.shard.replica.delete.json
delete mode 100644 solr/solrj/src/test/org/apache/solr/client/solrj/request/TestV1toV2ApiMapper.java
delete mode 100644 solr/test-framework/src/java/org/apache/solr/core/MockConcurrentMergeScheduler.java
delete mode 100644 solr/test-framework/src/java/org/apache/solr/util/BadMrClusterThreadsFilter.java
create mode 100644 solr/test-framework/src/java/org/apache/solr/util/DirectoryUtil.java
create mode 100644 solr/test-framework/src/java/org/apache/solr/util/ErrorLogMuter.java
create mode 100644 solr/test-framework/src/java/org/apache/solr/util/Log4jListAppender.java
create mode 100644 solr/test-framework/src/test/org/apache/solr/util/TestErrorLogMuter.java
[solr] 01/01: Merge branch 'main' into jira/solr-15556-antora
Posted by ct...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ctargett pushed a commit to branch jira/solr-15556-antora
in repository https://gitbox.apache.org/repos/asf/solr.git
commit b2a9a879aa0684888c0bee073417bf167accd239
Merge: c8df19f 4bbc25f
Author: Cassandra Targett <ct...@apache.org>
AuthorDate: Tue Nov 23 15:19:53 2021 -0600
Merge branch 'main' into jira/solr-15556-antora
build.gradle | 2 +-
dev-tools/doap/solr.rdf | 7 +
dev-tools/scripts/githubPRs.py | 10 +-
gradle/validation/forbidden-apis.gradle | 23 +-
gradle/validation/forbidden-apis/defaults.all.txt | 6 +
gradle/validation/validate-source-patterns.gradle | 55 +-
help/dependencies.txt | 4 +-
solr/CHANGES.txt | 83 ++-
solr/benchmark/build.gradle | 1 +
.../configs/cloud-minimal/conf/solrconfig.xml | 3 +-
.../solr/bench/MiniClusterBenchStateTest.java | 2 +
solr/bin/solr | 14 +-
solr/bin/solr.cmd | 25 -
solr/bin/solr.in.cmd | 5 -
solr/bin/solr.in.sh | 5 -
solr/contrib/analysis-extras/build.gradle | 1 +
.../apache/solr/schema/TestICUCollationField.java | 7 +-
.../schema/TestICUCollationFieldDocValues.java | 8 +-
solr/contrib/analytics/build.gradle | 2 +
.../analytics/function/reduction/MeanFunction.java | 7 -
.../analytics/function/reduction/SumFunction.java | 7 -
.../solr/analytics/util/OldAnalyticsParams.java | 34 --
.../solr/analytics/facet/PivotFacetTest.java | 2 +
.../legacy/LegacyAbstractAnalyticsTest.java | 3 +-
.../legacy/facet/LegacyFieldFacetCloudTest.java | 2 +
.../legacy/facet/LegacyRangeFacetCloudTest.java | 3 +-
.../util/OldAnalyticsRequestConverterUnitTest.java | 2 +
solr/contrib/clustering/build.gradle | 2 +
.../solr/handler/clustering/EngineParameters.java | 3 +-
solr/contrib/extraction/build.gradle | 1 +
.../solr/collection1/conf/solrconfig.xml | 11 +-
solr/contrib/gcs-repository/build.gradle | 1 +
.../org/apache/solr/gcs/GCSBackupRepository.java | 21 +-
.../apache/solr/gcs/GCSIncrementalBackupTest.java | 2 +
.../apache/solr/jaeger/TestJaegerConfigurator.java | 2 +
solr/contrib/langid/build.gradle | 2 +-
...penNLPLangDetectUpdateProcessorFactoryTest.java | 2 +
solr/contrib/ltr/build.gradle | 1 +
.../org/apache/solr/ltr/TestLTROnSolrCloud.java | 2 +
solr/contrib/prometheus-exporter/build.gradle | 8 +-
.../conf/solr-exporter-config.xml | 21 +-
.../solr/prometheus/exporter/MetricsQuery.java | 15 +-
.../solr/prometheus/scraper/SolrCloudScraper.java | 2 +-
...theus-solr-exporter-integration-test-config.xml | 17 +-
...rometheus-solr-exporter-scraper-test-config.xml | 15 +-
.../prometheus/PrometheusExporterTestBase.java | 26 +-
.../prometheus/collector/MetricSamplesTest.java | 35 +-
.../exporter/SolrExporterIntegrationTest.java | 2 +-
.../prometheus/scraper/SolrCloudScraperTest.java | 2 +
solr/contrib/s3-repository/build.gradle | 5 +
.../apache/solr/s3/S3BackupRepositoryConfig.java | 15 +-
.../java/org/apache/solr/s3/S3StorageClient.java | 64 ++-
.../org/apache/solr/s3/AbstractS3ClientTest.java | 8 +-
.../apache/solr/s3/S3IncrementalBackupTest.java | 7 +-
solr/contrib/scripting/build.gradle | 2 +
solr/core/build.gradle | 193 ++++---
.../apache/solr/api/ContainerPluginsRegistry.java | 6 +-
.../org/apache/solr/cloud/RecoveryStrategy.java | 14 +-
.../apache/solr/cloud/api/collections/Assign.java | 28 +-
.../cloud/api/collections/DeleteBackupCmd.java | 30 +-
.../solr/cloud/api/collections/ReplaceNodeCmd.java | 151 ++---
.../apache/solr/cloud/overseer/SliceMutator.java | 3 +-
.../java/org/apache/solr/core/ConfigOverlay.java | 4 +
.../org/apache/solr/core/ConfigSetService.java | 6 +
.../java/org/apache/solr/core/CoreContainer.java | 7 +-
.../org/apache/solr/core/OverlaidConfigNode.java | 109 ++++
.../src/java/org/apache/solr/core/PluginInfo.java | 24 +
.../src/java/org/apache/solr/core/SolrConfig.java | 493 ++++++++++-------
.../src/java/org/apache/solr/core/SolrCore.java | 4 +-
.../java/org/apache/solr/core/XmlConfigFile.java | 15 +-
.../solr/core/backup/ShardBackupMetadata.java | 8 +
.../org/apache/solr/filestore/PackageStoreAPI.java | 14 +-
.../org/apache/solr/handler/CollectionsAPI.java | 10 +-
.../apache/solr/handler/ContentStreamLoader.java | 49 --
.../apache/solr/handler/DumpRequestHandler.java | 1 +
.../apache/solr/handler/MoreLikeThisHandler.java | 4 +-
.../solr/handler/admin/BaseHandlerApiSupport.java | 4 +-
.../solr/handler/admin/CollectionHandlerApi.java | 77 ---
.../solr/handler/admin/CollectionsHandler.java | 17 +-
.../solr/handler/admin/CoreAdminHandlerApi.java | 4 +-
.../solr/handler/admin/ShowFileRequestHandler.java | 10 +-
...ModifyCollectionAPI.java => AddReplicaAPI.java} | 57 +-
.../handler/admin/api/CollectionStatusAPI.java | 61 +++
...odifyCollectionAPI.java => CreateShardAPI.java} | 59 +-
.../solr/handler/admin/api/DeleteReplicaAPI.java | 61 +++
.../solr/handler/admin/api/DeleteShardAPI.java | 63 +++
.../solr/handler/admin/api/ForceLeaderAPI.java | 68 +++
.../handler/admin/api/ModifyCollectionAPI.java | 10 +-
...ModifyCollectionAPI.java => SplitShardAPI.java} | 57 +-
.../solr/handler/admin/api/SyncShardAPI.java | 68 +++
.../org/apache/solr/handler/api/ApiRegistrar.java | 23 +-
.../org/apache/solr/handler/api/V2ApiUtils.java} | 19 +-
.../handler/component/RealTimeGetComponent.java | 5 +-
.../solr/handler/component/SearchHandler.java | 16 +-
.../solr/handler/component/ShardResponse.java | 3 +-
.../handler/component/SpellCheckComponent.java | 6 +-
.../java/org/apache/solr/legacy/BBoxStrategy.java | 3 +-
.../org/apache/solr/legacy/BBoxValueSource.java | 1 +
.../apache/solr/legacy/DistanceValueSource.java | 120 ----
.../apache/solr/legacy/PointVectorStrategy.java | 289 ----------
.../java/org/apache/solr/logging/MDCSnapshot.java | 58 ++
.../org/apache/solr/request/SolrRequestInfo.java | 70 ++-
.../apache/solr/response/RawResponseWriter.java | 5 +-
.../transform/ChildDocTransformerFactory.java | 22 +-
.../org/apache/solr/schema/AbstractEnumField.java | 2 +-
.../apache/solr/schema/FieldTypePluginLoader.java | 6 +-
.../java/org/apache/solr/schema/GeoHashField.java | 103 ----
.../java/org/apache/solr/schema/IndexSchema.java | 25 +-
.../org/apache/solr/schema/IndexSchemaFactory.java | 14 +-
.../java/org/apache/solr/schema/LatLonType.java | 606 ---------------------
.../org/apache/solr/schema/ManagedIndexSchema.java | 14 +-
.../src/java/org/apache/solr/schema/PointType.java | 4 +-
.../solr/schema/SpatialPointVectorFieldType.java | 106 ----
.../org/apache/solr/schema/SpatialQueryable.java | 2 +-
.../SpatialTermQueryPrefixTreeFieldType.java | 33 --
.../java/org/apache/solr/search/CacheConfig.java | 40 +-
.../java/org/apache/solr/search/CaffeineCache.java | 5 +
.../org/apache/solr/search/JoinQParserPlugin.java | 2 +-
.../src/java/org/apache/solr/search/JoinQuery.java | 5 +
.../src/java/org/apache/solr/search/SolrCache.java | 11 +
.../solr/search/SpatialFilterQParserPlugin.java | 8 +-
.../apache/solr/search/facet/FacetFieldMerger.java | 42 --
.../distance/GeoDistValueSourceParser.java | 2 +-
.../search/function/distance/GeohashFunction.java | 1 +
.../distance/GeohashHaversineFunction.java | 3 +-
.../org/apache/solr/security/BasicAuthPlugin.java | 2 +-
.../org/apache/solr/security/MultiAuthPlugin.java | 280 ++++++++++
.../MultiAuthRuleBasedAuthorizationPlugin.java | 150 +++++
.../java/org/apache/solr/servlet/HttpSolrCall.java | 7 +-
.../apache/solr/servlet/SolrDispatchFilter.java | 11 +-
.../apache/solr/update/DirectUpdateHandler2.java | 4 -
.../org/apache/solr/update/SolrCmdDistributor.java | 4 -
.../org/apache/solr/update/SolrIndexConfig.java | 82 ++-
.../src/java/org/apache/solr/update/UpdateLog.java | 22 +-
.../java/org/apache/solr/update/VersionInfo.java | 4 +-
.../processor/DistributedZkUpdateProcessor.java | 103 ++--
.../HTMLStripFieldUpdateProcessorFactory.java | 2 +-
.../java/org/apache/solr/util/DOMConfigNode.java | 12 +-
.../java/org/apache/solr/util/DataConfigNode.java | 71 +--
.../src/java/org/apache/solr/util/LongSet.java | 15 +-
.../java/org/apache/solr/util/RedactionUtils.java | 55 --
.../src/java/org/apache/solr/util/SolrCLI.java | 326 ++---------
.../src/java/org/apache/solr/util/hll/HLL.java | 6 +-
.../resources/EditableSolrConfigAttributes.json | 7 +-
.../solr/collection1/conf/schema-hash.xml | 28 -
.../solr/collection1/conf/schema-minhash.xml | 28 -
.../solr/collection1/conf/schema-rest.xml | 15 -
.../solr/collection1/conf/schema-spatial.xml | 23 +-
.../solr/collection1/conf/schema-sql.xml | 28 -
.../test-files/solr/collection1/conf/schema.xml | 21 +-
.../test-files/solr/collection1/conf/schema11.xml | 17 -
.../test-files/solr/collection1/conf/schema12.xml | 22 +-
.../test-files/solr/collection1/conf/schema15.xml | 18 +-
.../solr/collection1/conf/schema_latest.xml | 35 +-
.../solr/collection1/conf/schemasurround.xml | 17 -
.../conf/solrconfig-analytics-query.xml | 6 -
.../conf/solrconfig-collapseqparser.xml | 6 -
.../conf/solrconfig-components-name.xml | 7 +-
.../conf/solrconfig-doctransformers.xml | 6 -
.../solr/collection1/conf/solrconfig-elevate.xml | 11 +-
.../solr/collection1/conf/solrconfig-hash.xml | 6 -
.../solr/collection1/conf/solrconfig-minhash.xml | 30 +-
.../collection1/conf/solrconfig-plugcollector.xml | 5 -
.../solr/collection1/conf/solrconfig-sql.xml | 6 -
.../solr/collection1/conf/solrconfig-test-misc.xml | 8 +-
.../solr/collection1/conf/solrconfig.xml | 34 +-
.../solr/configsets/cloud-dynamic/conf/schema.xml | 14 +-
.../solr/configsets/doc-expiry/conf/schema.xml | 18 -
.../test-files/solr/configsets/sql/conf/schema.xml | 15 -
.../src/test-files/solr/crazy-path-to-config.xml | 5 -
.../solr/security/multi_auth_plugin_security.json | 71 +++
.../src/test/org/apache/hadoop/fs/HardLink.java | 14 -
.../test/org/apache/solr/ConvertedLegacyTest.java | 41 +-
.../test/org/apache/solr/TestCrossCoreJoin.java | 30 +-
.../test/org/apache/solr/TestGroupingSearch.java | 14 +-
solr/core/src/test/org/apache/solr/TestJoin.java | 1 +
.../apache/solr/cloud/CollectionsAPISolrJTest.java | 2 -
.../solr/cloud/FullSolrCloudDistribCmdsTest.java | 35 +-
.../cloud/HttpPartitionWithTlogReplicasTest.java | 2 +
.../org/apache/solr/cloud/ReplaceNodeTest.java | 73 ++-
.../apache/solr/cloud/TestCloudConsistency.java | 2 +
.../solr/cloud/TestLeaderElectionZkExpiry.java | 8 +-
.../apache/solr/cloud/TestRebalanceLeaders.java | 33 +-
.../org/apache/solr/cloud/TestStressLiveNodes.java | 2 +
.../ConcurrentDeleteAndCreateCollectionTest.java | 21 +-
.../HdfsCloudIncrementalBackupTest.java | 8 +-
.../solr/cloud/api/collections/PurgeGraphTest.java | 266 ++++-----
.../collections/TestHdfsCloudBackupRestore.java | 2 +
.../solr/cloud/hdfs/HDFSCollectionsAPITest.java | 2 +
.../cloud/hdfs/HdfsBasicDistributedZk2Test.java | 2 +
.../cloud/hdfs/HdfsBasicDistributedZkTest.java | 2 +
.../hdfs/HdfsChaosMonkeyNothingIsSafeTest.java | 2 +
.../cloud/hdfs/HdfsChaosMonkeySafeLeaderTest.java | 2 +
.../apache/solr/cloud/hdfs/HdfsNNFailoverTest.java | 2 +
.../solr/cloud/hdfs/HdfsRecoverLeaseTest.java | 2 +
.../apache/solr/cloud/hdfs/HdfsRecoveryZkTest.java | 2 +
.../cloud/hdfs/HdfsRestartWhileUpdatingTest.java | 2 +
.../apache/solr/cloud/hdfs/HdfsSyncSliceTest.java | 2 +
.../org/apache/solr/cloud/hdfs/HdfsTestUtil.java | 2 +
.../apache/solr/cloud/hdfs/HdfsThreadLeakTest.java | 2 +
.../HdfsTlogReplayBufferedWhileIndexingTest.java | 2 +
.../cloud/hdfs/HdfsUnloadDistributedZkTest.java | 2 +
.../hdfs/HdfsWriteToMultipleCollectionsTest.java | 2 +
.../org/apache/solr/cloud/hdfs/StressHdfsTest.java | 2 +
.../cluster/events/ClusterEventProducerTest.java | 4 +-
.../plugins/AffinityPlacementFactoryTest.java | 42 +-
.../solr/core/BlobRepositoryMockingTest.java | 4 +-
.../solr/core/BlobStoreTestRequestHandler.java | 62 ---
.../apache/solr/core/HdfsDirectoryFactoryTest.java | 2 +
.../test/org/apache/solr/core/MockInfoBean.java | 65 ---
.../test/org/apache/solr/core/TestBadConfig.java | 12 -
.../org/apache/solr/core/TestCodecSupport.java | 6 +-
.../org/apache/solr/core/TestConfLoadPerf.java | 88 +++
.../src/test/org/apache/solr/core/TestConfig.java | 55 +-
.../org/apache/solr/core/TestConfigOverlay.java | 5 -
.../org/apache/solr/core/TestSimpleTextCodec.java | 2 +-
.../HdfsBackupRepositoryIntegrationTest.java | 2 +
.../org/apache/solr/handler/TestBlobHandler.java | 2 +
.../solr/handler/TestHdfsBackupRestoreCore.java | 2 +
.../org/apache/solr/handler/TestRequestId.java | 103 ++++
.../solr/handler/admin/DaemonStreamApiTest.java | 2 +
.../solr/handler/admin/MBeansHandlerTest.java | 3 +
.../handler/admin/ShowFileRequestHandlerTest.java | 7 +
.../solr/handler/admin/TestApiFramework.java | 5 +-
.../solr/handler/admin/TestCollectionAPIs.java | 30 +-
.../admin/api/V2CollectionAPIMappingTest.java | 39 +-
.../handler/admin/api/V2ShardsAPIMappingTest.java | 291 ++++++++++
.../DistributedQueryComponentCustomSortTest.java | 2 +
.../handler/component/SuggestComponentTest.java | 122 +++--
.../solr/handler/component/UpdateLogCloudTest.java | 22 +-
.../apache/solr/request/TestRemoteStreaming.java | 2 +-
.../apache/solr/request/TestSolrRequestInfo.java | 80 +++
.../solr/response/TestGeoJSONResponseWriter.java | 9 +-
.../transform/TestSubQueryTransformerDistrib.java | 7 +-
.../rest/schema/TestFieldCollectionResource.java | 24 +-
.../test/org/apache/solr/schema/RankFieldTest.java | 34 +-
.../org/apache/solr/search/QueryEqualityTest.java | 40 +-
.../org/apache/solr/search/ReturnFieldsTest.java | 22 +-
.../org/apache/solr/search/SpatialFilterTest.java | 21 +-
.../org/apache/solr/search/TestSolr4Spatial.java | 5 +-
.../apache/solr/search/TestSolrQueryParser.java | 1 +
.../apache/solr/search/TestValueSourceCache.java | 6 +-
.../function/distance/DistanceFunctionTest.java | 80 ++-
.../search/join/InvalidConfigJoinQueryTest.java | 47 ++
.../solr/search/join/TestScoreJoinQPNoScore.java | 1 +
.../solr/search/join/TestScoreJoinQPScore.java | 1 +
.../solr/security/BasicAuthStandaloneTest.java | 32 +-
.../apache/solr/security/MultiAuthPluginTest.java | 263 +++++++++
.../apache/solr/store/hdfs/HdfsDirectoryTest.java | 2 +
.../apache/solr/update/SolrIndexConfigTest.java | 12 +-
.../AbstractAtomicUpdatesMultivalueTestBase.java | 6 +-
.../TimeRoutedAliasUpdateProcessorTest.java | 43 ++
.../src/test/org/apache/solr/util/LongSetTest.java | 94 ++++
.../solr/util/TestSolrJacksonAnnotation.java | 6 +
.../test/org/apache/solr/util/UtilsToolTest.java | 206 -------
solr/docker/templates/Dockerfile.body.template | 7 +-
solr/licenses/annotations-2.16.93.jar.sha1 | 1 -
solr/licenses/annotations-2.17.63.jar.sha1 | 1 +
solr/licenses/apache-client-2.16.93.jar.sha1 | 1 -
solr/licenses/apache-client-2.17.63.jar.sha1 | 1 +
solr/licenses/arns-2.16.93.jar.sha1 | 1 -
solr/licenses/arns-2.17.63.jar.sha1 | 1 +
solr/licenses/auth-2.16.93.jar.sha1 | 1 -
solr/licenses/auth-2.17.63.jar.sha1 | 1 +
solr/licenses/aws-core-2.16.93.jar.sha1 | 1 -
solr/licenses/aws-core-2.17.63.jar.sha1 | 1 +
solr/licenses/aws-query-protocol-2.16.93.jar.sha1 | 1 -
solr/licenses/aws-query-protocol-2.17.63.jar.sha1 | 1 +
solr/licenses/aws-xml-protocol-2.16.93.jar.sha1 | 1 -
solr/licenses/aws-xml-protocol-2.17.63.jar.sha1 | 1 +
solr/licenses/commons-compiler-3.0.11.jar.sha1 | 1 +
solr/licenses/commons-compiler-3.0.9.jar.sha1 | 1 -
solr/licenses/eigenbase-properties-1.1.5.jar.sha1 | 1 -
solr/licenses/eigenbase-properties-NOTICE.txt | 20 -
solr/licenses/http-client-spi-2.16.93.jar.sha1 | 1 -
solr/licenses/http-client-spi-2.17.63.jar.sha1 | 1 +
solr/licenses/janino-3.0.11.jar.sha1 | 1 +
solr/licenses/janino-3.0.9.jar.sha1 | 1 -
solr/licenses/json-utils-2.17.63.jar.sha1 | 1 +
...-LICENSE-ASL.txt => json-utils-LICENSE-ASL.txt} | 4 +
solr/licenses/json-utils-NOTICE.txt | 25 +
solr/licenses/kerby-kdc-1.0.1.jar.sha1 | 1 -
solr/licenses/kerby-kdc-NOTICE.txt | 5 -
solr/licenses/metrics-spi-2.16.93.jar.sha1 | 1 -
solr/licenses/metrics-spi-2.17.63.jar.sha1 | 1 +
solr/licenses/profiles-2.16.93.jar.sha1 | 1 -
solr/licenses/profiles-2.17.63.jar.sha1 | 1 +
solr/licenses/protocol-core-2.16.93.jar.sha1 | 1 -
solr/licenses/protocol-core-2.17.63.jar.sha1 | 1 +
solr/licenses/regions-2.16.93.jar.sha1 | 1 -
solr/licenses/regions-2.17.63.jar.sha1 | 1 +
solr/licenses/s3-2.16.93.jar.sha1 | 1 -
solr/licenses/s3-2.17.63.jar.sha1 | 1 +
solr/licenses/sdk-core-2.16.93.jar.sha1 | 1 -
solr/licenses/sdk-core-2.17.63.jar.sha1 | 1 +
.../third-party-jackson-core-2.17.63.jar.sha1 | 1 +
...xt => third-party-jackson-core-LICENSE-ASL.txt} | 13 +-
solr/licenses/third-party-jackson-core-NOTICE.txt | 25 +
.../url-connection-client-2.16.93.jar.sha1 | 1 -
.../url-connection-client-2.17.63.jar.sha1 | 1 +
solr/licenses/utils-2.16.93.jar.sha1 | 1 -
solr/licenses/utils-2.17.63.jar.sha1 | 1 +
.../conf/managed-schema | 9 +-
.../conf/solrconfig.xml | 1 -
solr/solr-ref-guide/build.gradle | 3 +
.../configuration-guide/pages/config-api.adoc | 1 -
.../pages/implicit-requesthandlers.adoc | 4 +-
.../deployment-guide/pages/backup-restore.adoc | 61 ++-
.../pages/basic-authentication-plugin.adoc | 64 +++
.../pages/configuring-logging.adoc | 1 -
.../pages/jwt-authentication-plugin.adoc | 6 +
.../pages/rule-based-authorization-plugin.adoc | 37 +-
.../getting-started/pages/solr-admin-ui.adoc | 1 +
.../pages/field-types-included-with-solr.adoc | 2 -
.../indexing-guide/pages/indexing-with-tika.adoc | 2 +-
.../pages/partial-document-updates.adoc | 2 +-
.../cluster.png | Bin
.../query-guide/images/sql-screen/sql-query-ui.png | Bin 0 -> 129399 bytes
.../query-guide/pages/document-transformers.adoc | 4 +-
.../pages/query-syntax-and-parsers.adoc | 9 +-
.../modules/query-guide/pages/spatial-search.adoc | 16 +-
...{parallel-sql-interface.adoc => sql-query.adoc} | 309 +++++------
.../modules/query-guide/pages/sql-screen.adoc | 26 +
.../modules/query-guide/querying-nav.adoc | 3 +-
.../pages/major-changes-in-solr-6.adoc | 5 +-
.../pages/major-changes-in-solr-7.adoc | 2 +-
.../pages/major-changes-in-solr-9.adoc | 274 +++++-----
.../upgrade-notes/pages/solr-upgrade-notes.adoc | 39 +-
solr/solr-ref-guide/package-lock.json | 32 +-
solr/solrj/build.gradle | 35 +-
.../client/solrj/impl/BaseCloudSolrClient.java | 29 +-
.../client/solrj/impl/CloudHttp2SolrClient.java | 4 -
.../solr/client/solrj/impl/CloudSolrClient.java | 157 +-----
.../solrj/impl/ConcurrentUpdateSolrClient.java | 74 +--
.../solrj/impl/DelegationTokenHttpSolrClient.java | 58 +-
.../solr/client/solrj/impl/Http2SolrClient.java | 8 +-
.../solrj/impl/HttpClusterStateProvider.java | 3 +
.../solr/client/solrj/impl/HttpSolrClient.java | 121 ++--
.../solr/client/solrj/impl/LBHttpSolrClient.java | 92 +---
.../solr/client/solrj/impl/NoOpResponseParser.java | 6 +-
.../client/solrj/impl/SolrHttpClientBuilder.java | 5 -
.../solrj/impl/ZkClientClusterStateProvider.java | 4 +-
.../java/org/apache/solr/client/solrj/io/Lang.java | 1 -
.../solr/client/solrj/request/ApiMapping.java | 77 +++
.../solrj/request/CollectionAdminRequest.java | 15 +-
.../client/solrj/request/CollectionApiMapping.java | 267 ---------
.../solrj/request/ConfigSetAdminRequest.java | 4 +-
.../solrj/request/ContentStreamUpdateRequest.java | 3 +-
.../solr/client/solrj/request/CoreApiMapping.java | 6 +-
.../solrj/request/MultiContentWriterRequest.java | 2 +-
.../solrj/request/StreamingUpdateRequest.java | 4 +-
.../solr/client/solrj/request/UpdateRequest.java | 21 +-
.../solr/client/solrj/request/V1toV2ApiMapper.java | 145 -----
.../solr/client/solrj/request/V2Request.java | 3 +-
.../solrj/request/beans/AddReplicaPayload.java | 73 +++
.../solrj/request/beans/CreateAliasPayload.java | 2 +-
.../solrj/request/beans/CreateShardPayload.java | 56 ++
.../solrj/request/beans/ForceLeaderPayload.java} | 11 +-
.../solrj/request/beans/SplitShardPayload.java | 63 +++
.../solrj/request/beans/SyncShardPayload.java} | 13 +-
.../org/apache/solr/cluster/api/SimpleMap.java | 13 +-
.../java/org/apache/solr/common/ConfigNode.java | 124 ++++-
.../apache/solr/common/EmptyEntityResolver.java | 8 +-
.../java/org/apache/solr/common/SolrException.java | 114 +---
.../solr/common/cloud/CompositeIdRouter.java | 13 +
.../apache/solr/common/cloud/PerReplicaStates.java | 4 +
.../solr/common/cloud/PerReplicaStatesOps.java | 20 +-
.../org/apache/solr/common/cloud/SolrZkClient.java | 8 +-
.../solr/common/params/CommonAdminParams.java | 2 +
.../common/util/ByteArrayUtf8CharSequence.java | 2 +-
.../java/org/apache/solr/common/util/DOMUtil.java | 10 +-
.../apache/solr/common/util/JsonSchemaCreator.java | 2 +
.../solr/common/util/JsonSchemaValidator.java | 13 +
.../solr/common/util/LinkedSimpleHashMap.java | 34 --
.../apache/solr/common/util/WrappedSimpleMap.java | 11 +
solr/solrj/src/java/org/noggit/CharArr.java | 67 ---
.../cluster.security.MultiPluginAuth.Commands.json | 27 +
.../collections.collection.Commands.modify.json | 16 -
.../resources/apispec/collections.collection.json | 19 -
.../collections.collection.shards.Commands.json | 129 -----
...llections.collection.shards.shard.Commands.json | 24 -
...collections.collection.shards.shard.delete.json | 27 -
...ons.collection.shards.shard.replica.delete.json | 39 --
.../solrj/solr/collection1/conf/schema-sql.xml | 28 -
.../solrj/solr/collection1/conf/schema.xml | 28 -
.../solrj/solr/collection1/conf/solrconfig-sql.xml | 6 -
.../solrj/solr/collection1/conf/solrconfig.xml | 10 +-
.../solrj/solr/configsets/ml/conf/solrconfig.xml | 6 -
.../solr/configsets/shared/conf/solrconfig.xml | 10 +-
.../solr/configsets/streaming/conf/schema.xml | 31 +-
.../solr/configsets/streaming/conf/solrconfig.xml | 6 -
.../solrj/solr/multicore/core0/conf/solrconfig.xml | 20 +-
.../solrj/solr/multicore/core1/conf/solrconfig.xml | 20 +-
.../solrj/impl/CloudSolrClientBuilderTest.java | 7 -
.../solrj/impl/CloudSolrClientCacheTest.java | 4 +-
.../impl/CloudSolrClientMultiConstructorTest.java | 3 +-
.../client/solrj/impl/CloudSolrClientTest.java | 73 ++-
.../solrj/impl/HttpSolrClientConPoolTest.java | 5 +-
.../client/solrj/impl/LBHttpSolrClientTest.java | 7 +-
.../org/apache/solr/client/solrj/io/TestLang.java | 2 +-
.../client/solrj/io/stream/JDBCStreamTest.java | 2 +
.../solrj/io/stream/StreamExpressionTest.java | 2 +
.../io/stream/eval/ConversionEvaluatorsTest.java | 3 +-
.../io/stream/eval/TemporalEvaluatorsTest.java | 4 +-
.../solrj/io/stream/ops/ConcatOperationTest.java | 4 +-
.../client/solrj/io/stream/ops/OperationsTest.java | 4 +-
.../client/solrj/request/TestV1toV2ApiMapper.java | 41 --
.../solr/client/solrj/request/TestV2Request.java | 2 +
.../cloud/PerReplicaStatesIntegrationTest.java | 47 ++
.../apache/solr/common/util/ContentStreamTest.java | 12 +-
.../apache/solr/common/util/JsonValidatorTest.java | 23 +-
.../solr/common/util/TestFastJavabinDecoder.java | 3 +-
.../solr/common/util/TestJsonRecordReader.java | 3 +-
solr/test-framework/build.gradle | 14 +-
.../apache/solr/EmbeddedSolrServerTestBase.java | 32 +-
.../org/apache/solr/SolrIgnoredThreadsFilter.java | 33 +-
.../java/org/apache/solr/SolrJettyTestBase.java | 45 +-
.../src/java/org/apache/solr/SolrTestCase.java | 2 +-
.../src/java/org/apache/solr/SolrTestCaseHS.java | 12 +-
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 115 ++--
.../apache/solr/cloud/MiniSolrCloudCluster.java | 2 +-
.../collections/AbstractIncrementalBackupTest.java | 10 +-
.../solr/core/MockConcurrentMergeScheduler.java | 34 --
.../org/apache/solr/util/BadHdfsThreadsFilter.java | 2 +
.../solr/util/BadMrClusterThreadsFilter.java | 37 --
.../java/org/apache/solr/util/DirectoryUtil.java | 57 ++
.../java/org/apache/solr/util/ErrorLogMuter.java | 256 +++++++++
.../org/apache/solr/util/Log4jListAppender.java | 79 +++
.../src/java/org/apache/solr/util/TestHarness.java | 12 +-
.../solr/cloud/MiniSolrCloudClusterTest.java | 2 +
.../org/apache/solr/util/TestErrorLogMuter.java | 145 +++++
solr/webapp/web/css/angular/security.css | 22 +
.../web/js/angular/controllers/core-overview.js | 2 +
solr/webapp/web/js/angular/controllers/files.js | 6 +-
.../web/js/angular/controllers/schema-designer.js | 9 +
solr/webapp/web/js/angular/controllers/security.js | 180 +++++-
solr/webapp/web/js/angular/services.js | 2 +
solr/webapp/web/partials/core_overview.html | 4 +-
solr/webapp/web/partials/schema-designer.html | 20 +-
solr/webapp/web/partials/security.html | 29 +-
solr/webapp/web/partials/sqlquery.html | 2 +-
versions.lock | 132 ++---
versions.props | 3 +-
443 files changed, 6762 insertions(+), 6446 deletions(-)
diff --cc solr/solr-ref-guide/modules/query-guide/images/sql-query/cluster.png
index 10f134f,0000000..10f134f
mode 100644,000000..100644
Binary files differ
diff --cc solr/solr-ref-guide/modules/query-guide/images/sql-screen/sql-query-ui.png
index 0000000,1c97a9e..1c97a9e
mode 000000,100644..100644
Binary files differ
diff --cc solr/solr-ref-guide/modules/query-guide/pages/query-syntax-and-parsers.adoc
index f2419de,a46f7e3..16a7196
--- a/solr/solr-ref-guide/modules/query-guide/pages/query-syntax-and-parsers.adoc
+++ b/solr/solr-ref-guide/modules/query-guide/pages/query-syntax-and-parsers.adoc
@@@ -60,8 -61,9 +61,10 @@@ If you have custom parsing needs, you m
| <<join-query-parser.adoc#,Join Query Parser>>: Query parser to facilitate joins.
| <<spatial-search.adoc#,Spatial Search>>: Solr's spatial search capabilities.
| <<other-parsers.adoc#,Other Parsers>>: More parsers designed for use in specific situations.
- | <<parallel-sql-interface.adoc#,Parallel SQL Interface>>: SQL interface for Solr.
+ | <<sql-query.adoc#,SQL Query>>: SQL language support for Solr.
| <<query-screen.adoc#,Query Screen>>: Form-based query builder.
+ | <<sql-screen.adoc#,SQL Screen>>: SQL query runner with tabular results.
++|
|===
// end::parser-sections[]
****
diff --cc solr/solr-ref-guide/modules/query-guide/pages/sql-query.adoc
index 8ba7ac4,cde7bcf..7b9cfc1
--- a/solr/solr-ref-guide/modules/query-guide/pages/sql-query.adoc
+++ b/solr/solr-ref-guide/modules/query-guide/pages/sql-query.adoc
@@@ -507,7 -507,7 +507,8 @@@ This means the tuples are always sorte
The partitioned tuples are sent directly to the correct worker nodes in the proper sort order, ready to be reduced.
.How Parallel SQL Queries are Distributed
- image::parallel-sql-interface/cluster.png[image,width=492,height=250]
-image::images/sql-query/cluster.png[image,width=492,height=250]
++
++image::sql-query/cluster.png[image,width=492,height=250]
The image above shows the three tiers broken out into different SolrCloud collections for clarity.
In practice the `/sql` handler and worker collection by default share the same collection.
diff --cc solr/solr-ref-guide/modules/query-guide/pages/sql-screen.adoc
index 0000000,eab86f5..d46c333
mode 000000,100644..100644
--- a/solr/solr-ref-guide/modules/query-guide/pages/sql-screen.adoc
+++ b/solr/solr-ref-guide/modules/query-guide/pages/sql-screen.adoc
@@@ -1,0 -1,26 +1,26 @@@
+ = SQL Query Screen
+ // Licensed to the Apache Software Foundation (ASF) under one
+ // or more contributor license agreements. See the NOTICE file
+ // distributed with this work for additional information
+ // regarding copyright ownership. The ASF licenses this file
+ // to you under the Apache License, Version 2.0 (the
+ // "License"); you may not use this file except in compliance
+ // with the License. You may obtain a copy of the License at
+ //
+ // http://www.apache.org/licenses/LICENSE-2.0
+ //
+ // Unless required by applicable law or agreed to in writing,
+ // software distributed under the License is distributed on an
+ // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ // KIND, either express or implied. See the License for the
+ // specific language governing permissions and limitations
+ // under the License.
+
+ You can use the *SQL Query* screen to submit a SQL query to a Solr collection and get the results in a tabular format.
+
+ In the example in the screenshot, a SQL query has been submitted, and the screen shows the query results listed as a table.
+
+ .Results of a SQL Query
-image::images/sql-screen/sql-query-ui.png[image,height=400]
++image::sql-screen/sql-query-ui.png[image,height=400]
+
+ Learn more about by reading the <<sql-query.adoc#,SQL details>>, including the specific <<sql-query.adoc#solr-sql-syntax,SQL syntax>> supported by Solr.
diff --cc solr/solr-ref-guide/modules/query-guide/querying-nav.adoc
index e1d045b,0000000..6fb26ec
mode 100644,000000..100644
--- a/solr/solr-ref-guide/modules/query-guide/querying-nav.adoc
+++ b/solr/solr-ref-guide/modules/query-guide/querying-nav.adoc
@@@ -1,84 -1,0 +1,85 @@@
+.Query Guide
+* xref:query-guide.adoc[]
+
+** xref:query-syntax-and-parsers.adoc[]
+*** xref:common-query-parameters.adoc[]
+*** xref:standard-query-parser.adoc[]
+*** xref:dismax-query-parser.adoc[]
+*** xref:edismax-query-parser.adoc[]
+*** xref:function-queries.adoc[]
+*** xref:local-params.adoc[]
+*** xref:json-request-api.adoc[]
+**** xref:json-query-dsl.adoc[]
+*** xref:searching-nested-documents.adoc[]
+*** xref:block-join-query-parser.adoc[]
+*** xref:join-query-parser.adoc[]
+*** xref:spatial-search.adoc[]
+*** xref:other-parsers.adoc[]
- *** xref:parallel-sql-interface.adoc[]
++*** xref:sql-query.adoc[]
+**** xref:jdbc-dbvisualizer.adoc[]
+**** xref:jdbc-squirrel.adoc[]
+**** xref:jdbc-zeppelin.adoc[]
+**** xref:jdbc-python-jython.adoc[]
+**** xref:jdbc-r.adoc[]
+*** xref:query-screen.adoc[]
++*** xref:sql-screen.adoc[]
+
+** xref:enhancing-queries.adoc[]
+*** xref:spell-checking.adoc[]
+*** xref:suggester.adoc[]
+*** xref:morelikethis.adoc[]
+*** xref:query-re-ranking.adoc[]
+*** xref:learning-to-rank.adoc[]
+*** xref:tagger-handler.adoc[]
+*** xref:analytics.adoc[]
+**** xref:analytics-expression-sources.adoc[]
+**** xref:analytics-mapping-functions.adoc[]
+**** xref:analytics-reduction-functions.adoc[]
+*** xref:terms-component.adoc[]
+*** xref:term-vector-component.adoc[]
+*** xref:stats-component.adoc[]
+
+** xref:controlling-results.adoc[]
+*** xref:faceting.adoc[]
+*** xref:json-facet-api.adoc[]
+**** xref:json-faceting-domain-changes.adoc[]
+*** xref:collapse-and-expand-results.adoc[]
+*** xref:result-grouping.adoc[]
+*** xref:result-clustering.adoc[]
+*** xref:highlighting.adoc[]
+*** xref:query-elevation-component.adoc[]
+*** xref:document-transformers.adoc[]
+*** xref:response-writers.adoc[]
+*** xref:exporting-result-sets.adoc[]
+*** xref:pagination-of-results.adoc[]
+
+** xref:streaming-expressions.adoc[]
+*** xref:stream-source-reference.adoc[]
+*** xref:stream-decorator-reference.adoc[]
+*** xref:stream-evaluator-reference.adoc[]
+*** xref:math-expressions.adoc[]
+**** xref:visualization.adoc[]
+**** xref:math-start.adoc[]
+**** xref:loading.adoc[]
+**** xref:search-sample.adoc[]
+**** xref:transform.adoc[]
+**** xref:scalar-math.adoc[]
+**** xref:vector-math.adoc[]
+**** xref:variables.adoc[]
+**** xref:matrix-math.adoc[]
+**** xref:term-vectors.adoc[]
+**** xref:probability-distributions.adoc[]
+**** xref:statistics.adoc[]
+**** xref:regression.adoc[]
+**** xref:curve-fitting.adoc[]
+**** xref:time-series.adoc[]
+**** xref:numerical-analysis.adoc[]
+**** xref:dsp.adoc[]
+**** xref:simulations.adoc[]
+**** xref:machine-learning.adoc[]
+**** xref:graph.adoc[]
+**** xref:computational-geometry.adoc[]
+**** xref:logs.adoc[]
+*** xref:graph-traversal.adoc[]
+*** xref:stream-api.adoc[]
+*** xref:stream-screen.adoc[]
diff --cc solr/solr-ref-guide/package-lock.json
index f66cee0,0000000..499e3e6
mode 100644,000000..100644
--- a/solr/solr-ref-guide/package-lock.json
+++ b/solr/solr-ref-guide/package-lock.json
@@@ -1,1683 -1,0 +1,1683 @@@
+{
+ "requires": true,
+ "lockfileVersion": 1,
+ "dependencies": {
+ "@antora/asciidoc-loader": {
+ "version": "3.0.0-alpha.10",
+ "resolved": "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-3.0.0-alpha.10.tgz",
+ "integrity": "sha512-79tQSwCDg9YJ0OUivwRT6AZ8xO0kqrdZcUVMVRkB2IjK4Bsa5jjc1+1zMO6FxfSv00WU0HfpgAJZHKbPsfIUBA==",
+ "requires": {
+ "@antora/logger": "3.0.0-alpha.10",
+ "@antora/user-require-helper": "~2.0",
+ "@asciidoctor/core": "~2.2"
+ }
+ },
+ "@antora/content-aggregator": {
+ "version": "3.0.0-alpha.10",
+ "resolved": "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-3.0.0-alpha.10.tgz",
+ "integrity": "sha512-sguVx8dZKBu78dI1082oPbepWmY12Uq0CHukfMrj230M3nDEEVyZEVERfsmmLSCaW7ihks7tmSHkNK2tdO7yHA==",
+ "requires": {
+ "@antora/expand-path-helper": "~2.0",
+ "@antora/user-require-helper": "~2.0",
+ "braces": "~3.0",
+ "cache-directory": "~2.0",
+ "camelcase-keys": "~6.2",
+ "hpagent": "~0.1.0",
+ "isomorphic-git": "~1.10",
+ "js-yaml": "~4.1",
+ "matcher": "~4.0",
+ "multi-progress": "~4.0",
+ "picomatch": "~2.3",
+ "progress": "~2.0",
+ "should-proxy": "~1.0",
+ "simple-get": "~4.0",
+ "vinyl": "~2.2",
+ "vinyl-fs": "~3.0"
+ }
+ },
+ "@antora/content-classifier": {
+ "version": "3.0.0-alpha.10",
+ "resolved": "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-3.0.0-alpha.10.tgz",
+ "integrity": "sha512-9Z5hgvu12ls/JE79v5tNpXzH0pgQhZ04BclWab8+NGm7WB3DSFfC3z+GEYCJ7cMKtyc8ldQqpI7tip5xacFRtg==",
+ "requires": {
+ "@antora/logger": "3.0.0-alpha.10",
+ "mime-types": "~2.1",
+ "vinyl": "~2.2"
+ }
+ },
+ "@antora/document-converter": {
+ "version": "3.0.0-alpha.10",
+ "resolved": "https://registry.npmjs.org/@antora/document-converter/-/document-converter-3.0.0-alpha.10.tgz",
+ "integrity": "sha512-cZFfcACO1edH8ZX7assW85gnwh9jwtsW87huVRkKk3HK1J/4wla3d64pfFUEms9gQkmW3SsT0BB/bIGxF1TMaw==",
+ "requires": {
+ "@antora/asciidoc-loader": "3.0.0-alpha.10"
+ }
+ },
+ "@antora/expand-path-helper": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/@antora/expand-path-helper/-/expand-path-helper-2.0.0.tgz",
+ "integrity": "sha512-CSMBGC+tI21VS2kGW3PV7T2kQTM5eT3f2GTPVLttwaNYbNxDve08en/huzszHJfxo11CcEs26Ostr0F2c1QqeA=="
+ },
+ "@antora/logger": {
+ "version": "3.0.0-alpha.10",
+ "resolved": "https://registry.npmjs.org/@antora/logger/-/logger-3.0.0-alpha.10.tgz",
+ "integrity": "sha512-O/qMZ8fSWY2wrGvST3go0Nl+Q40H4RQNXwiPheRMQVrQLZzchCiYkJkcMhpDfy+Z3MWgwQvLn9J7zGRjk4xgKg==",
+ "requires": {
+ "@antora/expand-path-helper": "~2.0",
+ "pino": "~6.13",
+ "pino-pretty": "~7.1",
+ "sonic-boom": "~2.1"
+ }
+ },
+ "@antora/navigation-builder": {
+ "version": "3.0.0-alpha.10",
+ "resolved": "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-3.0.0-alpha.10.tgz",
+ "integrity": "sha512-dnNGicGRxKl1XiKzWQVLztNvcyLkEdbWN5ZSezPStkTchQAuk4S/KoHwPEaEUh4au4f+tQsRIEMY8ArXhtnJmQ==",
+ "requires": {
+ "@antora/asciidoc-loader": "3.0.0-alpha.10"
+ }
+ },
+ "@antora/page-composer": {
+ "version": "3.0.0-alpha.10",
+ "resolved": "https://registry.npmjs.org/@antora/page-composer/-/page-composer-3.0.0-alpha.10.tgz",
+ "integrity": "sha512-j5k7kxxa6Hy9vU8Lirk6Fi2GtF7ohDnhFvGuVmx7+kQbqIm9K+SStNbsMiVikWuLvIQ8Kqp+AKa3dsU0296ymQ==",
+ "requires": {
+ "@antora/logger": "3.0.0-alpha.10",
+ "handlebars": "~4.7",
+ "require-from-string": "~2.0"
+ }
+ },
+ "@antora/playbook-builder": {
+ "version": "3.0.0-alpha.10",
+ "resolved": "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-3.0.0-alpha.10.tgz",
+ "integrity": "sha512-9hEEAVNt33L+vsnbw5zULXbdD0FVKMVd1UvPah+rSkUvroP6+GMzNbsK2GNtg2+VtAci0/ChgTPx/Dq3yAinag==",
+ "requires": {
+ "@antora/logger": "3.0.0-alpha.10",
+ "@iarna/toml": "~2.2",
+ "camelcase-keys": "~6.2",
+ "convict": "~6.2",
+ "js-yaml": "~4.1",
+ "json5": "~2.2"
+ }
+ },
+ "@antora/redirect-producer": {
+ "version": "3.0.0-alpha.10",
+ "resolved": "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-3.0.0-alpha.10.tgz",
+ "integrity": "sha512-q6cx0njmUWqfYEzzBkpNi0+qVNITiEv/h4u2bewimx3KnoaKjhkFilK/ojh0xfnapT/rkBJmFwFBhxw/mJsUOQ==",
+ "requires": {
+ "@antora/asciidoc-loader": "3.0.0-alpha.10",
+ "vinyl": "~2.2"
+ }
+ },
+ "@antora/site-generator-default": {
+ "version": "3.0.0-alpha.10",
+ "resolved": "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-3.0.0-alpha.10.tgz",
+ "integrity": "sha512-6QhENIBu3mNGgfBIl+gC67YUJHV1j8EkGz4kWdqfL4P6a93/x/EVWT6GiDhAazxSuT7NFYv1kW+RDA0AetCSGg==",
+ "requires": {
+ "@antora/asciidoc-loader": "3.0.0-alpha.10",
+ "@antora/content-aggregator": "3.0.0-alpha.10",
+ "@antora/content-classifier": "3.0.0-alpha.10",
+ "@antora/document-converter": "3.0.0-alpha.10",
+ "@antora/navigation-builder": "3.0.0-alpha.10",
+ "@antora/page-composer": "3.0.0-alpha.10",
+ "@antora/playbook-builder": "3.0.0-alpha.10",
+ "@antora/redirect-producer": "3.0.0-alpha.10",
+ "@antora/site-mapper": "3.0.0-alpha.10",
+ "@antora/site-publisher": "3.0.0-alpha.10",
+ "@antora/ui-loader": "3.0.0-alpha.10",
+ "@antora/user-require-helper": "~2.0"
+ }
+ },
+ "@antora/site-mapper": {
+ "version": "3.0.0-alpha.10",
+ "resolved": "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-3.0.0-alpha.10.tgz",
+ "integrity": "sha512-aErF9Mbj7tToHWXhTc7SH3P6JZVNWnqA/ThlitCz2fL0AvlGWDGZOyLks/rn3FHRfRNIilCey9rqtrx+dhq0pw==",
+ "requires": {
+ "@antora/content-classifier": "3.0.0-alpha.10",
+ "vinyl": "~2.2"
+ }
+ },
+ "@antora/site-publisher": {
+ "version": "3.0.0-alpha.10",
+ "resolved": "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-3.0.0-alpha.10.tgz",
+ "integrity": "sha512-KTSASxiM1W4KM/5N4kvNTKWe8LT+DStbjsC+QWLC6oia2V0C5p38FCPdBTn6OZG3N0AbmI5/B+xyeqmVEwAKhA==",
+ "requires": {
+ "@antora/expand-path-helper": "~2.0",
+ "@antora/user-require-helper": "~2.0",
+ "gulp-vinyl-zip": "~2.5",
+ "vinyl": "~2.2",
+ "vinyl-fs": "~3.0"
+ }
+ },
+ "@antora/ui-loader": {
+ "version": "3.0.0-alpha.10",
+ "resolved": "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-3.0.0-alpha.10.tgz",
+ "integrity": "sha512-7aKZa4NUwGnJQT4qDbsKV0mvAx7SeCEozQVl6HMFzeMn6vhWQYlfBmWYcG54vzLaMo6lh1QOQlScl/l7OHzQ5A==",
+ "requires": {
+ "@antora/expand-path-helper": "~2.0",
+ "cache-directory": "~2.0",
+ "camelcase-keys": "~6.2",
+ "gulp-vinyl-zip": "~2.5",
+ "hpagent": "~0.1.0",
+ "js-yaml": "~4.1",
+ "minimatch-all": "~1.1",
+ "should-proxy": "~1.0",
+ "simple-concat": "~1.0",
+ "simple-get": "~4.0",
+ "vinyl": "~2.2",
+ "vinyl-fs": "~3.0"
+ }
+ },
+ "@antora/user-require-helper": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/@antora/user-require-helper/-/user-require-helper-2.0.0.tgz",
+ "integrity": "sha512-5fMfBZfw4zLoFdDAPMQX6Frik90uvfD8rXOA4UpXPOUikkX4uT1Rk6m0/4oi8oS3fcjiIl0k/7Nc+eTxW5TcQQ==",
+ "requires": {
+ "@antora/expand-path-helper": "~2.0"
+ }
+ },
+ "@asciidoctor/core": {
+ "version": "2.2.5",
+ "resolved": "https://registry.npmjs.org/@asciidoctor/core/-/core-2.2.5.tgz",
+ "integrity": "sha512-jtQPQ5EivgFbwvSyGKas4ANnMGGHPbmu791H9xrZKooA65JNI30jM2em5MvUXTTetSPgb6saUf+PJibEuSB6uw==",
+ "requires": {
+ "asciidoctor-opal-runtime": "0.3.3",
+ "unxhr": "1.0.1"
+ }
+ },
+ "@iarna/toml": {
+ "version": "2.2.5",
+ "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz",
+ "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="
+ },
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "requires": {
+ "color-convert": "^1.9.0"
+ }
+ },
+ "append-buffer": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
+ "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
+ "requires": {
+ "buffer-equal": "^1.0.0"
+ }
+ },
+ "argparse": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+ },
+ "args": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/args/-/args-5.0.1.tgz",
+ "integrity": "sha512-1kqmFCFsPffavQFGt8OxJdIcETti99kySRUPMpOhaGjL6mRJn8HFU1OxKY5bMqfZKUwTQc1mZkAjmGYaVOHFtQ==",
+ "requires": {
+ "camelcase": "5.0.0",
+ "chalk": "2.4.2",
+ "leven": "2.1.0",
+ "mri": "1.1.4"
+ }
+ },
+ "asciidoctor-opal-runtime": {
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/asciidoctor-opal-runtime/-/asciidoctor-opal-runtime-0.3.3.tgz",
+ "integrity": "sha512-/CEVNiOia8E5BMO9FLooo+Kv18K4+4JBFRJp8vUy/N5dMRAg+fRNV4HA+o6aoSC79jVU/aT5XvUpxSxSsTS8FQ==",
+ "requires": {
+ "glob": "7.1.3",
+ "unxhr": "1.0.1"
+ }
+ },
+ "async-lock": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/async-lock/-/async-lock-1.3.0.tgz",
+ "integrity": "sha512-8A7SkiisnEgME2zEedtDYPxUPzdv3x//E7n5IFktPAtMYSEAV7eNJF0rMwrVyUFj6d/8rgajLantbjcNRQYXIg=="
+ },
+ "atomic-sleep": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/atomic-sleep/-/atomic-sleep-1.0.0.tgz",
+ "integrity": "sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ=="
+ },
+ "balanced-match": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+ },
+ "brace-expansion": {
+ "version": "1.1.11",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+ "requires": {
+ "balanced-match": "^1.0.0",
+ "concat-map": "0.0.1"
+ }
+ },
+ "braces": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+ "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+ "requires": {
+ "fill-range": "^7.0.1"
+ }
+ },
+ "buffer-crc32": {
+ "version": "0.2.13",
+ "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+ "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
+ },
+ "buffer-equal": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
+ "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74="
+ },
+ "cache-directory": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/cache-directory/-/cache-directory-2.0.0.tgz",
+ "integrity": "sha512-7YKEapH+2Uikde8hySyfobXBqPKULDyHNl/lhKm7cKf/GJFdG/tU/WpLrOg2y9aUrQrWUilYqawFIiGJPS6gDA==",
+ "requires": {
+ "xdg-basedir": "^3.0.0"
+ }
+ },
+ "call-bind": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+ "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+ "requires": {
+ "function-bind": "^1.1.1",
+ "get-intrinsic": "^1.0.2"
+ }
+ },
+ "camelcase": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz",
+ "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA=="
+ },
+ "camelcase-keys": {
+ "version": "6.2.2",
+ "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
+ "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+ "requires": {
+ "camelcase": "^5.3.1",
+ "map-obj": "^4.0.0",
+ "quick-lru": "^4.0.1"
+ },
+ "dependencies": {
+ "camelcase": {
+ "version": "5.3.1",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+ }
+ }
+ },
+ "chalk": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+ "requires": {
+ "ansi-styles": "^3.2.1",
+ "escape-string-regexp": "^1.0.5",
+ "supports-color": "^5.3.0"
+ }
+ },
+ "clean-git-ref": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/clean-git-ref/-/clean-git-ref-2.0.1.tgz",
+ "integrity": "sha512-bLSptAy2P0s6hU4PzuIMKmMJJSE6gLXGH1cntDu7bWJUksvuM+7ReOK61mozULErYvP6a15rnYl0zFDef+pyPw=="
+ },
+ "clone": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+ "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18="
+ },
+ "clone-buffer": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
+ "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg="
+ },
+ "clone-stats": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
+ "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA="
+ },
+ "cloneable-readable": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
+ "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
+ "requires": {
+ "inherits": "^2.0.1",
+ "process-nextick-args": "^2.0.0",
+ "readable-stream": "^2.3.5"
+ },
+ "dependencies": {
+ "readable-stream": {
+ "version": "2.3.7",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "requires": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
+ "string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "requires": {
+ "safe-buffer": "~5.1.0"
+ }
+ }
+ }
+ },
+ "color-convert": {
+ "version": "1.9.3",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+ "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+ "requires": {
+ "color-name": "1.1.3"
+ }
+ },
+ "color-name": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+ },
+ "colorette": {
+ "version": "2.0.16",
+ "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
+ "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g=="
+ },
+ "concat-map": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+ "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+ },
+ "convert-source-map": {
+ "version": "1.8.0",
+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
+ "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
+ "requires": {
+ "safe-buffer": "~5.1.1"
+ },
+ "dependencies": {
+ "safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ }
+ }
+ },
+ "convict": {
+ "version": "6.2.1",
+ "resolved": "https://registry.npmjs.org/convict/-/convict-6.2.1.tgz",
+ "integrity": "sha512-Mn4AJiYkR3TAZH1Xm/RU7gFS/0kM5TBSAQDry8y40Aez0ASY+3boUhv+3QE5XbOXiXM2JjdhkKve3IsBvWCibQ==",
+ "requires": {
+ "lodash.clonedeep": "^4.5.0",
+ "yargs-parser": "^20.2.7"
+ }
+ },
+ "core-util-is": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
+ },
+ "crc-32": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.0.tgz",
+ "integrity": "sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA==",
+ "requires": {
+ "exit-on-epipe": "~1.0.1",
+ "printj": "~1.1.0"
+ }
+ },
+ "dateformat": {
+ "version": "4.6.3",
+ "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-4.6.3.tgz",
+ "integrity": "sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA=="
+ },
+ "decompress-response": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
+ "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
+ "requires": {
+ "mimic-response": "^2.0.0"
+ }
+ },
+ "define-properties": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+ "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+ "requires": {
+ "object-keys": "^1.0.12"
+ }
+ },
+ "diff3": {
+ "version": "0.0.3",
+ "resolved": "https://registry.npmjs.org/diff3/-/diff3-0.0.3.tgz",
+ "integrity": "sha1-1OXDpM305f4SEatC5pP8tDIVgPw="
+ },
+ "duplexify": {
+ "version": "4.1.2",
+ "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz",
+ "integrity": "sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==",
+ "requires": {
+ "end-of-stream": "^1.4.1",
+ "inherits": "^2.0.3",
+ "readable-stream": "^3.1.1",
+ "stream-shift": "^1.0.0"
+ }
+ },
+ "end-of-stream": {
+ "version": "1.4.4",
+ "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+ "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+ "requires": {
+ "once": "^1.4.0"
+ }
+ },
+ "escape-string-regexp": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+ },
+ "exit-on-epipe": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz",
+ "integrity": "sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw=="
+ },
+ "extend": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+ "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+ },
+ "fast-redact": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/fast-redact/-/fast-redact-3.0.2.tgz",
+ "integrity": "sha512-YN+CYfCVRVMUZOUPeinHNKgytM1wPI/C/UCLEi56EsY2dwwvI00kIJHJoI7pMVqGoMew8SMZ2SSfHKHULHXDsg=="
+ },
+ "fast-safe-stringify": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
+ "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA=="
+ },
+ "fastify-warning": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/fastify-warning/-/fastify-warning-0.2.0.tgz",
+ "integrity": "sha512-s1EQguBw/9qtc1p/WTY4eq9WMRIACkj+HTcOIK1in4MV5aFaQC9ZCIt0dJ7pr5bIf4lPpHvAtP2ywpTNgs7hqw=="
+ },
+ "fd-slicer": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+ "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+ "requires": {
+ "pend": "~1.2.0"
+ }
+ },
+ "fill-range": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+ "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+ "requires": {
+ "to-regex-range": "^5.0.1"
+ }
+ },
+ "flatstr": {
+ "version": "1.0.12",
+ "resolved": "https://registry.npmjs.org/flatstr/-/flatstr-1.0.12.tgz",
+ "integrity": "sha512-4zPxDyhCyiN2wIAtSLI6gc82/EjqZc1onI4Mz/l0pWrAlsSfYH/2ZIcU+e3oA2wDwbzIWNKwa23F8rh6+DRWkw=="
+ },
+ "flush-write-stream": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+ "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+ "requires": {
+ "inherits": "^2.0.3",
+ "readable-stream": "^2.3.6"
+ },
+ "dependencies": {
+ "readable-stream": {
+ "version": "2.3.7",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "requires": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
+ "string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "requires": {
+ "safe-buffer": "~5.1.0"
+ }
+ }
+ }
+ },
+ "fs-mkdirp-stream": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
+ "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
+ "requires": {
+ "graceful-fs": "^4.1.11",
+ "through2": "^2.0.3"
+ }
+ },
+ "fs.realpath": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+ },
+ "function-bind": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+ },
+ "get-intrinsic": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+ "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+ "requires": {
+ "function-bind": "^1.1.1",
+ "has": "^1.0.3",
+ "has-symbols": "^1.0.1"
+ }
+ },
+ "glob": {
+ "version": "7.1.3",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+ "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+ "requires": {
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.0.4",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
+ }
+ },
+ "glob-parent": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+ "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+ "requires": {
+ "is-glob": "^3.1.0",
+ "path-dirname": "^1.0.0"
+ }
+ },
+ "glob-stream": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
+ "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=",
+ "requires": {
+ "extend": "^3.0.0",
+ "glob": "^7.1.1",
+ "glob-parent": "^3.1.0",
+ "is-negated-glob": "^1.0.0",
+ "ordered-read-streams": "^1.0.0",
+ "pumpify": "^1.3.5",
+ "readable-stream": "^2.1.5",
+ "remove-trailing-separator": "^1.0.1",
+ "to-absolute-glob": "^2.0.0",
+ "unique-stream": "^2.0.2"
+ },
+ "dependencies": {
+ "readable-stream": {
+ "version": "2.3.7",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "requires": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
+ "string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "requires": {
+ "safe-buffer": "~5.1.0"
+ }
+ }
+ }
+ },
+ "graceful-fs": {
+ "version": "4.2.8",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
+ "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="
+ },
+ "gulp-vinyl-zip": {
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/gulp-vinyl-zip/-/gulp-vinyl-zip-2.5.0.tgz",
+ "integrity": "sha512-KPi5/2SUmkXXDvKU4L2U1dkPOP03SbhONTOgNZlL23l9Yopt+euJ1bBXwWrSMbsyh3JLW/TYuC8CI4c4Kq4qrw==",
+ "requires": {
+ "queue": "^4.2.1",
+ "through": "^2.3.8",
+ "through2": "^2.0.3",
+ "vinyl": "^2.0.2",
+ "vinyl-fs": "^3.0.3",
+ "yauzl": "^2.2.1",
+ "yazl": "^2.2.1"
+ }
+ },
+ "handlebars": {
+ "version": "4.7.7",
+ "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz",
+ "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==",
+ "requires": {
+ "minimist": "^1.2.5",
+ "neo-async": "^2.6.0",
+ "source-map": "^0.6.1",
+ "uglify-js": "^3.1.4",
+ "wordwrap": "^1.0.0"
+ }
+ },
+ "has": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+ "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+ "requires": {
+ "function-bind": "^1.1.1"
+ }
+ },
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+ },
+ "has-symbols": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+ "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
+ },
+ "hpagent": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/hpagent/-/hpagent-0.1.2.tgz",
+ "integrity": "sha512-ePqFXHtSQWAFXYmj+JtOTHr84iNrII4/QRlAAPPE+zqnKy4xJo7Ie1Y4kC7AdB+LxLxSTTzBMASsEcy0q8YyvQ=="
+ },
+ "ignore": {
- "version": "5.1.8",
- "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
- "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="
++ "version": "5.1.9",
++ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz",
++ "integrity": "sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ=="
+ },
+ "inflight": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+ "requires": {
+ "once": "^1.3.0",
+ "wrappy": "1"
+ }
+ },
+ "inherits": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+ },
+ "is-absolute": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
+ "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+ "requires": {
+ "is-relative": "^1.0.0",
+ "is-windows": "^1.0.1"
+ }
+ },
+ "is-buffer": {
+ "version": "1.1.6",
+ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+ "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+ },
+ "is-extglob": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+ "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
+ },
+ "is-glob": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+ "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+ "requires": {
+ "is-extglob": "^2.1.0"
+ }
+ },
+ "is-negated-glob": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
+ "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI="
+ },
+ "is-number": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
+ },
+ "is-relative": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
+ "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
+ "requires": {
+ "is-unc-path": "^1.0.0"
+ }
+ },
+ "is-unc-path": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
+ "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+ "requires": {
+ "unc-path-regex": "^0.1.2"
+ }
+ },
+ "is-utf8": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+ "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
+ },
+ "is-valid-glob": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
+ "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao="
+ },
+ "is-windows": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+ "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
+ },
+ "isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+ },
+ "isomorphic-git": {
+ "version": "1.10.1",
+ "resolved": "https://registry.npmjs.org/isomorphic-git/-/isomorphic-git-1.10.1.tgz",
+ "integrity": "sha512-abbPpKkykIVDJ92rtYoD4AOuT5/7PABHR2fDBrsm7H0r2ZT+MGpPL/FynrEJM6nTcFSieaIDxnHNGhfHO/v+bA==",
+ "requires": {
+ "async-lock": "^1.1.0",
+ "clean-git-ref": "^2.0.1",
+ "crc-32": "^1.2.0",
+ "diff3": "0.0.3",
+ "ignore": "^5.1.4",
+ "minimisted": "^2.0.0",
+ "pako": "^1.0.10",
+ "pify": "^4.0.1",
+ "readable-stream": "^3.4.0",
+ "sha.js": "^2.4.9",
+ "simple-get": "^3.0.2"
+ },
+ "dependencies": {
+ "simple-get": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz",
+ "integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==",
+ "requires": {
+ "decompress-response": "^4.2.0",
+ "once": "^1.3.1",
+ "simple-concat": "^1.0.0"
+ }
+ }
+ }
+ },
+ "joycon": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/joycon/-/joycon-3.0.1.tgz",
+ "integrity": "sha512-SJcJNBg32dGgxhPtM0wQqxqV0ax9k/9TaUskGDSJkSFSQOEWWvQ3zzWdGQRIUry2j1zA5+ReH13t0Mf3StuVZA=="
+ },
+ "js-yaml": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+ "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+ "requires": {
+ "argparse": "^2.0.1"
+ }
+ },
+ "json-stable-stringify-without-jsonify": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+ "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
+ },
+ "json5": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+ "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+ "requires": {
+ "minimist": "^1.2.5"
+ }
+ },
+ "lazystream": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz",
+ "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==",
+ "requires": {
+ "readable-stream": "^2.0.5"
+ },
+ "dependencies": {
+ "readable-stream": {
+ "version": "2.3.7",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "requires": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
+ "string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "requires": {
+ "safe-buffer": "~5.1.0"
+ }
+ }
+ }
+ },
+ "lead": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
+ "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
+ "requires": {
+ "flush-write-stream": "^1.0.2"
+ }
+ },
+ "leven": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz",
+ "integrity": "sha1-wuep93IJTe6dNCAq6KzORoeHVYA="
+ },
+ "lodash.clonedeep": {
+ "version": "4.5.0",
+ "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+ "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8="
+ },
+ "map-obj": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
+ "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ=="
+ },
+ "matcher": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/matcher/-/matcher-4.0.0.tgz",
+ "integrity": "sha512-S6x5wmcDmsDRRU/c2dkccDwQPXoFczc5+HpQ2lON8pnvHlnvHAHj5WlLVvw6n6vNyHuVugYrFohYxbS+pvFpKQ==",
+ "requires": {
+ "escape-string-regexp": "^4.0.0"
+ },
+ "dependencies": {
+ "escape-string-regexp": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
+ }
+ }
+ },
+ "mime-db": {
- "version": "1.50.0",
- "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz",
- "integrity": "sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A=="
++ "version": "1.51.0",
++ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
++ "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="
+ },
+ "mime-types": {
- "version": "2.1.33",
- "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz",
- "integrity": "sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==",
++ "version": "2.1.34",
++ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
++ "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
+ "requires": {
- "mime-db": "1.50.0"
++ "mime-db": "1.51.0"
+ }
+ },
+ "mimic-response": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
+ "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="
+ },
+ "minimatch": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+ "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+ "requires": {
+ "brace-expansion": "^1.1.7"
+ }
+ },
+ "minimatch-all": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/minimatch-all/-/minimatch-all-1.1.0.tgz",
+ "integrity": "sha1-QMSWonouEo0Zv3WOdrsBoMcUV4c=",
+ "requires": {
+ "minimatch": "^3.0.2"
+ }
+ },
+ "minimist": {
+ "version": "1.2.5",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+ "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+ },
+ "minimisted": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/minimisted/-/minimisted-2.0.1.tgz",
+ "integrity": "sha512-1oPjfuLQa2caorJUM8HV8lGgWCc0qqAO1MNv/k05G4qslmsndV/5WdNZrqCiyqiz3wohia2Ij2B7w2Dr7/IyrA==",
+ "requires": {
+ "minimist": "^1.2.5"
+ }
+ },
+ "mri": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/mri/-/mri-1.1.4.tgz",
+ "integrity": "sha512-6y7IjGPm8AzlvoUrwAaw1tLnUBudaS3752vcd8JtrpGGQn+rXIe63LFVHm/YMwtqAuh+LJPCFdlLYPWM1nYn6w=="
+ },
+ "multi-progress": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/multi-progress/-/multi-progress-4.0.0.tgz",
+ "integrity": "sha512-9zcjyOou3FFCKPXsmkbC3ethv51SFPoA4dJD6TscIp2pUmy26kBDZW6h9XofPELrzseSkuD7r0V+emGEeo39Pg=="
+ },
+ "neo-async": {
+ "version": "2.6.2",
+ "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
+ },
+ "normalize-path": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+ "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+ "requires": {
+ "remove-trailing-separator": "^1.0.1"
+ }
+ },
+ "now-and-later": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
+ "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==",
+ "requires": {
+ "once": "^1.3.2"
+ }
+ },
+ "object-keys": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+ "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+ },
+ "object.assign": {
+ "version": "4.1.2",
+ "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+ "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+ "requires": {
+ "call-bind": "^1.0.0",
+ "define-properties": "^1.1.3",
+ "has-symbols": "^1.0.1",
+ "object-keys": "^1.1.1"
+ }
+ },
+ "once": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+ "requires": {
+ "wrappy": "1"
+ }
+ },
+ "ordered-read-streams": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
+ "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
+ "requires": {
+ "readable-stream": "^2.0.1"
+ },
+ "dependencies": {
+ "readable-stream": {
+ "version": "2.3.7",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "requires": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
+ "string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "requires": {
+ "safe-buffer": "~5.1.0"
+ }
+ }
+ }
+ },
+ "pako": {
+ "version": "1.0.11",
+ "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+ "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
+ },
+ "path-dirname": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+ "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA="
+ },
+ "path-is-absolute": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+ },
+ "pend": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+ "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
+ },
+ "picomatch": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
+ "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="
+ },
+ "pify": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+ "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+ },
+ "pino": {
+ "version": "6.13.3",
+ "resolved": "https://registry.npmjs.org/pino/-/pino-6.13.3.tgz",
+ "integrity": "sha512-tJy6qVgkh9MwNgqX1/oYi3ehfl2Y9H0uHyEEMsBe74KinESIjdMrMQDWpcZPpPicg3VV35d/GLQZmo4QgU2Xkg==",
+ "requires": {
+ "fast-redact": "^3.0.0",
+ "fast-safe-stringify": "^2.0.8",
+ "fastify-warning": "^0.2.0",
+ "flatstr": "^1.0.12",
+ "pino-std-serializers": "^3.1.0",
+ "quick-format-unescaped": "^4.0.3",
+ "sonic-boom": "^1.0.2"
+ },
+ "dependencies": {
+ "sonic-boom": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-1.4.1.tgz",
+ "integrity": "sha512-LRHh/A8tpW7ru89lrlkU4AszXt1dbwSjVWguGrmlxE7tawVmDBlI1PILMkXAxJTwqhgsEeTHzj36D5CmHgQmNg==",
+ "requires": {
+ "atomic-sleep": "^1.0.0",
+ "flatstr": "^1.0.12"
+ }
+ }
+ }
+ },
+ "pino-abstract-transport": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/pino-abstract-transport/-/pino-abstract-transport-0.4.0.tgz",
+ "integrity": "sha512-Znl3f1ntZnDG+NpCyJyJDS+lkrlRSbgQBkV3eqNAvet/QHql6rhKLc4DuYRlwfc3fvV611O9NXPm5pbT9AJ50g==",
+ "requires": {
+ "duplexify": "^4.1.2",
+ "split2": "^3.2.2"
+ }
+ },
+ "pino-pretty": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/pino-pretty/-/pino-pretty-7.1.0.tgz",
+ "integrity": "sha512-khuvWuuf2ABRp388AlPOv3sOzj+zEgnj9EeFOXw1VUqmSuPK1JqKfdvITk6prhxddVgnjQtbi5x63QeIcWencw==",
+ "requires": {
+ "args": "^5.0.1",
+ "colorette": "^2.0.7",
+ "dateformat": "^4.6.3",
+ "fast-safe-stringify": "^2.0.7",
+ "joycon": "^3.0.0",
+ "pino-abstract-transport": "^0.4.0",
+ "pump": "^3.0.0",
+ "readable-stream": "^3.6.0",
+ "rfdc": "^1.3.0",
+ "secure-json-parse": "^2.4.0",
+ "sonic-boom": "^2.2.0",
+ "strip-json-comments": "^3.1.1"
+ },
+ "dependencies": {
+ "sonic-boom": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-2.3.0.tgz",
- "integrity": "sha512-lEPaw654/4/rCJHz/TNzV4GIthqCq4inO+O3aFhbdOvR1bE+2//sVkcS+xlqPdb8gdjQCEE0hE9BuvnVixbnWQ==",
++ "version": "2.3.1",
++ "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-2.3.1.tgz",
++ "integrity": "sha512-o0vJPsRiCW5Q0EmRKjNiiYGy2DqSXcxk4mY9vIBSPwmkH/e/vJ2Tq8EECd5NTiO77x8vlVN+ykDjRQJTqf7eKg==",
+ "requires": {
+ "atomic-sleep": "^1.0.0"
+ }
+ }
+ }
+ },
+ "pino-std-serializers": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-3.2.0.tgz",
+ "integrity": "sha512-EqX4pwDPrt3MuOAAUBMU0Tk5kR/YcCM5fNPEzgCO2zJ5HfX0vbiH9HbJglnyeQsN96Kznae6MWD47pZB5avTrg=="
+ },
+ "printj": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/printj/-/printj-1.1.2.tgz",
+ "integrity": "sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ=="
+ },
+ "process-nextick-args": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+ },
+ "progress": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+ "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
+ },
+ "pump": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+ "requires": {
+ "end-of-stream": "^1.1.0",
+ "once": "^1.3.1"
+ }
+ },
+ "pumpify": {
+ "version": "1.5.1",
+ "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+ "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+ "requires": {
+ "duplexify": "^3.6.0",
+ "inherits": "^2.0.3",
+ "pump": "^2.0.0"
+ },
+ "dependencies": {
+ "duplexify": {
+ "version": "3.7.1",
+ "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+ "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+ "requires": {
+ "end-of-stream": "^1.0.0",
+ "inherits": "^2.0.1",
+ "readable-stream": "^2.0.0",
+ "stream-shift": "^1.0.0"
+ }
+ },
+ "pump": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+ "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+ "requires": {
+ "end-of-stream": "^1.1.0",
+ "once": "^1.3.1"
+ }
+ },
+ "readable-stream": {
+ "version": "2.3.7",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "requires": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
+ "string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "requires": {
+ "safe-buffer": "~5.1.0"
+ }
+ }
+ }
+ },
+ "queue": {
+ "version": "4.5.1",
+ "resolved": "https://registry.npmjs.org/queue/-/queue-4.5.1.tgz",
+ "integrity": "sha512-AMD7w5hRXcFSb8s9u38acBZ+309u6GsiibP4/0YacJeaurRshogB7v/ZcVPxP5gD5+zIw6ixRHdutiYUJfwKHw==",
+ "requires": {
+ "inherits": "~2.0.0"
+ }
+ },
+ "quick-format-unescaped": {
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz",
+ "integrity": "sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg=="
+ },
+ "quick-lru": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
+ "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g=="
+ },
+ "readable-stream": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+ "requires": {
+ "inherits": "^2.0.3",
+ "string_decoder": "^1.1.1",
+ "util-deprecate": "^1.0.1"
+ }
+ },
+ "remove-bom-buffer": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
+ "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
+ "requires": {
+ "is-buffer": "^1.1.5",
+ "is-utf8": "^0.2.1"
+ }
+ },
+ "remove-bom-stream": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz",
+ "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=",
+ "requires": {
+ "remove-bom-buffer": "^3.0.0",
+ "safe-buffer": "^5.1.0",
+ "through2": "^2.0.3"
+ }
+ },
+ "remove-trailing-separator": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+ "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
+ },
+ "replace-ext": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
+ "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw=="
+ },
+ "require-from-string": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+ "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="
+ },
+ "resolve-options": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
+ "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
+ "requires": {
+ "value-or-function": "^3.0.0"
+ }
+ },
+ "rfdc": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
+ "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA=="
+ },
+ "safe-buffer": {
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+ "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+ },
+ "secure-json-parse": {
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/secure-json-parse/-/secure-json-parse-2.4.0.tgz",
+ "integrity": "sha512-Q5Z/97nbON5t/L/sH6mY2EacfjVGwrCcSi5D3btRO2GZ8pf1K1UN7Z9H5J57hjVU2Qzxr1xO+FmBhOvEkzCMmg=="
+ },
+ "sha.js": {
+ "version": "2.4.11",
+ "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+ "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+ "requires": {
+ "inherits": "^2.0.1",
+ "safe-buffer": "^5.0.1"
+ }
+ },
+ "should-proxy": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/should-proxy/-/should-proxy-1.0.4.tgz",
+ "integrity": "sha1-yAWlAav2lTlgBjSAnmL78ji6NeQ="
+ },
+ "simple-concat": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+ "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="
+ },
+ "simple-get": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.0.tgz",
+ "integrity": "sha512-ZalZGexYr3TA0SwySsr5HlgOOinS4Jsa8YB2GJ6lUNAazyAu4KG/VmzMTwAt2YVXzzVj8QmefmAonZIK2BSGcQ==",
+ "requires": {
+ "decompress-response": "^6.0.0",
+ "once": "^1.3.1",
+ "simple-concat": "^1.0.0"
+ },
+ "dependencies": {
+ "decompress-response": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+ "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+ "requires": {
+ "mimic-response": "^3.1.0"
+ }
+ },
+ "mimic-response": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+ "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="
+ }
+ }
+ },
+ "sonic-boom": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-2.1.0.tgz",
+ "integrity": "sha512-x2j9LXx27EDlyZEC32gBM+scNVMdPutU7FIKV2BOTKCnPrp7bY5BsplCMQ4shYYR3IhDSIrEXoqb6GlS+z7KyQ==",
+ "requires": {
+ "atomic-sleep": "^1.0.0"
+ }
+ },
+ "source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+ },
+ "split2": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
+ "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
+ "requires": {
+ "readable-stream": "^3.0.0"
+ }
+ },
+ "stream-shift": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
+ "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="
+ },
+ "string_decoder": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+ "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+ "requires": {
+ "safe-buffer": "~5.2.0"
+ }
+ },
+ "strip-json-comments": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+ "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
+ },
+ "supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "requires": {
+ "has-flag": "^3.0.0"
+ }
+ },
+ "through": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+ "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+ },
+ "through2": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+ "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+ "requires": {
+ "readable-stream": "~2.3.6",
+ "xtend": "~4.0.1"
+ },
+ "dependencies": {
+ "readable-stream": {
+ "version": "2.3.7",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "requires": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
+ "string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "requires": {
+ "safe-buffer": "~5.1.0"
+ }
+ }
+ }
+ },
+ "through2-filter": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
+ "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
+ "requires": {
+ "through2": "~2.0.0",
+ "xtend": "~4.0.0"
+ }
+ },
+ "to-absolute-glob": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
+ "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
+ "requires": {
+ "is-absolute": "^1.0.0",
+ "is-negated-glob": "^1.0.0"
+ }
+ },
+ "to-regex-range": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+ "requires": {
+ "is-number": "^7.0.0"
+ }
+ },
+ "to-through": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
+ "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
+ "requires": {
+ "through2": "^2.0.3"
+ }
+ },
+ "uglify-js": {
- "version": "3.14.2",
- "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.2.tgz",
- "integrity": "sha512-rtPMlmcO4agTUfz10CbgJ1k6UAoXM2gWb3GoMPPZB/+/Ackf8lNWk11K4rYi2D0apgoFRLtQOZhb+/iGNJq26A=="
++ "version": "3.14.3",
++ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.3.tgz",
++ "integrity": "sha512-mic3aOdiq01DuSVx0TseaEzMIVqebMZ0Z3vaeDhFEh9bsc24hV1TFvN74reA2vs08D0ZWfNjAcJ3UbVLaBss+g=="
+ },
+ "unc-path-regex": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
+ "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo="
+ },
+ "unique-stream": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
+ "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
+ "requires": {
+ "json-stable-stringify-without-jsonify": "^1.0.1",
+ "through2-filter": "^3.0.0"
+ }
+ },
+ "unxhr": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/unxhr/-/unxhr-1.0.1.tgz",
+ "integrity": "sha512-MAhukhVHyaLGDjyDYhy8gVjWJyhTECCdNsLwlMoGFoNJ3o79fpQhtQuzmAE4IxCMDwraF4cW8ZjpAV0m9CRQbg=="
+ },
+ "util-deprecate": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+ },
+ "value-or-function": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
+ "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM="
+ },
+ "vinyl": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
+ "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
+ "requires": {
+ "clone": "^2.1.1",
+ "clone-buffer": "^1.0.0",
+ "clone-stats": "^1.0.0",
+ "cloneable-readable": "^1.0.0",
+ "remove-trailing-separator": "^1.0.1",
+ "replace-ext": "^1.0.0"
+ }
+ },
+ "vinyl-fs": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
+ "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
+ "requires": {
+ "fs-mkdirp-stream": "^1.0.0",
+ "glob-stream": "^6.1.0",
+ "graceful-fs": "^4.0.0",
+ "is-valid-glob": "^1.0.0",
+ "lazystream": "^1.0.0",
+ "lead": "^1.0.0",
+ "object.assign": "^4.0.4",
+ "pumpify": "^1.3.5",
+ "readable-stream": "^2.3.3",
+ "remove-bom-buffer": "^3.0.0",
+ "remove-bom-stream": "^1.2.0",
+ "resolve-options": "^1.1.0",
+ "through2": "^2.0.0",
+ "to-through": "^2.0.0",
+ "value-or-function": "^3.0.0",
+ "vinyl": "^2.0.0",
+ "vinyl-sourcemap": "^1.1.0"
+ },
+ "dependencies": {
+ "readable-stream": {
+ "version": "2.3.7",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "requires": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
+ "string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "requires": {
+ "safe-buffer": "~5.1.0"
+ }
+ }
+ }
+ },
+ "vinyl-sourcemap": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz",
+ "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=",
+ "requires": {
+ "append-buffer": "^1.0.2",
+ "convert-source-map": "^1.5.0",
+ "graceful-fs": "^4.1.6",
+ "normalize-path": "^2.1.1",
+ "now-and-later": "^2.0.0",
+ "remove-bom-buffer": "^3.0.0",
+ "vinyl": "^2.0.0"
+ }
+ },
+ "wordwrap": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+ "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus="
+ },
+ "wrappy": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+ },
+ "xdg-basedir": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
+ "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ="
+ },
+ "xtend": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
+ },
+ "yargs-parser": {
+ "version": "20.2.9",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+ "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="
+ },
+ "yauzl": {
+ "version": "2.10.0",
+ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+ "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+ "requires": {
+ "buffer-crc32": "~0.2.3",
+ "fd-slicer": "~1.1.0"
+ }
+ },
+ "yazl": {
+ "version": "2.5.1",
+ "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz",
+ "integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==",
+ "requires": {
+ "buffer-crc32": "~0.2.3"
+ }
+ }
+ }
+}