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

8284367: JQuery UI upgrade from 1.12.1 to 1.13.1 #1198

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jul 5, 2022

I backported this from 17.
After replacing script-dir with jquery in the file paths of the patch it
applies somehow. Still, the following adaptions were needed:

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
Context: jszip files are not in the list in 17.

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css
Add ".ui-autocomplete .result-item {...}".
Please review this carefully.

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java
I added JQUERY_UI_STRUCTURE_CSS by hand. The context contains JSZIP paths that are not in 17.

test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java
test/langtools/jdk/javadoc/tool/api/basic/APITest.java
Again, jszip files in the context.

Added edits also to test/langtools/tools/javadoc/api/basic/APITest.java


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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1198

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 5, 2022

👋 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 b7d808e96b68e1a648a74b5c1666304f58c347a0 8284367: JQuery UI upgrade from 1.12.1 to 1.13.1 Jul 5, 2022
@openjdk
Copy link

openjdk bot commented Jul 5, 2022

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Jul 5, 2022
@mlbridge
Copy link

mlbridge bot commented Jul 5, 2022

Webrevs

@openjdk
Copy link

openjdk bot commented Jul 18, 2022

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

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

8284367: JQuery UI upgrade from 1.12.1 to 1.13.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 25 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.

➡️ 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 Jul 18, 2022
@GoeLin
Copy link
Member Author

GoeLin commented Jul 26, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Jul 26, 2022

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

  • 37ca256: 8285097: Duplicate XML keys in XPATHErrorResources.java and XSLTErrorResources.java
  • a1a0459: 8290886: [11u]: Backport of JDK-8266250 introduced test failures
  • 69a3003: 8289853: Update HarfBuzz to 4.4.1
  • c291490: 8283087: Create a test or JDK-4715503
  • f53f3e6: 8282548: Create a regression test for JDK-4330998
  • 32d002f: 8282234: Create a regression test for JDK-4532513
  • 6fe25c7: 8282343: Create a regression test for JDK-4518432
  • 458c611: 8169468: NoResizeEventOnDMChangeTest.java fails because FS Window didn't receive all resizes!
  • 7d065b5: 6854300: [TEST_BUG] java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_3.java fails in jdk6u14 & jdk7
  • be044d4: 8017175: [TESTBUG] javax/swing/JPopupMenu/4634626/bug4634626.java sometimes failed on mac
  • ... and 64 more: https://git.openjdk.org/jdk11u-dev/compare/4b2e41cfc5e9a58faab685969634050df4f4c7c6...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 26, 2022

@GoeLin Pushed as commit 0174134.

💡 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_8284367 branch July 26, 2022 13:42
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
2 participants