Skip to content

Conversation

kvergizova
Copy link
Contributor

@kvergizova kvergizova commented Aug 21, 2025

I'd like to backport it for parity with Oracle 8u.
11u patch applies almost cleanly, except for a license update in THIRD_PARTY_README instead of lcms.md.
I also fixed the file paths in UPDATING.txt instructions so that they match the paths in OpenJDK8.

GHA testing revealed no regressions, additionally tested manually with J2Ddemo.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8297088 needs maintainer approval

Issue

  • JDK-8297088: Update LCMS to 2.14 (Bug - P3 - Approved)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u-dev.git pull/677/head:pull/677
$ git checkout pull/677

Update a local copy of the PR:
$ git checkout pull/677
$ git pull https://git.openjdk.org/jdk8u-dev.git pull/677/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 677

View PR using the GUI difftool:
$ git pr show -t 677

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/677.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 21, 2025

👋 Welcome back evergizova! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Aug 21, 2025

@kvergizova This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8297088: Update LCMS to 2.14

Reviewed-by: abakhtin, andrew

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 5 new commits pushed to the master branch:

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@alexeybakhtin, @gnu-andrew) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot changed the title Backport 01b213899cb8124860441fa26c9652b4a4bff896 8297088: Update LCMS to 2.14 Aug 21, 2025
@openjdk
Copy link

openjdk bot commented Aug 21, 2025

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Aug 21, 2025
@mlbridge
Copy link

mlbridge bot commented Aug 21, 2025

Webrevs

@openjdk openjdk bot mentioned this pull request Aug 21, 2025
4 tasks
Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

Patch itself looks ok. Could you re-run the Windows x86_64 build? It seems to be failing in an odd way (failing to build FreeType) that I can't see is related to the change.

@kvergizova
Copy link
Contributor Author

Patch itself looks ok. Could you re-run the Windows x86_64 build? It seems to be failing in an odd way (failing to build FreeType) that I can't see is related to the change.

@gnu-andrew, thanks for the review.
It looks like the problem with Windows builds were fixed by 41e6bf7

All builds have passed successfully after the merge, and the remaining test failures don't seem to be related to the backport:

  • security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#actalisauthenticationrootca
  • gc/concurrentMarkSweep/SystemGCOnForegroundCollector.java
  • runtime/7158988/FieldMonitor.java

@gnu-andrew
Copy link
Member

Patch itself looks ok. Could you re-run the Windows x86_64 build? It seems to be failing in an odd way (failing to build FreeType) that I can't see is related to the change.

@gnu-andrew, thanks for the review. It looks like the problem with Windows builds were fixed by 41e6bf7

All builds have passed successfully after the merge, and the remaining test failures don't seem to be related to the backport:

* security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#actalisauthenticationrootca

* gc/concurrentMarkSweep/SystemGCOnForegroundCollector.java

* runtime/7158988/FieldMonitor.java

Thanks for re-testing. It's good to hear that this fixed the build as the relationship between the two wasn't clear from the build failure.

8u482 is open now, so please apply for approval to get this in.

Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

Issues with Windows build resolved.

@openjdk
Copy link

openjdk bot commented Sep 3, 2025

⚠️ @kvergizova This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@kvergizova
Copy link
Contributor Author

/approval request I'd like to backport this for parity with Oracle 8u.
11u patch applies almost cleanly, except for a license update in THIRD_PARTY_README instead of lcms.md.
No new issues found in GHA testing, additionally tested manually with J2Ddemo.

@openjdk
Copy link

openjdk bot commented Sep 3, 2025

@kvergizova
8297088: The approval request has been created successfully.

@openjdk openjdk bot added the approval Requires approval; will be removed when approval is received label Sep 3, 2025
@mrserb
Copy link
Member

mrserb commented Sep 8, 2025

No new issues found in GHA testing, additionally tested manually with J2Ddemo.

This is not enough test coverage, CMM tests are not part of GA testing, you need to run at least headless tests from the jdk_desktop group, or directly: java/awt/color* and sun/java2d/cmm*. This is applicable to all backports for lcms including 11u.

@kvergizova
Copy link
Contributor Author

No new issues found in GHA testing, additionally tested manually with J2Ddemo.

This is not enough test coverage, CMM tests are not part of GA testing, you need to run at least headless tests from the jdk_desktop group, or directly: java/awt/color* and sun/java2d/cmm*. This is applicable to all backports for lcms including 11u.

Thanks, java/awt/color/* and sun/java2d/cmm/* tests passed successfully

@gnu-andrew
Copy link
Member

Sorry for the delay in getting back to this.
/approve yes

@openjdk
Copy link

openjdk bot commented Sep 17, 2025

@gnu-andrew
8297088: The approval request has been approved.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Sep 17, 2025
@kvergizova
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Sep 17, 2025
@openjdk
Copy link

openjdk bot commented Sep 17, 2025

@kvergizova
Your change (at version 6f31652) is now ready to be sponsored by a Committer.

@gnu-andrew
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Sep 17, 2025

Going to push as commit 9a4bc2d.
Since your change was applied there have been 6 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Sep 17, 2025
@openjdk openjdk bot closed this Sep 17, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Sep 17, 2025
@openjdk
Copy link

openjdk bot commented Sep 17, 2025

@gnu-andrew @kvergizova Pushed as commit 9a4bc2d.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Port of a pull request already in a different code base integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants