Skip to content

fix: Package json hash difference between linux and windows#24321

Merged
caalador merged 2 commits into
mainfrom
issues/24305-has-diff-win-linux
May 12, 2026
Merged

fix: Package json hash difference between linux and windows#24321
caalador merged 2 commits into
mainfrom
issues/24305-has-diff-win-linux

Conversation

@caalador
Copy link
Copy Markdown
Contributor

@caalador caalador commented May 12, 2026

Windows and Linux generated a different
hash for the package json content
as jackson default indenter
used system line separator.

Fixes #24305

@caalador
fix: Package json hash difference between linux and windows
65b0259 
Windows and Linux generated a different
hash for the package json content
as jackson default indenter
used system line separator.

Fixes #24305
@caalador caalador added target/25.0 Cherry-pick to 25.0 branch target/25.1 labels May 12, 2026
@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 12, 2026 •
edited
Loading

Test Results

 1 406 files  ±0   1 406 suites  ±0   1h 20m 37s ⏱️ - 1m 24s
10 140 tests +1  10 070 ✅ +1  70 💤 ±0  0 ❌ ±0 
10 615 runs  +1  10 536 ✅ +1  79 💤 ±0  0 ❌ ±0 

Results for commit 22895c1. ± Comparison against base commit 126b8bc.

♻️ This comment has been updated with latest results.

tltv
tltv reviewed May 12, 2026
View reviewed changes
Comment thread flow-server/src/main/java/com/vaadin/flow/internal/JacksonUtils.java
@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud Bot commented May 12, 2026

Quality Gate Passed Quality Gate passed

Issues
Image 0 New issues
Image 0 Accepted issues

Measures
Image 0 Security Hotspots
Image 0.0% Coverage on New Code
Image 0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@caalador caalador added this pull request to the merge queue May 12, 2026
Merged via the queue into main with commit 8b159ae May 12, 2026
31 checks passed
@caalador caalador deleted the issues/24305-has-diff-win-linux branch May 12, 2026 13:29
@vaadin-bot vaadin-bot mentioned this pull request May 12, 2026
Merged
@vaadin-bot
Copy link
Copy Markdown
Collaborator

vaadin-bot commented May 12, 2026

Hi @caalador and @caalador, when i performed cherry-pick to this commit to 25.0, i have encountered the following issue. Can you take a look and pick it manually?
Error Message:
Error: Command failed: git cherry-pick 8b159ae
error: could not apply 8b159ae... fix: Package json hash difference between linux and windows (#24321)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

vaadin-bot added a commit that referenced this pull request May 12, 2026
@vaadin-bot @caalador
fix: Package json hash difference between linux and windows (#24321) …
de7942d 
…(CP: 25.1) (#24328)

This PR cherry-picks changes from the original PR #24321 to branch 25.1.
---
#### Original PR description
> Windows and Linux generated a different
> hash for the package json content
> as jackson default indenter
> used system line separator.
> 
> Fixes #24305
>

Co-authored-by: caalador <mikael.grankvist@vaadin.com>
caalador added a commit that referenced this pull request May 13, 2026
@caalador
fix: Package json hash difference between linux and windows (#24321)
d340403 
Windows and Linux generated a different
hash for the package json content
as jackson default indenter
used system line separator.

Fixes #24305
caalador added a commit that referenced this pull request May 13, 2026
@caalador
fix: Package json hash difference between linux and windows (#24321)
f6e966f 
Windows and Linux generated a different
hash for the package json content
as jackson default indenter
used system line separator.

Fixes #24305
caalador added a commit that referenced this pull request May 13, 2026
@caalador
fix: Package json hash difference between linux and windows (#24321)
8ca7049 
Windows and Linux generated a different
hash for the package json content
as jackson default indenter
used system line separator.

Fixes #24305
caalador added a commit that referenced this pull request May 13, 2026
@caalador
fix: Package json hash difference between linux and windows (#24321) (#…
61bfa84 
…24329)

Windows and Linux generated a different
hash for the package json content
as jackson default indenter
used system line separator.

Fixes #24305
@vaadin-bot
Copy link
Copy Markdown
Collaborator

vaadin-bot commented May 18, 2026

This ticket/PR has been released with Vaadin 25.2.0-alpha7.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tltv tltv tltv approved these changes

Assignees

No one assigned

Labels

cherry-picked-25.1 need to pick manually 25.0 Released with Vaadin 25.2.0-alpha7 target/25.0 Cherry-pick to 25.0 branch target/25.1 +0.0.1

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

vaadin.hash in package.json changes between Windows and Linux builds with identical dependencies

3 participants

@caalador @vaadin-bot @tltv