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

8245981: Upgrade to jQuery 3.5.1 #198

Closed
wants to merge 1 commit into from

Conversation

@dimitryc
Copy link
Collaborator

@dimitryc dimitryc commented May 5, 2021

8245981: Upgrade to jQuery 3.5.1

The original patch doesn't apply cleanly.

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java
test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java
test/langtools/jdk/javadoc/tool/api/basic/APITest.java
the files have different context in 15 after [1] so I changed "jquery-3.4.1.js" to "jquery-3.5.1.js" in these files manually.

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/external/jquery/jquery.js
the file was removed in 15 after [2] so I replaced the file with new version for consistency

Testing: regression tests test/langtools/jdk/javadoc/ passed

[1] https://bugs.openjdk.java.net/browse/JDK-8236823
[2] https://bugs.openjdk.java.net/browse/JDK-8238167


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/jdk13u-dev pull/198/head:pull/198
$ git checkout pull/198

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 198

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented May 5, 2021

👋 Welcome back dcherepanov! 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 0b02c5b5e038db4b86d15a2a99a3a3fd051f406d 8245981: Upgrade to jQuery 3.5.1 May 5, 2021
@openjdk
Copy link

@openjdk openjdk bot commented May 5, 2021

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

@mlbridge
Copy link

@mlbridge mlbridge bot commented May 5, 2021

Webrevs

@yan-too
yan-too approved these changes May 6, 2021
Copy link
Collaborator

@yan-too yan-too left a comment

OK, fine with me

@openjdk
Copy link

@openjdk openjdk bot commented May 6, 2021

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

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

8245981: Upgrade to jQuery 3.5.1

Reviewed-by: yan

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:

  • 9ed07b9: 8244088: [Regression] Switch of Gnome theme ends up in deadlocked UI

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 label May 6, 2021
@dimitryc
Copy link
Collaborator Author

@dimitryc dimitryc commented May 6, 2021

/integrate

@openjdk openjdk bot closed this May 6, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels May 6, 2021
@openjdk
Copy link

@openjdk openjdk bot commented May 6, 2021

@dimitryc Since your change was applied there has been 1 commit pushed to the master branch:

  • 9ed07b9: 8244088: [Regression] Switch of Gnome theme ends up in deadlocked UI

Your commit was automatically rebased without conflicts.

Pushed as commit 8d96cc3.

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

@dimitryc dimitryc deleted the dimitryc:backport-8245981 branch May 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants