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

8282214: Upgrade JQuery to version 3.6.0 #1173

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jun 22, 2022

I backport this for parity with 11.0.17-oracle.

jquery is at another locaion in 11. I replaced script-dir by jquery in the patch. This makes it apply somehow,
except for:

src/jdk.javadoc/share/legal/jquery.md
Copyright message differs.

test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java
Formatting differs.

In addition I fixed test/langtools/tools/javadoc/api/basic/APITest.java
similar to test/langtools/jdk/javadoc/tool/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/1173/head:pull/1173
$ git checkout pull/1173

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1173

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 22, 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 5ba5e21fd2a02d15d4d56931cae4f9a978470c88 8282214: Upgrade JQuery to version 3.6.0 Jun 22, 2022
@openjdk
Copy link

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

mlbridge bot commented Jun 22, 2022

Webrevs

Copy link
Member

@tstuefe tstuefe left a comment

Choose a reason for hiding this comment

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

Ok

@openjdk
Copy link

openjdk bot commented Jun 27, 2022

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

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

8282214: Upgrade JQuery to version 3.6.0

Reviewed-by: stuefe

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

  • d7b6f7f: 8274506: TestPids.java and TestPidsLimit.java fail with podman run as root
  • 1fbbd15: 8287366: Improve test failure reporting in GHA
  • 8363d9d: 8286582: Build fails on macos aarch64 when using --with-zlib=bundled
  • 27faf15: 8273526: Extend the OSContainer API pids controller with pids.current
  • 6c389cd: 8278519: serviceability/jvmti/FieldAccessWatch/FieldAccessWatch.java failed "assert(handle != __null) failed: JNI handle should not be null"
  • 43e6fdb: 8281569: Create tests for Frame.setMinimumSize() method
  • f129738: 8288754: GCC 12 fails to build zReferenceProcessor.cpp
  • e16aaca: 8253829: Wrong length compared in SSPI bridge
  • 1c1f7a1: 8210722: JAXP Tests: CatalogSupport2 and CatalogSupport3 generate incorrect messages upon failure

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 Jun 27, 2022
@GoeLin
Copy link
Member Author

GoeLin commented Jun 29, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Jun 29, 2022

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

  • 027302b: 8284680: sun.font.FontConfigManager.getFontConfig() leaks charset
  • ab7d1ca: 8284956: Potential leak awtImageData/color_data when initializes X11GraphicsEnvironment
  • d7b6f7f: 8274506: TestPids.java and TestPidsLimit.java fail with podman run as root
  • 1fbbd15: 8287366: Improve test failure reporting in GHA
  • 8363d9d: 8286582: Build fails on macos aarch64 when using --with-zlib=bundled
  • 27faf15: 8273526: Extend the OSContainer API pids controller with pids.current
  • 6c389cd: 8278519: serviceability/jvmti/FieldAccessWatch/FieldAccessWatch.java failed "assert(handle != __null) failed: JNI handle should not be null"
  • 43e6fdb: 8281569: Create tests for Frame.setMinimumSize() method
  • f129738: 8288754: GCC 12 fails to build zReferenceProcessor.cpp
  • e16aaca: 8253829: Wrong length compared in SSPI bridge
  • ... and 1 more: https://git.openjdk.org/jdk11u-dev/compare/8138382780b16f4184ad5bbfe07ab2468afe71a8...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 29, 2022

@GoeLin Pushed as commit 97178bf.

💡 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_8282214 branch June 29, 2022 12:33
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