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 #487

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jun 21, 2022

I backport this for parity with 17.0.5-oracle.

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
I had to adapt this becasue "8248863: Add search landing page to API documentation" is not in 17.

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css
Here also lack of "8248863: Add search landing page to API documentation" causes conflicts,
but more changes are missing here.

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java
The removed variable is not defined in 17. It was also added in 8248863.

test/langtools/jdk/javadoc/tool/api/basic/APITest.java
Adapted.


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/487/head:pull/487
$ git checkout pull/487

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 487

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 21, 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 ac41b78cfbb94f0b0e9a15cfcc50bdddc43811e9 8284367: JQuery UI upgrade from 1.12.1 to 1.13.1 Jun 21, 2022
@openjdk
Copy link

openjdk bot commented Jun 21, 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 Jun 21, 2022
@mlbridge
Copy link

mlbridge bot commented Jun 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.

LGTM.

@openjdk
Copy link

openjdk bot commented Jun 21, 2022

@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:

8284367: JQuery UI upgrade from 1.12.1 to 1.13.1

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 Jun 21, 2022
@GoeLin
Copy link
Member Author

GoeLin commented Jun 22, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Jun 22, 2022

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

  • c1e544f: 8286638: C2: CmpU needs to do more precise over/underflow analysis
  • b91c492: 8282555: Missing memory edge when spilling MoveF2I, MoveD2L etc
  • e0750eb: 8265360: several compiler/whitebox tests fail with "private compiler.whitebox.SimpleTestCaseHelper(int) must be compiled"
  • 9f57018: 8274597: Some of the dnd tests time out and fail intermittently
  • d798aa2: 8284521: Write an automated regression test for RFE 4371575
  • 3b8f43e: 8282046: Create a regression test for JDK-8000326
  • f5e1c3f: 8079267: [TEST_BUG] Test java/awt/Frame/MiscUndecorated/RepaintTest.java fails

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jun 22, 2022
@openjdk openjdk bot closed this Jun 22, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 22, 2022
@GoeLin GoeLin deleted the goetz_backport_8286638 branch June 22, 2022 10:50
@openjdk
Copy link

openjdk bot commented Jun 22, 2022

@GoeLin Pushed as commit b7d808e.

💡 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 integrated Pull request has been integrated
2 participants