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

8267543: Post JEP 411 refactoring: security #4172

Closed
wants to merge 1 commit into from

Conversation

wangweij
Copy link
Contributor

@wangweij wangweij commented May 24, 2021

For all modified files in #4073 having "security", "crypto", or "ssl" in their names. Codes are refactored to bring a @SuppressWarning annotation nearer to the deprecated API usage and also shrink the size of its target.

I'll add a copyright year update commit before integration.


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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4172

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented May 24, 2021

👋 Welcome back weijun! A progress list of the required criteria for merging this PR into pr/4073 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 label May 24, 2021
@openjdk
Copy link

openjdk bot commented May 24, 2021

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

  • 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 serviceability labels May 24, 2021
@mlbridge
Copy link

mlbridge bot commented May 24, 2021

Webrevs

@@ -706,6 +706,7 @@ public KerberosTicket run() throws Exception {
tgt);
}
if (GSSUtil.useSubjectCredsOnly(caller)) {
@SuppressWarnings("removal")
Copy link
Member

@seanjmullan seanjmullan May 25, 2021

Choose a reason for hiding this comment

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

It looks like you missed removing the @SuppressWarnings("removal") from the initSecContext method above.

Copy link
Contributor Author

@wangweij wangweij May 25, 2021

Choose a reason for hiding this comment

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

Oops. Fixed.

@seanjmullan
Copy link
Member

seanjmullan commented May 25, 2021

Update copyright dates to 2021, if applicable.

@wangweij
Copy link
Contributor Author

wangweij commented May 25, 2021

Update copyright dates to 2021, if applicable.

Will do. Since this PR can only be integrated after its parent PR #4073 is integrated. I'll delay the copyright update by then.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/4073 to master Jun 2, 2021
@openjdk-notifier
Copy link

openjdk-notifier bot commented Jun 2, 2021

The dependent pull request has now been integrated, and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout 8266459
git fetch https://git.openjdk.java.net/jdk master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Jun 2, 2021

@wangweij this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout 8267543
git fetch https://git.openjdk.java.net/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict label Jun 2, 2021
@openjdk
Copy link

openjdk bot commented Jun 2, 2021

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

8267543: Post JEP 411 refactoring: security

Reviewed-by: mullan

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

  • 4767758: 8267920: Create separate Events buffer for VMOperations
  • dc19bac: 8268094: Some vmTestbase/nsk tests fail after ACC_STRICT/strictfp changes
  • 2963c9e: 8268103: JNI functions incorrectly return a double after JDK-8265836

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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added ready and removed merge-conflict labels Jun 2, 2021
@wangweij
Copy link
Contributor Author

wangweij commented Jun 2, 2021

/integrate

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

openjdk bot commented Jun 2, 2021

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

  • 4767758: 8267920: Create separate Events buffer for VMOperations
  • dc19bac: 8268094: Some vmTestbase/nsk tests fail after ACC_STRICT/strictfp changes
  • 2963c9e: 8268103: JNI functions incorrectly return a double after JDK-8265836

Your commit was automatically rebased without conflicts.

Pushed as commit 40d23a0.

💡 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 security serviceability
2 participants