Skip to content
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.

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

8296619: Upgrade jQuery to 3.6.1 #1035

Closed
wants to merge 4 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jan 4, 2023

I backport this for parity with 17.0.7-oracle.

Resolved one hunk in TestSearch.java because there is jquery-ui.overrides.css
in the context.

Later I added an edit to HtmDoclet.java which is needed in 17.


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

Issue

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1035

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 4, 2023

👋 Welcome back goetz! 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 changed the title Backport 6a7a0db587446160e77c9ac225669e5a0c9bc638 8296619: Upgrade jQuery to 3.6.1 Jan 4, 2023
@openjdk
Copy link

openjdk bot commented Jan 4, 2023

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

@openjdk
Copy link

openjdk bot commented Jan 4, 2023

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

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

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

8296619: Upgrade jQuery to 3.6.1

Reviewed-by: mbaesken

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 1 new commit pushed to the master branch:

  • 072bdfb: 8297523: Various GetPrimitiveArrayCritical miss result - NULL check

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 ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 4, 2023
@mlbridge
Copy link

mlbridge bot commented Jan 4, 2023

Webrevs

@openjdk openjdk bot removed clean ready Pull request is ready to be integrated labels Jan 9, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Jan 11, 2023

Pre-submit fialure: "Unable to fetch some archives, maybe run apt-get update or try with --fix-missing?" unrelated, infra problems

Copy link
Member

@MBaesken MBaesken left a comment

Choose a reason for hiding this comment

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

LGTM

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 11, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Jan 12, 2023

/integrate

Thanks for the review!

@openjdk
Copy link

openjdk bot commented Jan 12, 2023

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

  • 0db4add: 8286707: JFR: Don't commit JFR internal jdk.JavaMonitorWait events
  • eceb480: 8267038: Update IANA Language Subtag Registry to Version 2022-03-02
  • ffecc39: 8295788: C2 compilation hits "assert((mode == ControlAroundStripMined && use == sfpt) || !use->is_reachable_from_root()) failed: missed a node"
  • 520ae87: 8284165: Add pid to process reaper thread name
  • 3722edc: 8284726: Print active locale settings in hs_err reports and in VM.info
  • 2defeb0: 8290067: Show stack dimensions in UL logging when attaching threads
  • 072bdfb: 8297523: Various GetPrimitiveArrayCritical miss result - NULL check

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 12, 2023

@GoeLin Pushed as commit ead3081.

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

@GoeLin GoeLin deleted the goetz_backport_8296619 branch January 12, 2023 14:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants