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

Use neutral terminology instead of oppressive language #25262

Closed
nealeu opened this issue Jun 17, 2020 · 11 comments
Closed

Use neutral terminology instead of oppressive language #25262

nealeu opened this issue Jun 17, 2020 · 11 comments
Assignees
Labels
type: task A general task
Milestone

Comments

@nealeu
Copy link

nealeu commented Jun 17, 2020

Let's please do this:

  • blacklist / whitelist -> blocklist / allowlist
  • change master branch to main
  • white/black box testing -> clear/opaque

It's time!

@spring-projects-issues spring-projects-issues added the status: waiting-for-triage An issue we've not yet triaged or decided on label Jun 17, 2020
sbrannen added a commit to sbrannen/spring-framework that referenced this issue Jun 17, 2020
@sbrannen
Copy link
Member

Within the Spring Framework, work has already been done in a2d516d and 972c01c to avoid the use of whitelist / blacklist.

Are you aware of any further usage of those terms in Spring Framework?

Changing the name of the master branch to main is something that is being considered, but it will require further investigation to determine how best to do that with minimal impact on the community and contributors.

Regarding the terms white box and black box, I am not aware of any such usage within the Spring Framework. Were you listing general things that one could change, or are you aware of any further usage of those terms in Spring Framework?

sbrannen added a commit that referenced this issue Jun 17, 2020
@sbrannen
Copy link
Member

sbrannen commented Jun 17, 2020

Regarding the terms white box and black box, I am not aware of any such usage within the Spring Framework. Were you listing general things that one could change, or are you aware of any further usage of those terms in Spring Framework?

I apologize: I made a mistake in my search.

The term black box appears in examples that use the Blackbox CCI connector from the JDK (com.sun.connector.cciblackbox.CciConnectionSpec). In that context, it is challenging to avoid use of the term. Otherwise, use of the term "black box" has now been removed in 9acb5b1.

Regarding the term "whitelist" in the Gradle build, see spring-io/nohttp#37 and #25266.

@sbrannen sbrannen added type: task A general task status: waiting-for-triage An issue we've not yet triaged or decided on and removed status: waiting-for-triage An issue we've not yet triaged or decided on labels Jun 17, 2020
@dsyer
Copy link
Member

dsyer commented Jun 17, 2020

I think you missed the extensive example in core-beans.adoc. Probably easy to rename that, since it's just an example in docs: https://github.com/spring-projects/spring-framework/blob/master/src/docs/asciidoc/core/core-beans.adoc#standard-and-custom-events.

@nealeu
Copy link
Author

nealeu commented Jun 18, 2020

Thanks for being on to this. Look forward to master going and being only referenced in history lessons. We've gone with main.
It's good that it will disrupt developers that tiny little bit :-)

@sbrannen
Copy link
Member

I think you missed the extensive example in core-beans.adoc.

Thanks, @dsyer! 👍

I'll address that.

@sbrannen
Copy link
Member

I think you missed the extensive example in core-beans.adoc. Probably easy to rename that, since it's just an example in docs: https://github.com/spring-projects/spring-framework/blob/master/src/docs/asciidoc/core/core-beans.adoc#standard-and-custom-events.

Addressed in 46c7861

@sbrannen
Copy link
Member

@sbrannen sbrannen changed the title Use neutral references instead of racism / slavery ones Use neutral terminology instead of oppressive language Jun 18, 2020
@sbrannen sbrannen removed the status: waiting-for-triage An issue we've not yet triaged or decided on label Jun 18, 2020
@sbrannen sbrannen added this to the 5.3 M2 milestone Jun 18, 2020
@sbrannen
Copy link
Member

As far as I can tell, we have addressed the usage of whitebox/blackbox and whitelist/blacklist in the 5.2.x and master (i.e., 5.3.x) branches.

The only remaining task is the renaming of the master branch, and I have tentatively slated this issue for 5.3 M2 as a placeholder to consider that.

@sbrannen
Copy link
Member

The term black box appears in examples that use the Blackbox CCI connector from the JDK (com.sun.connector.cciblackbox.CciConnectionSpec). In that context, it is challenging to avoid use of the term.

In conjunction with #25287, that section of the reference manual has been removed in 3a653bd for Spring Framework 5.3+.

@sbrannen
Copy link
Member

Additional changes to wording in the reference manual have been addressed in conjunction with #25314.

In light of that, I am closing this issue.

The only remaining task is the renaming of the master branch, and I have tentatively slated this issue for 5.3 M2 as a placeholder to consider that.

If renaming of the master/default branch occurs, that would likely take place as a coordinated effort across the Spring portfolio projects.

FelixFly pushed a commit to FelixFly/spring-framework that referenced this issue Aug 16, 2020
FelixFly pushed a commit to FelixFly/spring-framework that referenced this issue Aug 16, 2020
FelixFly pushed a commit to FelixFly/spring-framework that referenced this issue Aug 16, 2020
@rudiservo
Copy link

I would never think that a martial arts master would be oppressive... I actually resent such a wild claim about the word "master".

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type: task A general task
Projects
None yet
Development

No branches or pull requests

6 participants