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

8253866: Security Libs Terminology Refresh #419

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Sep 25, 2021

I downport this for parity with 11.0.13-oracle.

make/modules/java.base/gendata/GendataBlacklistedCerts.gmk does not exist.
Instead, renamed make/gendata/GendataBlacklistedCerts.gmk and adapted content.

make/modules/java.base/Gendata.gmk does not exist: Applied change to make/gendata/Gendata-java.base.gmk instead

Copyright: JarVerifier.java, JavaKeyStore.java, KdcComm.java


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/jdk11u-dev pull/419/head:pull/419
$ git checkout pull/419

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 419

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 25, 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 8554fe6ebce7811a0c3b4670a89e3c07d577d966 8253866: Security Libs Terminology Refresh Sep 25, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 25, 2021

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

@openjdk openjdk bot added backport rfr labels Sep 25, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 25, 2021

Webrevs

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

LGTM.

@openjdk
Copy link

@openjdk openjdk bot commented Sep 27, 2021

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

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

8253866: Security Libs Terminology Refresh

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:

  • 98f17df: 8039261: [TEST_BUG]: There is not a minimal security level in Java Preferences and the TestApplet.html is blocked.
  • 79118a1: 8264824: java/net/Inet6Address/B6206527.java doesn't close ServerSocket properly
  • 6414dec: 8250839: Improve test template SSLEngineTemplate with SSLContextTemplate
  • 8e7259e: 8255722: Create a new test for rotated blit
  • 1eb1ce8: 8245665: Test WeakAlg.java should only make sure no warning for weak signature algorithms by keytool on root CA
  • f0e7779: 8169954: JFileChooser/8021253: java.lang.RuntimeException: Default button is not pressed

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 label Sep 27, 2021
@GoeLin
Copy link
Member Author

@GoeLin GoeLin commented Sep 28, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Sep 28, 2021

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

  • d3a8a9e: 8253497: Core Libs Terminology Refresh
  • b433235: 8081652: [TESTBUG] java/lang/management/ThreadMXBean/ThreadMXBeanStateTest.java timed out intermittently
  • 1476158: 8216417: cleanup of IPv6 scope-id handling
  • d234b6d: 8230019: [REDO] compiler/types/correctness/* tests fail with "assert(recv == __null || recv->is_klass()) failed: wrong type"
  • d7ac85a: 8244292: Headful clients failing with --illegal-access=deny
  • 45906dc: 8223658: Performance regression of XML.validation in 13-b19
  • 98f17df: 8039261: [TEST_BUG]: There is not a minimal security level in Java Preferences and the TestApplet.html is blocked.
  • 79118a1: 8264824: java/net/Inet6Address/B6206527.java doesn't close ServerSocket properly
  • 6414dec: 8250839: Improve test template SSLEngineTemplate with SSLContextTemplate
  • 8e7259e: 8255722: Create a new test for rotated blit
  • ... and 2 more: https://git.openjdk.java.net/jdk11u-dev/compare/8bf4dd71874135e4b44ef9678cbdd65e3edf311f...master

Your commit was automatically rebased without conflicts.

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

@openjdk openjdk bot commented Sep 28, 2021

@GoeLin Pushed as commit 9121f55.

💡 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_8253866 branch Sep 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated
2 participants