Skip to content

Conversation

@MBaesken
Copy link
Member

@MBaesken MBaesken commented Mar 21, 2022

Hello, I would like to backport harfbuzz 2.8.0 to 11u-dev, so that a current harfbuzz version is used there that includes latest fixes. Awt2dLibraries.gmk needed a bit of manual adjustments.
As a preparation https://bugs.openjdk.java.net/browse/JDK-8282588 had been done recently.

Discussion about this issue
https://mail.openjdk.java.net/pipermail/jdk-updates-dev/2022-January/thread.html#11411
https://mail.openjdk.java.net/pipermail/jdk-updates-dev/2022-February/thread.html#11937
https://mail.openjdk.java.net/pipermail/jdk-updates-dev/2022-March/thread.html#12497

Thanks, Matthias


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/929/head:pull/929
$ git checkout pull/929

Update a local copy of the PR:
$ git checkout pull/929
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/929/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 929

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/929.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 21, 2022

👋 Welcome back mbaesken! 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 openjdk bot added the rfr Pull request is ready for review label Mar 21, 2022
@mlbridge
Copy link

mlbridge bot commented Mar 21, 2022

Webrevs

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

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

Backport looks good. Harfbuzz matches the version from 13u-dev exactly, now.
Note that Skara doesn't recognize it as backport. I suggest to change the bug id to JDK-8267977 which was already created for this backport.
Please check if https://bugs.openjdk.java.net/browse/JDK-8266545 is also needed.

@openjdk
Copy link

openjdk bot commented Mar 22, 2022

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

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

8261169: Upgrade HarfBuzz to the latest 2.8.0

Reviewed-by: mdoerr

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 6 new commits pushed to the master branch:

  • 79c45a5: 8278851: Correct signer logic for jars signed with multiple digestalgs
  • 31d7b5e: 8222926: Shenandoah build fails with --with-jvm-features=-compiler1
  • 7c29f0e: 8243666: ModuleHashes attribute generated for JMOD and JAR files depends on timestamps
  • 03da67b: 8265261: java/nio/file/Files/InterruptCopy.java fails with java.lang.RuntimeException: Copy was not interrupted
  • 9714b69: 8206330: Revisit com/sun/jdi/RedefineCrossEvent.java
  • d568fc8: 8283420: [AOT] Exclude TrackedFlagTest/NotTrackedFlagTest in 11u because of intermittent java.lang.AssertionError: duplicate classes for name Ljava/lang/Boolean;

Please see this link for an up-to-date comparison between the source branch of this pull request and 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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 22, 2022
@MBaesken MBaesken changed the title JDK-8261169: Upgrade HarfBuzz to the latest 2.8.0 Backport 80323b7f66541e24177d02cc668a2eb9267962b9 Mar 22, 2022
@openjdk openjdk bot changed the title Backport 80323b7f66541e24177d02cc668a2eb9267962b9 8261169: Upgrade HarfBuzz to the latest 2.8.0 Mar 22, 2022
@openjdk
Copy link

openjdk bot commented Mar 22, 2022

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

@openjdk openjdk bot added the backport Port of a pull request already in a different code base label Mar 22, 2022
@MBaesken
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Mar 23, 2022

Going to push as commit 088445f.
Since your change was applied there have been 7 commits pushed to the master branch:

  • b0d7b5a: 8193682: Infinite loop in ZipOutputStream.close()
  • 79c45a5: 8278851: Correct signer logic for jars signed with multiple digestalgs
  • 31d7b5e: 8222926: Shenandoah build fails with --with-jvm-features=-compiler1
  • 7c29f0e: 8243666: ModuleHashes attribute generated for JMOD and JAR files depends on timestamps
  • 03da67b: 8265261: java/nio/file/Files/InterruptCopy.java fails with java.lang.RuntimeException: Copy was not interrupted
  • 9714b69: 8206330: Revisit com/sun/jdi/RedefineCrossEvent.java
  • d568fc8: 8283420: [AOT] Exclude TrackedFlagTest/NotTrackedFlagTest in 11u because of intermittent java.lang.AssertionError: duplicate classes for name Ljava/lang/Boolean;

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 23, 2022
@openjdk openjdk bot closed this Mar 23, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 23, 2022
@openjdk
Copy link

openjdk bot commented Mar 23, 2022

@MBaesken Pushed as commit 088445f.

💡 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.

2 participants