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 #2074

Closed
wants to merge 3 commits into from

Conversation

jnimeh
Copy link
Member

@jnimeh jnimeh commented Jan 14, 2021

This is the security libs portion of the effort to replace archaic/non-inclusive words with more neutral terms (see JDK-8253315 for details).

Here are the changes covering core libraries code and tests. Terms were changed as follows:

  • blacklisted.certs -> blocked.certs (along with supporting make infrastructure and tests)
  • master/slave in KRB5 -> primary/replica
  • blacklist in other files -> deny list
  • whitelist -> allow list

Addressing similar issues in upstream 3rd party code is out of scope of this PR. Such changes will be picked up from their upstream sources.


Progress

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

Issue

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/2074/head:pull/2074
$ git checkout pull/2074

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jan 14, 2021

👋 Welcome back jnimeh! 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 added the rfr label Jan 14, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jan 14, 2021

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

  • build
  • core-libs
  • 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 build core-libs labels Jan 14, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jan 14, 2021

Webrevs

Copy link
Member

@erikj79 erikj79 left a comment

Build changes look good.

@openjdk
Copy link

@openjdk openjdk bot commented Jan 14, 2021

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

8253866: Security Libs Terminology Refresh

Reviewed-by: erikj, weijun, 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 34 new commits pushed to the master branch:

  • c2a3c7e: 8259727: Remove redundant "target" arguments to methods in Links
  • 1620664: 8259723: Move Table class to formats.html package
  • 38a1201: 8258912: Remove JVM options CountJNICalls and CountJVMCalls
  • be57cf1: 8226416: MonitorUsedDeflationThreshold can cause repeated async deflation requests
  • c822eda: 8259699: Reduce char[] copying in URLEncoder.encode(String, Charset)
  • ff3e6e4: 8259773: Incorrect encoding of AVX-512 kmovq instruction
  • b8ef2ba: 8259563: The CPU model name is printed multiple times when using -Xlog:os+cpu
  • b040a3d: 8259631: Reapply pattern match instanceof use in HttpClientImpl
  • 3462f7a: 8256955: Move includes of events.hpp out of header files
  • 8b8b1f9: 8259706: C2 compilation fails with assert(vtable_index == Method::invalid_vtable_index) failed: correct sentinel value
  • ... and 24 more: https://git.openjdk.java.net/jdk/compare/ccdf171d7893a5f362a64996807d92509a24c67c...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 label Jan 14, 2021
Copy link
Contributor

@wangweij wangweij left a comment

Code change looks fine to me.

src/java.base/share/conf/security/java.security Outdated Show resolved Hide resolved
src/java.base/share/conf/security/java.security Outdated Show resolved Hide resolved
@jnimeh
Copy link
Member Author

@jnimeh jnimeh commented Jan 14, 2021

/integrate

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

@openjdk openjdk bot commented Jan 14, 2021

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

  • c2a3c7e: 8259727: Remove redundant "target" arguments to methods in Links
  • 1620664: 8259723: Move Table class to formats.html package
  • 38a1201: 8258912: Remove JVM options CountJNICalls and CountJVMCalls
  • be57cf1: 8226416: MonitorUsedDeflationThreshold can cause repeated async deflation requests
  • c822eda: 8259699: Reduce char[] copying in URLEncoder.encode(String, Charset)
  • ff3e6e4: 8259773: Incorrect encoding of AVX-512 kmovq instruction
  • b8ef2ba: 8259563: The CPU model name is printed multiple times when using -Xlog:os+cpu
  • b040a3d: 8259631: Reapply pattern match instanceof use in HttpClientImpl
  • 3462f7a: 8256955: Move includes of events.hpp out of header files
  • 8b8b1f9: 8259706: C2 compilation fails with assert(vtable_index == Method::invalid_vtable_index) failed: correct sentinel value
  • ... and 24 more: https://git.openjdk.java.net/jdk/compare/ccdf171d7893a5f362a64996807d92509a24c67c...master

Your commit was automatically rebased without conflicts.

Pushed as commit 8554fe6.

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

@jnimeh jnimeh deleted the JDK-8253866 branch Jan 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build core-libs integrated security
4 participants