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

JDK-8263473: Update annotation terminology (2) #3162

Closed
wants to merge 3 commits into from

Conversation

jonathan-gibbons
Copy link
Contributor

@jonathan-gibbons jonathan-gibbons commented Mar 23, 2021

This work started as a small cleanup in another changes, but the test changes became big enough to warrant a senate changeset.

When the recently changed the terminology from "annotation type" to "annotation interface", we missed a case. This changes addresses that omission.

I re-flowed the text blocks in the affected tests using our text-block utility.


Progress

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

Issue

Reviewers

Download

To checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/3162/head:pull/3162
$ git checkout pull/3162

To update a local copy of the PR:
$ git checkout pull/3162
$ git pull https://git.openjdk.java.net/jdk pull/3162/head

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 23, 2021

👋 Welcome back jjg! 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 Pull request is ready for review label Mar 23, 2021
@openjdk
Copy link

openjdk bot commented Mar 23, 2021

@jonathan-gibbons The following label will be automatically applied to this pull request:

  • javadoc

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the javadoc javadoc-dev@openjdk.org label Mar 23, 2021
@mlbridge
Copy link

mlbridge bot commented Mar 23, 2021

Webrevs

Copy link
Member

@hns hns left a comment

Choose a reason for hiding this comment

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

Looks good!

@openjdk
Copy link

openjdk bot commented Mar 24, 2021

@jonathan-gibbons 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:

8263473: Update annotation terminology (2)

Reviewed-by: hannesw

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

  • deda80f: 8264057: [redo] JDK-8248904: Add support to jpackage for the Mac App Store.
  • 57c3f27: 8263989: Cleanup in EA
  • 4d8e986: 8261966: macOS M1: report in hs_err log if we are running x86 code in emulation mode (Rosetta)
  • bc91596: 8264051: Remove unused TRAPS parameters from runtime functions
  • 5d7e93c: 8264004: Don't use TRAPS if no exceptions are thrown
  • 9ee0b9a: 8264052: Shenandoah: Backout 8263832
  • e55aa41: 8263899: HttpClient throws NPE in AuthenticationFilter when parsing www-authenticate head
  • 6c0fbf7: 8254196: jshell infinite loops when startup script contains System.exit call
  • a79f095: 8263721: Unify oop casting
  • 329697b: 8263358: Update java.lang to use instanceof pattern variable
  • ... and 14 more: https://git.openjdk.java.net/jdk/compare/1c9817b0bce64814727e3ac5240e39d88dfc32a1...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.

➡️ 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 Pull request is ready to be integrated label Mar 24, 2021
@jonathan-gibbons
Copy link
Contributor Author

/integrate

@openjdk openjdk bot closed this Mar 24, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 24, 2021
@jonathan-gibbons jonathan-gibbons deleted the anno-intf branch March 24, 2021 20:13
@openjdk
Copy link

openjdk bot commented Mar 24, 2021

@jonathan-gibbons Since your change was applied there have been 29 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

Pushed as commit 1a13c9e.

💡 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
integrated Pull request has been integrated javadoc javadoc-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

2 participants