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

8260565: JFR: Fix copyright header in tests #3130

Closed
wants to merge 1 commit into from

Conversation

@egahlin
Copy link
Member

@egahlin egahlin commented Mar 22, 2021

Hi,

Could I have a review of a fix that removes "Classpath" exception in the copyright header from the JFR tests. I had to update jdk.jfr.event.compilerTestDeoptimization.java because it relied on the line number of the file. A missing line ending was added at the end to some files as well.

Testing: jdk/jdk/jfr + tier1,tier2

Thanks
Erik


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/3130/head:pull/3130
$ git checkout pull/3130

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Mar 22, 2021

👋 Welcome back egahlin! 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.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Mar 22, 2021

@egahlin The following labels will be automatically applied to this pull request:

  • build
  • hotspot

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

Loading

@egahlin
Copy link
Member Author

@egahlin egahlin commented Mar 22, 2021

/label remove build

Loading

@egahlin
Copy link
Member Author

@egahlin egahlin commented Mar 22, 2021

/label remove hotspot
/label add hotspot-jfr

Loading

@openjdk openjdk bot removed the build label Mar 22, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Mar 22, 2021

@egahlin
The build label was successfully removed.

Loading

@openjdk openjdk bot removed the hotspot label Mar 22, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Mar 22, 2021

@egahlin
The hotspot label was successfully removed.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Mar 22, 2021

@egahlin
The hotspot-jfr label was successfully added.

Loading

@openjdk openjdk bot added the hotspot-jfr label Mar 22, 2021
@egahlin egahlin marked this pull request as ready for review Mar 22, 2021
@openjdk openjdk bot added the rfr label Mar 22, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 22, 2021

Webrevs

Loading

Copy link
Member

@mseledts mseledts left a comment

Changes look good to me

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Mar 23, 2021

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

8260565: JFR: Fix copyright header in tests

Reviewed-by: mseledtsov, mgronlun

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

  • 1c9817b: 8261479: CDS runtime code should check exceptions
  • 087c8bf: 8264041: Incorrect comments for ParallelCompactData::summarize_dense_prefix
  • c087f3e: 8263995: Incorrect double-checked locking in Types.arraySuperType()
  • d7268fa: 8251942: PrintStream specification is not clear which flush method is automatically invoked
  • 8fa34e4: 8241619: (fs) Files.newByteChannel(path, Set.of(CREATE_NEW, READ)) does not throw a FileAlreadyExistsException when the file exists
  • e9321cd: 8263964: Redundant check in ObjectStartArray::object_starts_in_range
  • bd7a184: 8263442: Potential bug in jdk.internal.net.http.common.Utils.CONTEXT_RESTRICTED
  • 2335362: 8264032: Improve thread safety of Runtime.version()
  • 8c1ab38: 8263766: Confusing specification of JEditorPaneAccessibleHypertextSupport constructor
  • 5bc382f: 8263976: Remove block allocation from BasicHashtable
  • ... and 20 more: https://git.openjdk.java.net/jdk/compare/f84b52b84dc7ba1921b3845ae696fa9896ba4136...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.

Loading

@openjdk openjdk bot added the ready label Mar 23, 2021
@egahlin
Copy link
Member Author

@egahlin egahlin commented Mar 24, 2021

/integrate

Loading

@openjdk openjdk bot closed this Mar 24, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Mar 24, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Mar 24, 2021

@egahlin Since your change was applied there have been 36 commits pushed to the master branch:

  • 0b2aa1b: 8263978: Clarify why 0 argument is ignored in SecureRandom::setSeed
  • 15bcf6d: 8264055: backout JDK-8248904 in order to resubmit with additional attribution.
  • 2425462: 8263903: Use Cleaner instead of finalize to auto stop Timer thread
  • 35102cb: 8263992: Remove dead code NativeLookup::base_library_lookup
  • 91d86e6: 8263572: Output from jstack mixed mode is misaligned
  • 47ef038: 8263905: Remove finalize methods for SocketInput/OutputStream
  • 1c9817b: 8261479: CDS runtime code should check exceptions
  • 087c8bf: 8264041: Incorrect comments for ParallelCompactData::summarize_dense_prefix
  • c087f3e: 8263995: Incorrect double-checked locking in Types.arraySuperType()
  • d7268fa: 8251942: PrintStream specification is not clear which flush method is automatically invoked
  • ... and 26 more: https://git.openjdk.java.net/jdk/compare/f84b52b84dc7ba1921b3845ae696fa9896ba4136...master

Your commit was automatically rebased without conflicts.

Pushed as commit 8d63bb6.

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

Loading

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants