Skip to content

Use spotless / palantirJavaFormat - 2.56.0 for all JDKs #477

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
slawekjaranowski merged 1 commit into from
Jun 13, 2025
Merged

Use spotless / palantirJavaFormat - 2.56.0 for all JDKs #477

slawekjaranowski merged 1 commit into from
Jun 13, 2025

Conversation

@slawekjaranowski
Copy link
Member

@slawekjaranowski slawekjaranowski commented Jun 12, 2025

Spotless start using palantir-java-format 2.57.0 on Java 21 - on older jdks different versions are used.

It causes a different code format depends on using JDK

references:

As issue - diffplug/spotless#2503 was closed, reverting spotless plugin to an older version is not a resolution.

@slawekjaranowski slawekjaranowski added the bug Something isn't working label Jun 12, 2025
@slawekjaranowski slawekjaranowski added this to the 45 milestone Jun 12, 2025
@slawekjaranowski slawekjaranowski self-assigned this Jun 12, 2025
@slachiewicz
Copy link
Member

slachiewicz commented Jun 12, 2025

I don't think this is the way to go as it doesn't support Java 25

@slawekjaranowski
Copy link
Member Author

slawekjaranowski commented Jun 12, 2025

I don't think this is the way to go as it doesn't support Java 25

We don't have a Jave 25 code base yet ...

but we never version of formater we will have different format depends on JDK ...

@slawekjaranowski
Copy link
Member Author

slawekjaranowski commented Jun 12, 2025

@slachiewicz any other proposition?

@slawekjaranowski slawekjaranowski requested a review from Bukama June 12, 2025 19:57
@slachiewicz
Copy link
Member

slachiewicz commented Jun 12, 2025

Sorry, no idea yet. It's about Java 25 at runtime, IE even now, try to build our Core Maven

@slawekjaranowski
Copy link
Member Author

slawekjaranowski commented Jun 12, 2025

Sorry, no idea yet. It's about Java 25 at runtime, IE even now, try to build our Core Maven

build ok
two unit test not pass due to not resolving snapshot version of parent

@slachiewicz
Copy link
Member

slachiewicz commented Jun 13, 2025

`mvn -V spotless:check
Apache Maven 3.9.10 (5f519b97e944483d878815739f519b2eade0a91d)
Maven home: /opt/homebrew/Cellar/maven/3.9.10/libexec
Java version: 25-ea, vendor: Oracle Corporation, runtime: /Library/Java/JavaVirtualMachines/jdk-25.jdk/Contents/Home

[..]
[INFO] --- spotless:2.44.3:check (default-cli) @ maven-api ---
[INFO] Spotless.Pom is keeping 1 files clean - 0 needs changes to be clean, 0 were already clean, 1 were skipped because caching determined they were already clean
[INFO]
[INFO] ---------------< org.apache.maven:maven-api-annotations >---------------
[INFO] Building Maven 4 API :: Meta annotations 4.0.0-rc-4-SNAPSHOT [3/39]
[INFO] from api/maven-api-annotations/pom.xml
[INFO] --------------------------------[ jar ]---------------------------------
[INFO]
[INFO] --- spotless:2.44.3:check (default-cli) @ maven-api-annotations ---
[ERROR] Step 'palantir-java-format' found problem in 'Nonnull.java':
'java.util.Queue com.sun.tools.javac.util.Log$DeferredDiagnosticHandler.getDiagnostics()'
java.lang.NoSuchMethodError: 'java.util.Queue com.sun.tools.javac.util.Log$DeferredDiagnosticHandler.getDiagnostics()'
at com.palantir.javaformat.java.JavaInput.buildToks (JavaInput.java:366)
at com.palantir.javaformat.java.ImportOrderer.reorderImports (ImportOrderer.java:49)
at com.diffplug.spotless.glue.pjf.PalantirJavaFormatFormatterFunc.apply (PalantirJavaFormatFormatterFunc.java:53)

`

@slawekjaranowski
Copy link
Member Author

slawekjaranowski commented Jun 13, 2025

so with this change will be the same .... so will be not worst

[INFO] --- spotless:2.44.5:check (default-cli) @ maven-executor ---
[ERROR] Step 'palantir-java-format' found problem in 'ToolboxToolTest.java':
'java.util.Queue com.sun.tools.javac.util.Log$DeferredDiagnosticHandler.getDiagnostics()'
java.lang.NoSuchMethodError: 'java.util.Queue com.sun.tools.javac.util.Log$DeferredDiagnosticHandler.getDiagnostics()'

@slawekjaranowski
Copy link
Member Author

slawekjaranowski commented Jun 13, 2025

when java-format will be fixed we will update in next time, for me there are two isses:

@slawekjaranowski slawekjaranowski requested a review from gnodet June 13, 2025 06:22
@slawekjaranowski
Copy link
Member Author

slawekjaranowski commented Jun 13, 2025

Now we can disable spotless at all on JDK 25+ as workaround, but if we wish such I would like do it in separate PR

kwin
kwin approved these changes Jun 13, 2025
View reviewed changes
Copy link
Member

@kwin kwin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense.

@slawekjaranowski slawekjaranowski mentioned this pull request Jun 13, 2025
Merged
@slawekjaranowski
Use spotless / palantirJavaFormat - 2.56.0 for all JDKs
c0bd503 
Spotless start using palantir-java-format 2.57.0 on Java 21 - on older jdks different versions are used.

It causes a different code format depends on using JDK

references:
 - diffplug/spotless#2447
 - diffplug/spotless#2503
 - palantir/palantir-java-format#1320

As issue - diffplug/spotless#2503 was closed, reverting spotless plugin to an older version is not a resolution.
@slawekjaranowski slawekjaranowski force-pushed the spotless-platin-version branch from 13255c8 to c0bd503 Compare June 13, 2025 11:53
@slawekjaranowski
Copy link
Member Author

slawekjaranowski commented Jun 13, 2025

@slachiewicz - properties for versions added

@slawekjaranowski slawekjaranowski merged commit 9014c35 into apache:master Jun 13, 2025
3 checks passed
@slawekjaranowski slawekjaranowski deleted the spotless-platin-version branch June 13, 2025 15:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kwin kwin kwin approved these changes

@Bukama Bukama Bukama approved these changes

@slachiewicz slachiewicz slachiewicz approved these changes

@gnodet gnodet Awaiting requested review from gnodet

Assignees

@slawekjaranowski slawekjaranowski

Labels

bug Something isn't working

Projects

None yet

Milestone

45

Development

Successfully merging this pull request may close these issues.

4 participants

@slawekjaranowski @slachiewicz @kwin @Bukama