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

8279134: Fix Amazon copyright in various files #6915

Closed
wants to merge 2 commits into from

Conversation

mrserb
Copy link
Member

@mrserb mrserb commented Dec 22, 2021

This bug is similar to https://bugs.openjdk.java.net/browse/JDK-8244094

Currently, some of the files in the OpenJDK repo have Amazon copyright notices which are all slightly different and do not conform to Amazons preferred copyright notice which is simply (intentionally without copyright year):

"Copyright Amazon.com Inc. or its affiliates. All Rights Reserved."

@simonis @phohensee


Progress

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

Issue

Reviewers

Reviewing

Using git

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

Update a local copy of the PR:
$ git checkout pull/6915
$ git pull https://git.openjdk.java.net/jdk pull/6915/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6915

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/6915.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 22, 2021

👋 Welcome back serb! 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
Copy link

openjdk bot commented Dec 22, 2021

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

  • core-libs
  • hotspot
  • security
  • serviceability

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.

@openjdk openjdk bot added security security-dev@openjdk.org serviceability serviceability-dev@openjdk.org hotspot hotspot-dev@openjdk.org core-libs core-libs-dev@openjdk.org labels Dec 22, 2021
@mrserb mrserb marked this pull request as ready for review December 22, 2021 10:51
@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 22, 2021
@mlbridge
Copy link

mlbridge bot commented Dec 22, 2021

Webrevs

Copy link
Member

@navyxliu navyxliu left a comment

Choose a reason for hiding this comment

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

LGTM. I am not a reviewer. Need other reviewers to approve it.

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 Dec 23, 2021

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

8279134: Fix Amazon copyright in various files

Reviewed-by: xliu, 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 15 new commits pushed to the master branch:

  • 9d99a37: 8277881: Missing SessionID in TLS1.3 resumption in compatibility mode
  • 4669bcd: 8279244: test accompaning fix for JDK-8205187 is failing in Windows
  • a3b1c6b: Merge
  • 04ad668: 8279204: [BACKOUT] JDK-8278413: C2 crash when allocating array of size too large
  • 730f670: 8268297: jdk/jfr/api/consumer/streaming/TestLatestEvent.java times out
  • 9d5ae2e: 8279076: C2: Bad AD file when matching SqrtF with UseSSE=0
  • 04ee921: 8278967: rmiregistry fails to start because SecurityManager is disabled
  • 2be3e7e: 8278239: vmTestbase/nsk/jvmti/RedefineClasses/StressRedefine failed with EXCEPTION_ACCESS_VIOLATION at 0x000000000000000d
  • 9df200f: 8278795: Create test library and tests for langtools snippets
  • 7aff03a: 8267517: async logging for stdout and stderr
  • ... and 5 more: https://git.openjdk.java.net/jdk/compare/ad1dc9c2ae5463363aff20072a3f2ca4ea23acd2...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 Dec 23, 2021
@mrserb
Copy link
Member Author

mrserb commented Dec 26, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Dec 26, 2021

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

  • 70c6df6: 8274893: Update java.desktop classes to use try-with-resources
  • d52392c: 8276892: Provide a way to emulate exceptional situations in FileManager when using JavadocTester
  • 22c15dd: 8279189: Inaccurate comment about class VMThread
  • 9d99a37: 8277881: Missing SessionID in TLS1.3 resumption in compatibility mode
  • 4669bcd: 8279244: test accompaning fix for JDK-8205187 is failing in Windows
  • a3b1c6b: Merge
  • 04ad668: 8279204: [BACKOUT] JDK-8278413: C2 crash when allocating array of size too large
  • 730f670: 8268297: jdk/jfr/api/consumer/streaming/TestLatestEvent.java times out
  • 9d5ae2e: 8279076: C2: Bad AD file when matching SqrtF with UseSSE=0
  • 04ee921: 8278967: rmiregistry fails to start because SecurityManager is disabled
  • ... and 8 more: https://git.openjdk.java.net/jdk/compare/ad1dc9c2ae5463363aff20072a3f2ca4ea23acd2...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 26, 2021
@openjdk openjdk bot closed this Dec 26, 2021
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 26, 2021
@openjdk
Copy link

openjdk bot commented Dec 26, 2021

@mrserb Pushed as commit 7fea103.

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

@mrserb mrserb deleted the JDK-8279134 branch December 26, 2021 22:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated security security-dev@openjdk.org serviceability serviceability-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

3 participants