SOLR-18296: Upgrade google-java-format to 1.35.0#4573
SOLR-18296: Upgrade google-java-format to 1.35.0#4573serhiy-bzhezytskyy wants to merge 3 commits into
Conversation
janhoy
left a comment
There was a problem hiding this comment.
I think this PR should be split in two commits. One for the toml file and changelog, and another for the 35 reformatted files.
Then add the commit sha for the reformat to .git-blame-ignore-revs. This PR will then be manually pushed, not squashed.
|
I agree with Janhoy. Note that you need not manipulate this PR to "split" it; you can simply put this on hold temporarily and create another PR for the formatting matter. Once that formatting PR merges, then get this PR up to date from main, and add the commit sha janhoy mentions. |
google-java-format 1.18.1 calls a javac internal (Log$DeferredDiagnosticHandler.getDiagnostics()) whose signature changed in JDK 24, so tidy/spotlessApply throws NoSuchMethodError on JDK 24+. 1.34.0+ supports the newer JDKs; this bumps to 1.35.0. Java baseline unchanged (21). The mechanical reformatting produced by the new formatter is in a separate follow-up commit so it can be added to .git-blame-ignore-revs. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Pure mechanical reformatting from running ./gradlew tidy with the upgraded formatter. No logic changes. This commit's SHA is added to .git-blame-ignore-revs (in a follow-up) so git blame skips it. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2923730 to
252b20d
Compare
|
Thanks @janhoy and @dsmiley. I've restructured this into a fresh PR: #4578
One note on the two-PR suggestion: for a pure formatter version bump the bump Closing this in favour of #4578. |
https://issues.apache.org/jira/browse/SOLR-18296
Description
Bumps google-java-format from 1.18.1 to 1.35.0. The Java baseline is unchanged (JDK 21); this only affects the spotless code formatter.
google-java-format 1.18.1 calls a javac internal,
Log$DeferredDiagnosticHandler.getDiagnostics(), whose signature changed in JDK 24, sogradlew tidy/spotlessApplythrowsNoSuchMethodErroron JDK 24+. 1.34.0+ adds support for newer JDKs; 1.35.0 is the current release.Changes
gradle/libs.versions.toml:google-javaformat1.18.1 -> 1.35.0gradlew tidy: ~35 files reformatted (minor, mechanical — the new formatter version's rules), no logic changeschangelog/unreleased/Testing
gradlew spotlessJavaCheckpasses on Eclipse Temurin 21 and on JDK 25.Notes for reviewers
AI assistance disclosure
Per Solr's AGENTS.md / how-to-contribute guidance: this change was prepared with the assistance of an AI coding agent and reviewed by me for correctness, scope, and alignment with Solr's build conventions.