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

8297437: javadoc cannot link to old docs (with old style anchors) #1145

Conversation

wkia
Copy link

@wkia wkia commented Feb 6, 2023

Backporting to jdk17u for parity.

No tier1 regressions.
"test/langtools/jdk/javadoc" tests are passed.

There was a conflict in src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Extern.java because of newest functions implemented in the upstream. And additional changes have been made in TestLinkPlatform.java (lines 106, 136, 166) because of EARLIEST_VERSION=7 in jdk17.

The rest of conflicts are in copyright headers.


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

  • JDK-8297437: javadoc cannot link to old docs (with old style anchors)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1145

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 6, 2023

👋 Welcome back rmarchenko! 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 15a14884013a975707008f648b8e4864e16006ed 8297437: javadoc cannot link to old docs (with old style anchors) Feb 6, 2023
@openjdk
Copy link

openjdk bot commented Feb 6, 2023

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 Feb 6, 2023
@mlbridge
Copy link

mlbridge bot commented Feb 6, 2023

Webrevs

Copy link
Member

@phohensee phohensee 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 Feb 14, 2023

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

8297437: javadoc cannot link to old docs (with old style anchors)

Reviewed-by: phh

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:

  • 68d7ac5: 8288415: java/awt/PopupMenu/PopupMenuLocation.java is unstable in MacOS machines
  • 8b30968: 8300205: Swing test bug8078268 make latch timeout configurable
  • 17084d5: 8299957: Enhance error logging in instrument coding with additional jplis_assert_msg
  • 95a805b: 8299671: Speed up compiler/intrinsics/string/TestStringLatin1IndexOfChar.java

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. Possible candidates are the reviewers of this PR (@phohensee) but any other Committer may sponsor as well.

➡️ 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 Feb 14, 2023
@GoeLin
Copy link
Member

GoeLin commented Feb 15, 2023

If you backport to 11, please be a bit more verbose in the JBS request, especially wrt. the "why".
See also https://wiki.openjdk.org/display/JDKUpdates/How+to+contribute+or+backport+a+fix

@wkia
Copy link
Author

wkia commented Feb 15, 2023

/integrate

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

openjdk bot commented Feb 15, 2023

@wkia
Your change (at version 81a688d) is now ready to be sponsored by a Committer.

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Feb 15, 2023

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

  • 334ec9a: 8282958: Rendering Issues with Borders on Windows High-DPI systems
  • d2409a7: 8295777: java/net/httpclient/ConnectExceptionTest.java should not rely on system resolver
  • 0ce70e3: 8294958: java/net/httpclient/ConnectTimeout tests are slow
  • efe8676: 8279614: The left line of the TitledBorder is not painted on 150 scale factor
  • 036029e: 8281170: Test jdk/tools/jpackage/windows/WinInstallerIconTest always fails on Windows 11
  • 9e26f38: 8300266: Detect Virtualization on Linux aarch64
  • 68d7ac5: 8288415: java/awt/PopupMenu/PopupMenuLocation.java is unstable in MacOS machines
  • 8b30968: 8300205: Swing test bug8078268 make latch timeout configurable
  • 17084d5: 8299957: Enhance error logging in instrument coding with additional jplis_assert_msg
  • 95a805b: 8299671: Speed up compiler/intrinsics/string/TestStringLatin1IndexOfChar.java

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Feb 15, 2023
@openjdk openjdk bot closed this Feb 15, 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 Feb 15, 2023
@openjdk
Copy link

openjdk bot commented Feb 15, 2023

@phohensee @wkia Pushed as commit cf5490b.

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

@wkia wkia deleted the backport-15a14884013a975707008f648b8e4864e16006ed branch February 15, 2023 16:16
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
3 participants