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) #1794

Conversation

wkia
Copy link

@wkia wkia commented Mar 7, 2023

Backporting JDK-8297437 to 11u for parity, because there are still scenarios for 11u when docs being generated are linked to external old-style anchors docs.

No tier1 regressions.
The tests from "test/langtools/jdk/javadoc" are passed, except jdk/javadoc/doclet/testIOException/TestIOException.java - it fails on master as well.

Refactoring was made in Links.java to avoid duplicating function code.


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) (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1794

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 7, 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) Mar 7, 2023
@openjdk
Copy link

openjdk bot commented Mar 7, 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 Mar 7, 2023
@mlbridge
Copy link

mlbridge bot commented Mar 7, 2023

Webrevs

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 4, 2023

@wkia This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@wkia
Copy link
Author

wkia commented Apr 4, 2023

Up

@bridgekeeper
Copy link

bridgekeeper bot commented May 2, 2023

@wkia This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@wkia
Copy link
Author

wkia commented May 2, 2023

Up

@bridgekeeper
Copy link

bridgekeeper bot commented May 30, 2023

@wkia This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@wkia
Copy link
Author

wkia commented May 30, 2023

Up

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.

Refactoring Links.java is ok with me, but the maintainers may disagree. Lgtm.

@openjdk
Copy link

openjdk bot commented Jun 26, 2023

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

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

  • 532fbe9: 8291444: GHA builds/tests won't run manually if disabled from automatic running
  • 6b77069: 8291830: jvmti/RedefineClasses/StressRedefine failed: assert(!is_null(v)) failed: narrow klass value can never be zero
  • b3417d8: 8293657: sun/management/jmxremote/bootstrap/RmiBootstrapTest.java#id1 failed with "SSLHandshakeException: Remote host terminated the handshake"
  • a975a1e: 8286620: Create regression test for verifying setMargin() of JRadioButton
  • 842f8ae: 8307301: Update HarfBuzz to 7.2.0
  • c99f1e0: 8307604: gcc12 based Alpine build broken build after JDK-8307301
  • c4fb98d: 8307569: Build with gcc8 is broken after JDK-8307301
  • 985c7a1: 8209398: sun/security/pkcs11/KeyStore/SecretKeysBasic.sh failed with "PKCS11Exception: CKR_ATTRIBUTE_SENSITIVE"
  • f321deb: 8232840: java/math/BigInteger/largeMemory/SymmetricRangeTests.java fails due to "OutOfMemoryError: Requested array size exceeds VM limit"
  • 8528c52: 8244078: ProcessTools executeTestJvm and createJavaProcessBuilder have inconsistent handling of test.*.opts
  • ... and 3 more: https://git.openjdk.org/jdk11u-dev/compare/9c97b37e1bca898a3ba2832342c909879cb4e31c...master

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 Jun 26, 2023
@GoeLin
Copy link
Member

GoeLin commented Jun 28, 2023

Please merge the latest changes so that the GHA tests run again.

@wkia
Copy link
Author

wkia commented Jun 28, 2023

Please merge the latest changes so that the GHA tests run again.

@GoeLin Done. The tests in test/langtools/jdk/javadoc are successfully passed locally with linux-x86_64-normal-server-release.

@wkia
Copy link
Author

wkia commented Jul 5, 2023

/integrate

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

openjdk bot commented Jul 5, 2023

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

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Jul 5, 2023

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

  • dbf8820: 8300098: java/util/concurrent/ConcurrentHashMap/ConcurrentAssociateTest.java fails with internal timeout when executed with TieredCompilation1/3
  • 750387b: 8297887: Update Siphash
  • 2854320: 8306638: Open source some AWT tests related to datatransfer and Toolkit
  • 9fecfb3: 8305950: Have -XshowSettings option display tzdata version
  • 6b84480: 8304054: Linux: NullPointerException from FontConfiguration.getVersion in case no fonts are installed
  • 532fbe9: 8291444: GHA builds/tests won't run manually if disabled from automatic running
  • 6b77069: 8291830: jvmti/RedefineClasses/StressRedefine failed: assert(!is_null(v)) failed: narrow klass value can never be zero
  • b3417d8: 8293657: sun/management/jmxremote/bootstrap/RmiBootstrapTest.java#id1 failed with "SSLHandshakeException: Remote host terminated the handshake"
  • a975a1e: 8286620: Create regression test for verifying setMargin() of JRadioButton
  • 842f8ae: 8307301: Update HarfBuzz to 7.2.0
  • ... and 8 more: https://git.openjdk.org/jdk11u-dev/compare/9c97b37e1bca898a3ba2832342c909879cb4e31c...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 5, 2023

@phohensee @wkia Pushed as commit b9a29eb.

💡 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 integrated Pull request has been integrated
3 participants