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

8248001: javadoc generates invalid HTML pages whose ftp:// links are broken #1236

Closed
wants to merge 4 commits into from

Conversation

ktakakuri
Copy link
Contributor

@ktakakuri ktakakuri commented Apr 5, 2023

I would like to backport
8248001: javadoc generates invalid HTML pages whose ftp:// links are broken.
This is a clean backport.


Progress

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

Issue

  • JDK-8248001: javadoc generates invalid HTML pages whose ftp:// links are broken

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/1236/head:pull/1236
$ git checkout pull/1236

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1236

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 5, 2023

👋 Welcome back ktakakuri! 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 bb95dda0ac5032e4df582f2903dcbbbbaef9e8c4 8248001: javadoc generates invalid HTML pages whose ftp:// links are broken Apr 5, 2023
@openjdk
Copy link

openjdk bot commented Apr 5, 2023

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

@openjdk openjdk bot added the backport label Apr 5, 2023
@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 17, 2023
@mlbridge
Copy link

mlbridge bot commented Apr 17, 2023

Webrevs

@ktakakuri
Copy link
Contributor Author

Could someone please review this backport?

@RealCLanger
Copy link
Contributor

RealCLanger commented Apr 24, 2023

Hi,

generally it looks ok. Please revert the copyright modifications. In backports, we don't increment to the current year but only take over the copyright modifications from the upstream patch, if there were any.

Also, can you please run GHA tests.

Thanks!

@openjdk openjdk bot added the clean label Apr 27, 2023
@openjdk
Copy link

openjdk bot commented Apr 27, 2023

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

8248001: javadoc generates invalid HTML pages whose ftp:// links are broken

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

  • f655ccd: 8304760: Add 2 Microsoft TLS roots
  • e55bea4: 8299544: Improve performance of CRC32C intrinsics (non-AVX-512) for small inputs
  • e7bac42: 8295974: jni_FatalError and Xcheck:jni warnings should print the native stack when there are no Java frames
  • 093f02a: 8305975: Add TWCA Global Root CA

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 27, 2023
@ktakakuri
Copy link
Contributor Author

Hi,

generally it looks ok. Please revert the copyright modifications. In backports, we don't increment to the current year but only take over the copyright modifications from the upstream patch, if there were any.

Also, can you please run GHA tests.

Thanks!

Thank you for your review.
I reverted the copyright modifications.
Is there a problem with issuing a Fix Request?

@RealCLanger
Copy link
Contributor

Looks good now (and marked as clean). The errors in windows-x64 pre-submit tests are known issues. When you merge your PR branch with current master, the issues should be gone.

Next step would be to add the jdk17u-fix-request comment and label to the JBS issue. Can you do that or shall I do it on your behalf? If the latter is the case, please provide me with some text (e.g. why you want to have it in 17u, what testing you did, what's the risk...)

@ktakakuri
Copy link
Contributor Author

Thank you, I added the label.

@RealCLanger
Copy link
Contributor

Thank you, I added the label.

Great, could you merge the PR branch with current master to eliminate the GHA failures? Did you run the langtools tests (including the one that is added here)?

I will run the PR through our nightlies. In case everything is good, I'll approve the backport.

@RealCLanger
Copy link
Contributor

I will run the PR through our nightlies. In case everything is good, I'll approve the backport.

Testing looks good. I have approved the backport - this one is ready to integrate.

@ktakakuri
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label May 17, 2023
@openjdk
Copy link

openjdk bot commented May 17, 2023

@ktakakuri
Your change (at version 4c3183a) is now ready to be sponsored by a Committer.

@RealCLanger
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented May 17, 2023

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

  • f655ccd: 8304760: Add 2 Microsoft TLS roots
  • e55bea4: 8299544: Improve performance of CRC32C intrinsics (non-AVX-512) for small inputs
  • e7bac42: 8295974: jni_FatalError and Xcheck:jni warnings should print the native stack when there are no Java frames
  • 093f02a: 8305975: Add TWCA Global Root CA

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label May 17, 2023
@openjdk openjdk bot closed this May 17, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels May 17, 2023
@openjdk
Copy link

openjdk bot commented May 17, 2023

@RealCLanger @ktakakuri Pushed as commit bcb1f86.

💡 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 clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants