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

8180568: Refactor javax/crypto shell tests to plain java tests #504

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Oct 10, 2021

I backport this for parity with 11.0.13-oracle.


Progress

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

Issue

  • JDK-8180568: Refactor javax/crypto shell tests to plain java tests

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/504/head:pull/504
$ git checkout pull/504

Update a local copy of the PR:
$ git checkout pull/504
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/504/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 504

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/504.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 10, 2021

👋 Welcome back goetz! 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 changed the title Backport 20ad42897427483a4a62e1de7e78d4620eb9e240 8180568: Refactor javax/crypto shell tests to plain java tests Oct 10, 2021
@openjdk
Copy link

openjdk bot commented Oct 10, 2021

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Oct 10, 2021
@mlbridge
Copy link

mlbridge bot commented Oct 10, 2021

Webrevs

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Almost clean backport (diffs in removed files) LGTM.

@openjdk
Copy link

openjdk bot commented Oct 11, 2021

@GoeLin This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8180568: Refactor javax/crypto shell tests to plain java tests

Reviewed-by: mdoerr

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

  • 4e63adb: 8242793: Incorrect copyright header in ContinuousCallSiteTargetChange.java
  • 82491fd: 7105119: [TEST_BUG] [macosx] In test UIDefaults.toString() must be called with the invokeLater()
  • d66464e: 8237589: Fix copyright header formatting
  • 75b513f: 8243543: jtreg test security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java fails
  • 84fc3b7: 8211148: var in implicit lambdas shouldn't be accepted for source < 11
  • 65cab1e: 8198616: java/awt/Focus/6378278/InputVerifierTest.java fails on mac

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 ready Pull request is ready to be integrated label Oct 11, 2021
@GoeLin
Copy link
Member Author

GoeLin commented Oct 12, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Oct 12, 2021

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

  • 7410b74: 8273646: Add openssl from path variable also in to Default System Openssl Path in OpensslArtifactFetcher
  • fc2646b: 8274329: Fix non-portable HotSpot code in MethodMatcher::parse_method_pattern
  • aa5d5f3: 8245147: Refactor and improve utility of test/langtools/tools/javac/versions/Versions.java
  • 9512c47: 8273826: Correct Manifest file name and NPE checks
  • bcee700: 8273961: jdk/nio/zipfs/ZipFSTester.java fails if file path contains '+' character
  • 4e63adb: 8242793: Incorrect copyright header in ContinuousCallSiteTargetChange.java
  • 82491fd: 7105119: [TEST_BUG] [macosx] In test UIDefaults.toString() must be called with the invokeLater()
  • d66464e: 8237589: Fix copyright header formatting
  • 75b513f: 8243543: jtreg test security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java fails
  • 84fc3b7: 8211148: var in implicit lambdas shouldn't be accepted for source < 11
  • ... and 1 more: https://git.openjdk.java.net/jdk11u-dev/compare/158c0a8c16974e1eb2021fd36f9032fb0f150a34...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Oct 12, 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 Oct 12, 2021
@openjdk
Copy link

openjdk bot commented Oct 12, 2021

@GoeLin Pushed as commit 2a028c4.

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

@GoeLin GoeLin deleted the goetz_backport_8180568 branch Oct 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
2 participants