Skip to content

Commit 11ae432

Browse files
authored
BFD-4773: update io.netty to 4.1.135.Final + CODE_OF_CONDUCT Rewrite! (#3171)
1 parent 75c9611 commit 11ae432

2 files changed

Lines changed: 47 additions & 101 deletions

File tree

CODE_OF_CONDUCT.md

Lines changed: 9 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1,108 +1,17 @@
1-
# The Technology Transformation Service Code of Conduct
1+
# Contributor Code of Conduct
22

3-
## Table of Contents
3+
As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
44

5-
[Introduction](#introduction)
5+
We are committed to making participation in this project a harassment-free experience for everyone, regardless of the level of experience, gender, gender identity, expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
66

7-
[What We Strive For](#what-we-strive-for)
7+
Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
88

9-
[Unacceptable Behavior](#unacceptable-behavior)
9+
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned with this Code of Conduct.
1010

11-
[Reporting](#reporting-violations)
11+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers at opensource@cms.hhs.gov.
1212

13-
[Credits](#credits)
13+
This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)
1414

15-
[Version](#version)
15+
## Acknowledgements
1616

17-
## Introduction
18-
19-
TTS is committed to building a safe, welcoming, harassment-free culture for everyone. We do not merely want a work environment that is free from hostility; we want one that is actively welcoming and inclusive. We want our team and our workplace culture to reflect and celebrate the diversity of the communities we serve.
20-
21-
This Code of Conduct summarizes federal anti-harassment law and General Services Administration policy. We intend the plain-language approach to promote a culture of inclusion and respect.
22-
23-
We expect everyone on the TTS team to exhibit these behaviors and abide by applicable federal laws and GSA policies. In addition, we expect everyone within TTS spaces to exhibit these behaviors and refrain from behavior prohibited by anti-harassment laws and GSA policies on harassment. These spaces include:
24-
25-
- TTS's physical offices,
26-
- TTS events and meetings,
27-
- All of our online forums and virtual collaboration tools, including:
28-
- Office chat rooms, like Slack
29-
- Mailing lists and email
30-
- Code repositories, like GitHub
31-
32-
## What We Strive For
33-
34-
We strive to create a welcoming and inclusive culture that empowers people to provide outstanding public service. That kind of atmosphere requires an open exchange of ideas balanced by thoughtful guidelines. If we have only openness, colleagues who are on the receiving end of thoughtless or intentionally hurtful comments and behavior may reasonably withdraw. If we have overly intrusive guidelines, people may feel unwelcome.
35-
36-
It would be impossible to list everything staff can do to create a more welcoming space, and we know this team will find ways to include their colleagues that we haven't even thought of. But when in doubt, we encourage you to look to these principles for guidance:
37-
38-
- Practice empathy and humility.
39-
- Assume competence in your colleagues, clients and the public.
40-
- Assume that everyone we work with is doing their best work for the public.
41-
- Listen carefully and actively.
42-
- Ask questions, and seek to understand your partners' context.
43-
- Encourage other people to listen as much as they speak.
44-
- Treat other people's identities and cultures with respect. Make an effort to say people's names correctly and refer to them by their chosen pronouns.
45-
46-
## Unacceptable Behavior
47-
48-
To help colleagues understand the kinds of behaviors that are illegal or run counter to the culture we seek to foster, we've listed below actions that violate federal law and GSA policy. We've also included steps to take if you encounter behavior that runs contrary to this policy.
49-
50-
### Sexual and Non-Sexual Harassment
51-
52-
The [GSA Policy](https://www.gsa.gov/portal/directive/d0/content/512516) Statement on Sexual and Non-Sexual Harassment forbids:
53-
54-
- Sexual and non-sexual harassment and misconduct, as defined in [GSA Order ADM 2325.8 Section 3(a), (b) and (c)](https://www.gsa.gov/portal/directive/d0/content/512516).
55-
- Unwelcome verbal or written comment or physical conduct based on:
56-
- race,
57-
- religion,
58-
- color,
59-
- sex (with or without sexual conduct, including pregnancy, and stereotyping),
60-
- national origin,
61-
- age,
62-
- disability,
63-
- genetic information,
64-
- sexual orientation,
65-
- parental status,
66-
- marital status,
67-
- or political affiliation.
68-
- Retaliating against anyone who files a formal complaint that someone has violated GSA anti-harassment policies.
69-
70-
### Conduct Unbecoming a Federal Employee
71-
72-
Federal employees can be subject to appropriate discipline, up to and including removal, for conduct unbecoming a federal employee, which is conduct which is unattractive; unsuitable; detracting from one's character or reputation; or creates an unfavorable impression. Abusive and demeaning remarks to and about others in the workplace, and sexual remarks, which do not rise to the level of sexual harassment under the employment discrimination laws, nonetheless can be considered conduct unbecoming a federal employee.
73-
74-
### Other Unacceptable Behavior
75-
76-
In addition, the following behaviors violate applicable laws and policies, or otherwise undermine the culture of respect and inclusion we seek to build within TTS:
77-
78-
- Touching people without their affirmative consent.
79-
- Sustained disruption of meetings, talks, or discussions, including chat rooms.
80-
- Mocking someone's real or perceived accent or first language.
81-
- Repeatedly interrupting or talking over other people in meetings and discussions.
82-
- Negative or offensive remarks based on sex, mental illness, socioeconomic status or background, neuro(a)typicality, physical appearance, or body size.
83-
84-
## Reporting violations
85-
86-
The process for reporting violations of GSA's Policy Statement on sexual and non-sexual harassment can be found in [GSA Order ADM 2325.8 Section 3(d)](https://www.gsa.gov/portal/directive/d0/content/512516) and GSA Order HRM 9700.6. Depending on your complaint, you may have a 45-day window from the date of the incident to report it to the GSA. Please read the GSA Order carefully.
87-
88-
The behaviors listed in this section undermine the culture of inclusion and respect that we are trying to build within TTS. We encourage you to report violations to your supervisor, any management official, a Human Resources official, and/or the Office of Civil Rights, so that TTS can take any necessary steps to ensure that we have a safe and welcoming team.
89-
90-
## Credits
91-
92-
TTS is greatly appreciative of the multiple sources that we drew from to build this Code of Conduct, including:
93-
94-
- [Code for America Code of Conduct](https://github.com/codeforamerica/codeofconduct)
95-
- [Ada Initiative: HOWTO design a code of conduct for your community](https://adainitiative.org/2014/02/howto-design-a-code-of-conduct-for-your-community/)
96-
- [Geek Feminism Code of Conduct](https://geekfeminism.org/about/code-of-conduct/)
97-
98-
Laws and Policies Concerning Workplace Harassment:
99-
100-
- [GSA's Policy Statement on sexual and non-sexual harassment](https://www.gsa.gov/portal/directive/d0/content/512516)
101-
- [Laws enforced by the Equal Employment Opportunity Commission](https://www.eeoc.gov/laws/statutes/index.cfm)
102-
- [Types of Discrimination prohibited by law](https://www.eeoc.gov/laws/types/)
103-
- [New and proposed regulations](https://www.eeoc.gov/laws/regulations/index.cfm)
104-
105-
## Version
106-
107-
Approved May 1, 2018
108-
Published May 7, 2018
17+
This CODE_OF_CONDUCT.md was originally forked from the [United States Digital Service](https://usds.gov) [Justice40](https://thejustice40.com) open source [repository](https://github.com/usds/justice40-tool), and we would like to acknowledge and thank the community for their contributions.

apps/pom.xml

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
<jakarta.el.version>4.0.2</jakarta.el.version>
182182
<poi.version>5.4.0</poi.version>
183183
<javapoet.version>1.13.0</javapoet.version>
184-
<netty.version>4.1.133.Final</netty.version>
184+
<netty.version>4.1.135.Final</netty.version>
185185
<jetty.version>12.1.7</jetty.version>
186186
<org.apache.httpcomponents.httpclient.version>4.5.14</org.apache.httpcomponents.httpclient.version>
187187
<datasource-proxy.version>1.10</datasource-proxy.version>
@@ -329,6 +329,43 @@
329329
<artifactId>netty-codec</artifactId>
330330
<version>${netty.version}</version>
331331
</dependency>
332+
<!-- Fix for Snyk vulnerability in netty-handler -->
333+
<dependency>
334+
<groupId>io.netty</groupId>
335+
<artifactId>netty-handler</artifactId>
336+
<version>${netty.version}</version>
337+
</dependency>
338+
<!-- Pin remaining transitive netty artifacts to ${netty.version} for consistency -->
339+
<dependency>
340+
<groupId>io.netty</groupId>
341+
<artifactId>netty-transport</artifactId>
342+
<version>${netty.version}</version>
343+
</dependency>
344+
<dependency>
345+
<groupId>io.netty</groupId>
346+
<artifactId>netty-common</artifactId>
347+
<version>${netty.version}</version>
348+
</dependency>
349+
<dependency>
350+
<groupId>io.netty</groupId>
351+
<artifactId>netty-buffer</artifactId>
352+
<version>${netty.version}</version>
353+
</dependency>
354+
<dependency>
355+
<groupId>io.netty</groupId>
356+
<artifactId>netty-resolver</artifactId>
357+
<version>${netty.version}</version>
358+
</dependency>
359+
<dependency>
360+
<groupId>io.netty</groupId>
361+
<artifactId>netty-transport-native-unix-common</artifactId>
362+
<version>${netty.version}</version>
363+
</dependency>
364+
<dependency>
365+
<groupId>io.netty</groupId>
366+
<artifactId>netty-transport-classes-epoll</artifactId>
367+
<version>${netty.version}</version>
368+
</dependency>
332369
<!-- Fix for Snyk vulnerability (CWE-835 and CWE-770)-->
333370
<dependency>
334371
<groupId>org.apache.commons</groupId>

0 commit comments

Comments
 (0)