Skip to content

Commit

Permalink
8296619: Upgrade jQuery to 3.6.1
Browse files Browse the repository at this point in the history 
Reviewed-by: jjg
  • Loading branch information
@hns
hns committed Dec 5, 2022
1 parent a38c63d commit 6a7a0db
Show file tree
Hide file tree
Showing 7 changed files with 130 additions and 102 deletions.
2 changes: 0 additions & 2 deletions ...lasses/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-3.6.0.min.js
View file

This file was deleted.

Loading

3 comments on commit 6a7a0db

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Review

Issues

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on 6a7a0db Jan 16, 2023

Choose a reason for hiding this comment

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

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 6a7a0db Jan 16, 2023

Choose a reason for hiding this comment

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

@GoeLin Could not automatically backport 6a7a0db5 to openjdk/jdk11u-dev due to conflicts in the following files:

  • src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-3.6.0.js
  • src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-3.6.0.min.js
  • src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-3.6.0.js
  • src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-3.6.1.min.js
  • src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-3.6.0.js
  • test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java
  • test/langtools/jdk/javadoc/tool/api/basic/APITest.java

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk11u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk11u-dev master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b GoeLin-backport-6a7a0db5

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk 6a7a0db587446160e77c9ac225669e5a0c9bc638

# Backport the commit
$ git cherry-pick --no-commit 6a7a0db587446160e77c9ac225669e5a0c9bc638
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 6a7a0db587446160e77c9ac225669e5a0c9bc638'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk11u-dev with the title Backport 6a7a0db587446160e77c9ac225669e5a0c9bc638.

Please sign in to comment.