Skip to content

Conversation

@seanjmullan
Copy link
Member

@seanjmullan seanjmullan commented Jan 13, 2025

Some additional removal of calls to SM APIs from security library tests. One test is removed since it is no longer an issue.


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-8346045: Cleanup of security library tests calling Security Manager APIs (Bug - P4) ⚠️ Issue is already resolved. Consider making this a "backport pull request" by setting the PR title to Backport <hash> with the hash of the original commit. See Backports.

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/23070/head:pull/23070
$ git checkout pull/23070

Update a local copy of the PR:
$ git checkout pull/23070
$ git pull https://git.openjdk.org/jdk.git pull/23070/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23070

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/23070.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 13, 2025

👋 Welcome back mullan! 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 Jan 13, 2025

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

8346045: Cleanup of security library tests calling Security Manager APIs

Reviewed-by: rriggs

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

  • 56c7800: 8347381: Upgrade jQuery UI to version 1.14.1
  • 1c64a45: 8347501: Make static-launcher fails after JDK-8346669

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 the rfr Pull request is ready for review label Jan 13, 2025
@openjdk
Copy link

openjdk bot commented Jan 13, 2025

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

  • net
  • security

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 net net-dev@openjdk.org labels Jan 13, 2025
@mlbridge
Copy link

mlbridge bot commented Jan 13, 2025

Webrevs

Copy link
Member

@dfuch dfuch left a comment

Choose a reason for hiding this comment

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

Changes to SimpleSSLContext LGTM. Nice simplification!

Copy link
Contributor

@RogerRiggs RogerRiggs left a comment

Choose a reason for hiding this comment

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

Good cleanup.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 13, 2025
@seanjmullan
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jan 14, 2025

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

  • b4cd3b1: 8347566: Replace SSIZE_FORMAT with 'z' length modifier
  • f0af830: 8335747: C2: fix overflow case for LoopLimit with constant inputs
  • fec769b: 8346778: Enable native access should work with the source launcher
  • cbb2b84: 8344130: C2: Avoid excessive hoisting in scheduler due to minuscule differences in block frequency
  • bb93f67: 8347646: module-info classfile missing the preview flag
  • 3e989fd: 8346986: Remove ASM from java.base
  • 3967696: 8347496: Test jdk/jfr/jvm/TestModularImage.java fails after JDK-8347124: No javac
  • 6eb83ef: 8347500: hsdis cannot be built with Capstone.next
  • c1d322f: 8347627: Compiler replay tests are failing after JDK-8346990
  • 0ae5c6b: 8342996: Enhance Attach API to support arbitrary length arguments - OSX
  • ... and 122 more: https://git.openjdk.org/jdk/compare/27646e551686ec02740600fc73694fc2fbd00a88...master

It was not possible to rebase your changes automatically. Please merge master into your branch and try again.

@openjdk
Copy link

openjdk bot commented Jan 14, 2025

@seanjmullan 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 JDK-8346045
git fetch https://git.openjdk.org/jdk.git 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 merge-conflict Pull request has merge conflict with target branch and removed ready Pull request is ready to be integrated labels Jan 14, 2025
@openjdk openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Jan 14, 2025
Copy link
Contributor

@RogerRiggs RogerRiggs 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 after merge

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 14, 2025
@seanjmullan
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jan 14, 2025

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

  • 56c7800: 8347381: Upgrade jQuery UI to version 1.14.1
  • 1c64a45: 8347501: Make static-launcher fails after JDK-8346669

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 14, 2025

@seanjmullan Pushed as commit a49f833.

💡 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 net net-dev@openjdk.org security security-dev@openjdk.org

Development

Successfully merging this pull request may close these issues.

3 participants