Skip to content

8277475: Update JDK_DOCS property to point to JDK 17 docs#686

Closed
kevinrushforth wants to merge 1 commit intoopenjdk:masterfrom
kevinrushforth:8277475-docs-jdk17
Closed

8277475: Update JDK_DOCS property to point to JDK 17 docs#686
kevinrushforth wants to merge 1 commit intoopenjdk:masterfrom
kevinrushforth:8277475-docs-jdk17

Conversation

@kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Nov 30, 2021

We are still pointing to the JDK 12 API docs when building the JavaFX docs. This PR updates the build to point to the JDK 17 API docs.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8277475: Update JDK_DOCS property to point to JDK 17 docs

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jfx pull/686/head:pull/686
$ git checkout pull/686

Update a local copy of the PR:
$ git checkout pull/686
$ git pull https://git.openjdk.java.net/jfx pull/686/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 686

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jfx/pull/686.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 30, 2021

👋 Welcome back kcr! 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 added the rfr Ready for review label Nov 30, 2021
@mlbridge
Copy link

mlbridge bot commented Nov 30, 2021

Webrevs

Copy link
Collaborator

@johanvos johanvos left a comment

Choose a reason for hiding this comment

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

This works and it is a good fix.
Out of interest, I wonder if the entry in the verification-metadata matters.
I modified the sha256 value in the verification metadata to a wrong value, but it still works.
(modifying the URL for JavaSE 17 broke the process).

@openjdk
Copy link

openjdk bot commented Nov 30, 2021

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

8277475: Update JDK_DOCS property to point to JDK 17 docs

Reviewed-by: jvos

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:

  • b257647: 8276847: JSException: ReferenceError: Can't find variable: IntersectionObserver

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 Ready to be integrated label Nov 30, 2021
@kevinrushforth
Copy link
Member Author

Out of interest, I wonder if the entry in the verification-metadata matters.

This entry is the checksum of a zip bundle we use for internal builds, since our builds are done behind a firewall with no proxy set. Here is the note from the JBS Description explaining this:

"I will need to also create and host a zip bundle and add its checksum to gradle/verification-metadata.xml -- see JDK-8266757 -- to avoid breaking our internal CI build."

@kevinrushforth
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Dec 1, 2021

Going to push as commit 3d57213.
Since your change was applied there has been 1 commit pushed to the master branch:

  • b257647: 8276847: JSException: ReferenceError: Can't find variable: IntersectionObserver

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Dec 1, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Ready to be integrated rfr Ready for review labels Dec 1, 2021
@openjdk
Copy link

openjdk bot commented Dec 1, 2021

@kevinrushforth Pushed as commit 3d57213.

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

@kevinrushforth kevinrushforth deleted the 8277475-docs-jdk17 branch December 1, 2021 13:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants