You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by kr...@apache.org on 2023/10/12 16:26:27 UTC

[solr] branch main updated (241d6f9acc5 -> 2f626feb45e)

This is an automated email from the ASF dual-hosted git repository.

krisden pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git


    from 241d6f9acc5 SOLR-17019: ZkCli should create chroot if necessary
     add f6e0e8fb4ab SOLR-17026: Upgrade to Gradle 8.4
     add 3aead25e821 SOLR-17026: Update googleJavaFormat plugin
     add 8b995431769 SOLR-17026: gradle tidy after google java format update for jdk 21
     add 11ff9b75709 GITHUB#12655: javac options via -J only when the compiler is in forked mode.
     new 2f626feb45e SOLR-17026: Add google java format upgrade tidy to blame ignore

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:
 .git-blame-ignore-revs                             |  3 ++
 build.gradle                                       |  2 +-
 .../apache/lucene/gradle/WrapperDownloader.java    |  4 +--
 gradle/hacks/turbocharge-jvm-opts.gradle           |  4 +--
 gradle/testing/defaults-tests.gradle               |  2 +-
 gradle/validation/check-environment.gradle         |  2 +-
 gradle/validation/spotless.gradle                  |  2 +-
 gradle/wrapper/gradle-wrapper.jar.sha256           |  2 +-
 gradle/wrapper/gradle-wrapper.jar.version          |  2 +-
 gradle/wrapper/gradle-wrapper.properties           |  2 +-
 gradlew                                            | 40 +++++++++++++---------
 gradlew.bat                                        | 21 ++++++++----
 solr/CHANGES.txt                                   |  2 ++
 .../api/model/CreateCollectionRequestBody.java     |  2 ++
 .../apache/solr/bench/generators/IntegersDSL.java  |  1 +
 .../org/apache/solr/bench/generators/SolrGen.java  |  1 +
 .../org/apache/solr/analysis/TokenizerChain.java   |  2 ++
 .../core/src/java/org/apache/solr/cli/SolrCLI.java |  1 +
 .../solr/cloud/DistributedClusterStateUpdater.java |  2 ++
 .../apache/solr/cloud/ExclusiveSliceProperty.java  |  1 +
 .../core/src/java/org/apache/solr/cloud/ZkCLI.java |  8 +++--
 .../org/apache/solr/cloud/ZkConfigSetService.java  |  1 +
 .../org/apache/solr/cloud/ZkDistributedLock.java   |  2 ++
 .../java/org/apache/solr/cloud/ZkShardTerms.java   |  1 +
 .../cloud/api/collections/CreateCollectionCmd.java |  1 +
 ...istributedCollectionConfigSetCommandRunner.java |  1 +
 .../cloud/api/collections/TimeRoutedAlias.java     |  1 +
 .../apache/solr/cloud/overseer/ZkStateWriter.java  |  1 +
 .../cluster/placement/impl/ReplicaMetricImpl.java  |  1 +
 .../impl/SimpleClusterAbstractionsImpl.java        |  1 +
 .../placement/plugins/AffinityPlacementConfig.java |  1 +
 .../src/java/org/apache/solr/core/CloseHook.java   |  1 +
 .../java/org/apache/solr/core/CoreContainer.java   |  2 ++
 .../solr/core/FileSystemConfigSetService.java      |  1 +
 .../src/java/org/apache/solr/core/NodeConfig.java  |  1 +
 .../java/org/apache/solr/core/SolrInfoBean.java    |  2 ++
 .../src/java/org/apache/solr/core/SolrPaths.java   |  1 +
 .../org/apache/solr/core/SolrResourceLoader.java   |  1 +
 .../snapshots/SolrSnapshotMetaDataManager.java     |  1 +
 .../apache/solr/filestore/DistribPackageStore.java |  1 +
 .../java/org/apache/solr/handler/IndexFetcher.java |  1 +
 .../apache/solr/handler/MoreLikeThisHandler.java   |  1 +
 .../apache/solr/handler/PingRequestHandler.java    |  1 +
 .../apache/solr/handler/ReplicationHandler.java    |  1 +
 .../solr/handler/admin/ConfigSetsHandler.java      |  1 +
 .../solr/handler/admin/LukeRequestHandler.java     |  2 ++
 .../solr/handler/admin/api/CoreAdminAPIBase.java   |  1 +
 .../component/PhrasesIdentificationComponent.java  | 10 ++++++
 .../handler/component/QueryElevationComponent.java |  8 +++++
 .../solr/handler/component/RangeFacetRequest.java  |  2 ++
 .../handler/component/RealTimeGetComponent.java    |  1 +
 .../apache/solr/handler/component/ShardDoc.java    |  1 +
 .../apache/solr/handler/component/StatsField.java  |  4 +++
 .../solr/handler/component/StatsValuesFactory.java |  4 +++
 .../solr/handler/tagger/OffsetCorrector.java       |  1 +
 .../solr/handler/tagger/TaggerRequestHandler.java  |  5 +++
 .../org/apache/solr/internal/csv/CSVParser.java    |  5 +++
 .../solr/internal/csv/ExtendedBufferedReader.java  |  3 ++
 .../solr/legacy/LegacyNumericTokenStream.java      |  2 ++
 .../org/apache/solr/metrics/MetricSuppliers.java   |  5 +++
 .../java/org/apache/solr/metrics/MetricsMap.java   |  4 ++-
 .../solr/metrics/reporters/SolrSlf4jReporter.java  |  1 +
 .../metrics/reporters/jmx/JmxMetricsReporter.java  |  1 +
 .../solr/metrics/reporters/solr/SolrReporter.java  |  1 +
 .../apache/solr/parser/SolrQueryParserBase.java    |  5 +++
 .../solr/pkg/PackageListeningClassLoader.java      |  1 +
 .../java/org/apache/solr/query/SolrRangeQuery.java |  1 +
 .../java/org/apache/solr/request/SimpleFacets.java |  2 ++
 .../apache/solr/response/JacksonJsonWriter.java    |  1 +
 .../apache/solr/response/RawResponseWriter.java    |  1 +
 .../apache/solr/response/TextResponseWriter.java   |  2 ++
 .../solr/response/transform/DocTransformer.java    |  1 +
 .../solr/schema/AbstractSpatialFieldType.java      |  1 +
 .../apache/solr/schema/CoordinateFieldType.java    |  1 +
 .../org/apache/solr/schema/CurrencyFieldType.java  |  1 +
 .../org/apache/solr/schema/DenseVectorField.java   |  2 ++
 .../src/java/org/apache/solr/schema/FieldType.java |  3 ++
 .../java/org/apache/solr/schema/IndexSchema.java   |  1 +
 .../org/apache/solr/schema/IndexSchemaFactory.java |  1 +
 .../solr/schema/ManagedIndexSchemaFactory.java     |  1 +
 .../java/org/apache/solr/schema/NumberType.java    |  2 ++
 .../solr/schema/OpenExchangeRatesOrgProvider.java  |  1 +
 .../java/org/apache/solr/schema/SchemaAware.java   |  1 +
 .../solr/search/CollapsingQParserPlugin.java       |  6 ++++
 .../search/EarlyTerminatingCollectorException.java |  2 ++
 .../search/EarlyTerminatingSortingCollector.java   |  1 +
 .../apache/solr/search/ExtendedDismaxQParser.java  |  2 ++
 .../java/org/apache/solr/search/FieldParams.java   |  1 +
 .../org/apache/solr/search/JoinQParserPlugin.java  |  2 ++
 .../java/org/apache/solr/search/QueryParsing.java  |  1 +
 .../src/java/org/apache/solr/search/SolrCache.java |  2 ++
 .../solr/search/facet/FacetFieldProcessor.java     |  1 +
 .../solr/search/facet/FacetRangeProcessor.java     |  2 ++
 .../org/apache/solr/search/facet/FacetRequest.java |  3 ++
 .../solr/search/facet/FacetRequestSorted.java      |  4 +++
 .../apache/solr/search/facet/RelatednessAgg.java   |  4 +++
 .../java/org/apache/solr/search/facet/SlotAcc.java |  2 ++
 .../solr/search/function/DualDoubleFunction.java   |  1 +
 .../org/apache/solr/search/join/FrontierQuery.java |  2 ++
 .../org/apache/solr/search/join/GraphQuery.java    |  5 +++
 .../org/apache/solr/search/stats/StatsCache.java   |  3 ++
 .../solr/security/PKIAuthenticationPlugin.java     |  1 +
 .../java/org/apache/solr/security/Permission.java  |  1 +
 .../apache/solr/servlet/SolrRequestParsers.java    |  1 +
 .../org/apache/solr/spelling/QueryConverter.java   |  3 ++
 .../org/apache/solr/spelling/SolrSpellChecker.java |  1 +
 .../org/apache/solr/spelling/SpellingOptions.java  |  3 ++
 .../solr/spelling/WordBreakSolrSpellChecker.java   |  7 ++++
 .../apache/solr/spelling/suggest/Suggester.java    |  3 ++
 .../org/apache/solr/uninverting/FieldCache.java    |  1 +
 .../apache/solr/update/CommitUpdateCommand.java    |  1 +
 .../apache/solr/update/DirectUpdateHandler2.java   |  1 +
 .../org/apache/solr/update/SolrIndexConfig.java    |  2 ++
 .../org/apache/solr/update/SplitIndexCommand.java  |  1 +
 .../CloneFieldUpdateProcessorFactory.java          |  1 +
 .../processor/DistributedUpdateProcessor.java      |  2 ++
 .../src/java/org/apache/solr/util/PrimUtils.java   |  1 +
 .../java/org/apache/solr/util/SolrPluginUtils.java |  3 ++
 .../apache/solr/util/hll/SerializationUtil.java    |  1 +
 .../org/apache/solr/util/stats/MetricUtils.java    |  1 +
 .../org/apache/solr/BasicFunctionalityTest.java    |  1 +
 .../src/test/org/apache/solr/CursorPagingTest.java |  2 ++
 .../apache/solr/cloud/AliasIntegrationTest.java    |  1 +
 .../cloud/MockScriptUpdateProcessorFactory.java    |  1 +
 .../test/org/apache/solr/cloud/OverseerTest.java   | 10 ++++--
 .../TestCloudPhrasesIdentificationComponent.java   |  1 +
 .../solr/cloud/TestCloudPseudoReturnFields.java    |  1 +
 .../apache/solr/cloud/TestRandomFlRTGCloud.java    |  6 ++++
 .../cloud/TestStressCloudBlindAtomicUpdates.java   |  1 +
 .../org/apache/solr/cloud/TestStressLiveNodes.java |  1 +
 .../TestTolerantUpdateProcessorRandomCloud.java    |  1 +
 .../collections/TestLocalFSCloudBackupRestore.java |  1 +
 .../solr/handler/TestStressThreadBackup.java       |  1 +
 .../solr/handler/admin/DaemonStreamApiTest.java    |  1 +
 .../admin/ZookeeperStatusHandlerFailureTest.java   |  5 ++-
 .../handler/admin/ZookeeperStatusHandlerTest.java  |  5 ++-
 .../component/DistributedDebugComponentTest.java   |  1 +
 .../handler/component/ShardsAllowListTest.java     |  1 +
 .../apache/solr/internal/csv/CSVParserTest.java    |  1 +
 .../org/apache/solr/response/SmileWriterTest.java  |  1 +
 .../apache/solr/schema/DocValuesMissingTest.java   | 31 +++++++++++++++++
 .../org/apache/solr/schema/DocValuesMultiTest.java |  1 +
 .../org/apache/solr/schema/TestCollationField.java |  1 +
 .../solr/schema/TestCollationFieldDocValues.java   |  1 +
 .../org/apache/solr/schema/TestPointFields.java    |  1 +
 .../org/apache/solr/search/QueryEqualityTest.java  |  2 ++
 .../search/TestComplexPhraseQParserPlugin.java     |  1 +
 .../solr/search/TestSurroundQueryParser.java       |  1 +
 .../solr/search/facet/RangeFacetCloudTest.java     |  3 ++
 .../search/facet/TestCloudJSONFacetJoinDomain.java |  2 ++
 .../solr/search/facet/TestCloudJSONFacetSKG.java   | 10 ++++++
 .../search/facet/TestCloudJSONFacetSKGEquiv.java   | 11 ++++++
 .../apache/solr/search/facet/TestJsonFacets.java   |  1 +
 .../function/TestMinMaxOnMultiValuedField.java     |  1 +
 .../similarities/TestClassicSimilarityFactory.java |  1 +
 .../org/apache/solr/update/AddBlockUpdateTest.java |  1 +
 .../apache/solr/update/MaxSizeAutoCommitTest.java  |  2 ++
 .../solr/update/TestInPlaceUpdatesStandalone.java  |  2 ++
 .../CategoryRoutedAliasUpdateProcessorTest.java    |  1 +
 .../update/processor/TestCloudDeduplication.java   |  1 +
 .../processor/TolerantUpdateProcessorTest.java     |  1 +
 ...ExtractNamedEntitiesUpdateProcessorFactory.java |  1 +
 .../apache/solr/schema/TestICUCollationField.java  |  1 +
 .../schema/TestICUCollationFieldDocValues.java     |  1 +
 .../extraction/ExtractingDocumentLoader.java       |  2 ++
 .../blockcache/ReusedBufferedIndexOutput.java      |  3 ++
 .../solr/hdfs/update/HdfsTransactionLog.java       |  1 +
 .../java/org/apache/solr/ltr/LTRScoringQuery.java  |  1 +
 .../solr/ltr/model/MultipleAdditiveTreesModel.java |  1 +
 .../solr/ltr/store/rest/ManagedFeatureStore.java   |  3 ++
 .../solr/ltr/store/rest/ManagedModelStore.java     |  5 +++
 .../apache/solr/ltr/model/TestAdapterModel.java    |  1 +
 .../examples/UsingSolrJRefGuideExamplesTest.java   |  1 +
 .../org/apache/solr/client/solrj/io/Tuple.java     |  1 +
 .../solr/client/solrj/io/stream/UpdateStream.java  |  1 +
 .../io/stream/eval/CoalesceEvaluatorTest.java      |  1 +
 .../client/solrj/cloud/DistribStateManager.java    | 29 ++++++++++++----
 .../client/solrj/impl/ZkDistribStateManager.java   | 26 ++++++++++----
 .../solr/common/cloud/ZkMaintenanceUtils.java      |  1 +
 .../apache/solr/common/cloud/ZkStateReader.java    |  2 ++
 .../org/apache/solr/client/solrj/SolrClient.java   |  1 +
 .../client/solrj/impl/CloudHttp2SolrClient.java    |  1 +
 .../solrj/impl/ConcurrentUpdateSolrClient.java     |  3 ++
 .../solr/client/solrj/impl/Http2SolrClient.java    |  2 ++
 .../solrj/request/CollectionAdminRequest.java      |  1 +
 .../client/solrj/request/beans/V2ApiConstants.java |  1 +
 .../solr/client/solrj/response/IntervalFacet.java  |  1 +
 .../solr/client/solrj/response/Suggestion.java     |  1 +
 .../routing/NodePreferenceRulesComparator.java     |  1 +
 .../java/org/apache/solr/cluster/api/Resource.java |  1 +
 .../org/apache/solr/cluster/api/SimpleMap.java     |  1 +
 .../java/org/apache/solr/common/ConfigNode.java    |  1 +
 .../java/org/apache/solr/common/SolrDocument.java  |  1 +
 .../solr/common/annotation/JsonProperty.java       |  1 +
 .../apache/solr/common/cloud/DocCollection.java    |  2 ++
 .../java/org/apache/solr/common/cloud/Slice.java   |  2 ++
 .../org/apache/solr/common/luke/FieldFlag.java     |  1 +
 .../solr/common/params/CollectionAdminParams.java  |  1 +
 .../solr/common/params/CommonAdminParams.java      |  8 +++++
 .../apache/solr/common/params/CommonParams.java    |  5 +++
 .../org/apache/solr/common/params/EventParams.java |  1 +
 .../org/apache/solr/common/params/FacetParams.java | 12 +++++++
 .../org/apache/solr/common/params/GroupParams.java |  1 +
 .../solr/common/params/ModifiableSolrParams.java   |  1 +
 .../solr/common/params/QueryElevationParams.java   |  1 +
 .../apache/solr/common/params/SimpleParams.java    |  9 +++++
 .../org/apache/solr/common/params/SolrParams.java  |  1 +
 .../apache/solr/common/params/SpatialParams.java   |  4 +++
 .../apache/solr/common/params/SpellingParams.java  |  6 ++++
 .../solr/common/params/TermVectorParams.java       |  5 +++
 .../org/apache/solr/common/params/TermsParams.java |  1 +
 .../solr/common/util/CommonTestInjection.java      |  1 +
 .../org/apache/solr/common/util/DataEntry.java     |  1 +
 .../org/apache/solr/common/util/JavaBinCodec.java  |  1 +
 .../apache/solr/common/util/JsonRecordReader.java  |  1 +
 .../org/apache/solr/common/util/NamedList.java     |  1 +
 .../apache/solr/common/util/PropertiesUtil.java    |  1 +
 solr/solrj/src/java/org/noggit/JSONParser.java     | 11 ++++++
 .../apache/solr/client/solrj/SolrExampleTests.java | 17 ++++++---
 .../solrj/impl/CloudHttp2SolrClientTest.java       |  2 +-
 .../client/solrj/impl/CloudSolrClientTest.java     |  2 +-
 .../src/java/org/apache/solr/SolrTestCaseJ4.java   |  9 +++++
 .../cloud/FullThrottleStoppableIndexingThread.java |  1 +
 .../apache/solr/cloud/MiniSolrCloudCluster.java    |  1 +
 .../apache/solr/cloud/SolrCloudAuthTestCase.java   |  1 +
 .../placement/ClusterAbstractionsForTest.java      |  1 +
 .../org/apache/solr/embedded/JettySolrRunner.java  |  1 +
 .../java/org/apache/solr/util/ErrorLogMuter.java   |  2 ++
 .../java/org/apache/solr/util/ExternalPaths.java   |  3 ++
 .../src/java/org/apache/solr/util/LogListener.java |  9 +++++
 .../java/org/apache/solr/util/RandomizeSSL.java    |  5 +++
 .../java/org/apache/solr/util/RestTestHarness.java |  1 +
 .../java/org/apache/solr/util/SSLTestConfig.java   | 10 +++++-
 .../src/java/org/apache/solr/util/TestHarness.java |  2 ++
 234 files changed, 604 insertions(+), 61 deletions(-)


[solr] 01/01: SOLR-17026: Add google java format upgrade tidy to blame ignore

Posted by kr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

krisden pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git

commit 2f626feb45ebdc3c10bbe08fdc4dec95352fb433
Author: Kevin Risden <kr...@apache.org>
AuthorDate: Thu Oct 12 12:25:36 2023 -0400

    SOLR-17026: Add google java format upgrade tidy to blame ignore
---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 7414ef091fe..aa4add8d6f9 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -30,3 +30,6 @@ f08f7bb3ef90381078e427f0d164a9f13afe070c
 7f7033e24169652303b7f1feb382b3d77320f9ec
 c99af207c761ec34812ef1cc3054eb2804b7448b
 
+# SOLR-17026 [google java formatter upgrade]
+8b9954317690428b13e1c6c4ed1dbdb743ab389b
+