From aed8098a5f18d6d19713348143cf1bcf5db1f79b Mon Sep 17 00:00:00 2001 From: Tom Bentley Date: Wed, 4 Feb 2026 14:20:02 +1300 Subject: [PATCH 01/15] Remove TOC, order sections "chronologically" Signed-off-by: Tom Bentley --- GOVERNANCE.md | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 16fd618..e53ff08 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -9,23 +9,23 @@ This governance model is designed to uphold the principles of transparency, open [coc]: ./CODE_OF_CONDUCT.md [contrib]: ./CONTRIBUTING.md -## Table of Contents +## Code of Conduct -- [Roles and Responsibilities](#roles-and-responsibilities) -- [Decision Making](#decision-making) -- [Code of Conduct](#code-of-conduct) -- [Trademark Policy](#trademark-policy) -- [Contributing](#contributing) +All participants in the project are expected to adhere to the project's [Code of Conduct](./CODE_OF_CONDUCT.md). Please ensure you are familiar with its guidelines and expectations, as it's essential for maintaining a positive and collaborative environment. ## Roles and Responsibilities +- **Contributors:** Anyone who contributes to the project in any form. - **Code owners:** Individuals with write access to any repository within the GitHub organisation, responsible for reviewing and merging contributions, and steering project direction. Those people with code ownership responsibilities will be identified in each repository (`.github/CODEOWNERS`). For the sake of transparency, the membership of github teams will be made public in [TEAMS.md](TEAMS.md). -- **Contributors:** Anyone who contributes to the project in any form. Reference: [About code owners](https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners) +## Contributing + +We welcome all forms of contribution, from code improvements to documentation and design. For details on how to contribute and the process your contributions will follow, please read our [Contributing Guidelines][contrib]. + ## Decision Making This project follows The [Commonhaus decision making][cdm] process. @@ -35,18 +35,6 @@ This project uses the following decision making process. 2. **Voting:** In situations where consensus cannot be reached, decisions may be made through a simple majority vote among the code owners. 3. **Conflict Resolution:** If conflicts arise, code owners are responsible for facilitating a resolution. The [Commonhaus Foundation Council][cfc] (CFC) can be asked to mediate the discussion, if necessary. -## Code of Conduct - -All participants in the project are expected to adhere to the project's [Code of Conduct](./CODE_OF_CONDUCT.md). Please ensure you are familiar with its guidelines and expectations, as it's essential for maintaining a positive and collaborative environment. - -## Trademark Policy - -The Kroxylicious logos, icons, and domain names are protected by trademark rights. Usage of these trademarks must adhere to our [Trademark Policy][ctp]. - -## Contributing - -We welcome all forms of contribution, from code improvements to documentation and design. For details on how to contribute and the process your contributions will follow, please read our [Contributing Guidelines][contrib]. - ## Becoming a Code Owner New Code Owners can be elected by a majority vote of the existing Code Owners following the [Decision Making](#decision-making) process. @@ -65,3 +53,7 @@ To ensure that all potential Code Owners are judged fairly and consistently the * Promotion of Kroxylicious, for example by blogging, speaking at conferences, and so on. * Knowing when to ask for help or seek consensus. * An indication of being committed to the long term success of the project. + +## Trademark Policy + +The Kroxylicious logos, icons, and domain names are protected by trademark rights. Usage of these trademarks must adhere to our [Trademark Policy][ctp]. From 0147087f671f86a39d676060df94cf3a76be8efd Mon Sep 17 00:00:00 2001 From: Tom Bentley Date: Wed, 4 Feb 2026 14:27:53 +1300 Subject: [PATCH 02/15] Add Users as a participant; add Contributor duties Signed-off-by: Tom Bentley --- GOVERNANCE.md | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/GOVERNANCE.md b/GOVERNANCE.md index e53ff08..6eb3664 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -9,13 +9,24 @@ This governance model is designed to uphold the principles of transparency, open [coc]: ./CODE_OF_CONDUCT.md [contrib]: ./CONTRIBUTING.md +# Purpose + +The purpose of the Kroxylicious Project is to develop a Kafka protocol proxy with an open source license, and to make the resulting software and documentation available to Users. + ## Code of Conduct All participants in the project are expected to adhere to the project's [Code of Conduct](./CODE_OF_CONDUCT.md). Please ensure you are familiar with its guidelines and expectations, as it's essential for maintaining a positive and collaborative environment. -## Roles and Responsibilities +## Participants + +- **Users:** Anyone using the software is a User. + While the Project exists to provide the software to Users, the other participants' duties are to all current and potential Users collectively, any not to the interests of any one User, or subset of Users. + +- **Contributors:** Anyone who contributes to the project in any form is a Contributor. + Contributions can take a variety of forms, but many of them, such as source code and documentation, need to be approved before being accepted by the Project. + The most common kind of contribution requiring such approval is a github pull request (PR); the merging of the PR signifies its approval. + The duty of a Contributor is to offer a contribution in good faith, to the best of their ability, and being honest when signing off on the Developer Certificate of Origin. -- **Contributors:** Anyone who contributes to the project in any form. - **Code owners:** Individuals with write access to any repository within the GitHub organisation, responsible for reviewing and merging contributions, and steering project direction. Those people with code ownership responsibilities will be identified in each repository (`.github/CODEOWNERS`). For the sake of transparency, the membership of github teams will be made public in [TEAMS.md](TEAMS.md). From aa0381d7025ebabc85b17d5148ab2a26db703531 Mon Sep 17 00:00:00 2001 From: Tom Bentley Date: Wed, 4 Feb 2026 16:50:20 +1300 Subject: [PATCH 03/15] Factor a Project Manager role out of Committer Signed-off-by: Tom Bentley --- GOVERNANCE.md | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 6eb3664..c037d9a 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -27,11 +27,14 @@ All participants in the project are expected to adhere to the project's [Code of The most common kind of contribution requiring such approval is a github pull request (PR); the merging of the PR signifies its approval. The duty of a Contributor is to offer a contribution in good faith, to the best of their ability, and being honest when signing off on the Developer Certificate of Origin. -- **Code owners:** Individuals with write access to any repository within the GitHub organisation, responsible for reviewing and merging contributions, and steering project direction. - Those people with code ownership responsibilities will be identified in each repository (`.github/CODEOWNERS`). - For the sake of transparency, the membership of github teams will be made public in [TEAMS.md](TEAMS.md). - -Reference: [About code owners](https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners) +- **Committers:** Individuals with write access to any repository within the Kroxylicious GitHub organisation, except for the repository containing this `GOVERNANCE.md` file. + The duty of a Committer is to help Contributors make high quality contributions to the Project. + As such Committers are responsible for reviewing and merging contributions. + An individual may act as both a Contributor and a Committer for a contribution. + +- **Project Managers:** Individuals with write access to the repository containing this `GOVERNANCE.md` file within the Kroxylicious GitHub organisation. + Project Managers are tasked with identifying individuals who have made valuable contributions which further the Project's purpose. + They can collectively decide to invite a Contributor to become a Committer; or to invite a Committer to become a Project Manager. ## Contributing @@ -42,17 +45,17 @@ We welcome all forms of contribution, from code improvements to documentation an This project follows The [Commonhaus decision making][cdm] process. This project uses the following decision making process. -1. **Consensus-seeking (lazy consensus):** The project primarily aims for a consensus-based decision-making process, where code owners and active contributors discuss and come to an agreement. -2. **Voting:** In situations where consensus cannot be reached, decisions may be made through a simple majority vote among the code owners. -3. **Conflict Resolution:** If conflicts arise, code owners are responsible for facilitating a resolution. The [Commonhaus Foundation Council][cfc] (CFC) can be asked to mediate the discussion, if necessary. +1. **Consensus-seeking (lazy consensus):** The project primarily aims for a consensus-based decision-making process, where committers and active contributors discuss and come to an agreement. +2. **Voting:** In situations where consensus cannot be reached about a PR, decisions may be made through a simple majority vote among the committers. +3. **Conflict Resolution:** If conflicts arise, project managers are responsible for facilitating a resolution. The [Commonhaus Foundation Council][cfc] (CFC) can be asked to mediate the discussion, if necessary. -## Becoming a Code Owner +## Becoming a Committer -New Code Owners can be elected by a majority vote of the existing Code Owners following the [Decision Making](#decision-making) process. +New Committers can be elected by a majority vote of the Project Managers following the [Decision Making](#decision-making) process. -To ensure that all potential Code Owners are judged fairly and consistently the following criteria should be taken into account in electing new Code Owners: +To ensure that all potential Committers are judged fairly and consistently the following criteria should be taken into account in electing new Committers: -### Code Owner Criteria +### Committer Criteria * Sustained contributions over at least 3 months ideally including non-trivial PRs. * Reviewing other contributors’ PRs From 435fe3dcf293918e0cefe158b790c5bc35630813 Mon Sep 17 00:00:00 2001 From: Tom Bentley Date: Wed, 4 Feb 2026 17:05:40 +1300 Subject: [PATCH 04/15] Tidy up; reference files enumerating those in a role Signed-off-by: Tom Bentley --- GOVERNANCE.md | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/GOVERNANCE.md b/GOVERNANCE.md index c037d9a..2ab0b9b 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -8,6 +8,9 @@ This governance model is designed to uphold the principles of transparency, open [ctp]: https://www.commonhaus.org/policies/trademark-policy/ [coc]: ./CODE_OF_CONDUCT.md [contrib]: ./CONTRIBUTING.md +[dco]: ./DCO.txt +[committers]: ./COMMITTERS.md +[PMs]: ./PMs.md # Purpose @@ -15,7 +18,7 @@ The purpose of the Kroxylicious Project is to develop a Kafka protocol proxy wit ## Code of Conduct -All participants in the project are expected to adhere to the project's [Code of Conduct](./CODE_OF_CONDUCT.md). Please ensure you are familiar with its guidelines and expectations, as it's essential for maintaining a positive and collaborative environment. +All participants in the project are expected to adhere to the project's [Code of Conduct][coc]. Please ensure you are familiar with its guidelines and expectations, as it's essential for maintaining a positive and collaborative environment. ## Participants @@ -25,15 +28,17 @@ All participants in the project are expected to adhere to the project's [Code of - **Contributors:** Anyone who contributes to the project in any form is a Contributor. Contributions can take a variety of forms, but many of them, such as source code and documentation, need to be approved before being accepted by the Project. The most common kind of contribution requiring such approval is a github pull request (PR); the merging of the PR signifies its approval. - The duty of a Contributor is to offer a contribution in good faith, to the best of their ability, and being honest when signing off on the Developer Certificate of Origin. + The duty of a Contributor is to offer a contribution in good faith, to the best of their ability, and being honest when signing off on the [Developer Certificate of Origin][dco]. - **Committers:** Individuals with write access to any repository within the Kroxylicious GitHub organisation, except for the repository containing this `GOVERNANCE.md` file. + These people are listed in [COMMITTERS.md][committers]. The duty of a Committer is to help Contributors make high quality contributions to the Project. As such Committers are responsible for reviewing and merging contributions. An individual may act as both a Contributor and a Committer for a contribution. - **Project Managers:** Individuals with write access to the repository containing this `GOVERNANCE.md` file within the Kroxylicious GitHub organisation. - Project Managers are tasked with identifying individuals who have made valuable contributions which further the Project's purpose. + These people are listed in [PMs.md][PMs]. + Project Managers are tasked sustaining the project, in part by identifying individuals who have made valuable contributions which further the Project's purpose. They can collectively decide to invite a Contributor to become a Committer; or to invite a Committer to become a Project Manager. ## Contributing @@ -51,11 +56,16 @@ This project uses the following decision making process. ## Becoming a Committer -New Committers can be elected by a majority vote of the Project Managers following the [Decision Making](#decision-making) process. +Existing Committers are encouraged to: -To ensure that all potential Committers are judged fairly and consistently the following criteria should be taken into account in electing new Committers: +* inform the Project Managers about the review burden they're experiencing. +* suggest to the Project Managers other individuals who they consider meet the above criteria. -### Committer Criteria +The Project Managers should endevour to match the number of active committers to the reported review burden, by inviting Contributors to become Committers. + +New Committers are elected by a majority vote of the Project Managers following the [Decision Making](#decision-making) process. + +To ensure that all potential Committers are judged fairly and consistently, the following criteria should be taken into account in electing new Committers: * Sustained contributions over at least 3 months ideally including non-trivial PRs. * Reviewing other contributors’ PRs @@ -68,6 +78,25 @@ To ensure that all potential Committers are judged fairly and consistently the f * Knowing when to ask for help or seek consensus. * An indication of being committed to the long term success of the project. +## Becoming a Committer or Project Manager + +New Project Managers can be elected by a majority vote of the Project Managers following the [Decision Making](#decision-making) process. + +To ensure that all potential Project Managers are judged fairly and consistently, the following criteria (in addition to those for being a Committer) should be taken into account in electing new Project Managers: + +* Sustained contributions _as a committer_ over at least 3 months. +* Reviewing and merging other contributors’ non-trivial PRs. +* Knowing when to ask for help or seek consensus. +* Continued commitment to the long term success of the project. + +Unlike the situation for Committers, the need for more Project Managers is not driven by the review burden, and is left to the discretion of the existing Project Managers. + +## Ceasing participation + +A Committer or Project Manager can voluntarily cease their involvement in the project by opening a PR removing themselves from the [COMMITTERS.md][committers] and/or [PMs.md][PMs] files in this repository. +Such PRs will be deemed as approved automatically, without recourse to the [Decision Making](#decision-making) process. + ## Trademark Policy The Kroxylicious logos, icons, and domain names are protected by trademark rights. Usage of these trademarks must adhere to our [Trademark Policy][ctp]. + From a5d0c55e7bf5cc01eadc43a281b53262c146175a Mon Sep 17 00:00:00 2001 From: Tom Bentley Date: Thu, 5 Feb 2026 11:59:23 +1300 Subject: [PATCH 05/15] Teams, COMMITTERS.md and PMs.md Signed-off-by: Tom Bentley --- TEAMS.md => COMMITTERS.md | 11 +++++++---- CONTRIBUTING.md | 7 ++++--- GOVERNANCE.md | 19 +++++++++++++------ PMs.md | 15 +++++++++++++++ 4 files changed, 39 insertions(+), 13 deletions(-) rename TEAMS.md => COMMITTERS.md (79%) create mode 100644 PMs.md diff --git a/TEAMS.md b/COMMITTERS.md similarity index 79% rename from TEAMS.md rename to COMMITTERS.md index f75acbc..edd51c1 100644 --- a/TEAMS.md +++ b/COMMITTERS.md @@ -1,8 +1,7 @@ +# Kroxylicious Committers -# People - -The following people are members of at least one team. -The format is: `{preferred name}, {affiliation} (@{github_username})` +The following people are [Committers](GOVERANCE.md). +The format is: `{preferred name}, {affiliation} (@{github_username})`. * Tom Bentley, IBM (@tombentley) * Robert Young, IBM (@robobario) @@ -12,6 +11,10 @@ The format is: `{preferred name}, {affiliation} (@{github_username})` * Francisco Vila, IBM (@franvila) * Paul Mellor, IBM (@PaulRMellor) +The project managers can be addressed collectively in GitHub using the `@kroxylicious/committers` team. + + + # Teams The following sections publicise the membership of the organization's teams. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3a8f946..8b66a2a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -27,10 +27,11 @@ Certificate of Origin (DCO)](./DCO.txt). This can be done using `git commit -s` for each commit in your pull request. Alternatively, to signoff a bunch of commits you can use `git rebase --signoff _your-branch_`. -## Code Review +## PR Review -All changes which are to be committed in project source control must be reviewed by at least one Code Owner before being merged. -If the change is being authored by someone who is a Code Owner, that change must be reviewed by at least one other Code Owner before being merged. +All changes which are to be committed in project source control must be reviewed by at least one [Committer](COMMITTERS.md) before being merged. +If the change is being authored by someone who is a Committer, that change must be reviewed by at least one other Committer before being merged. +The GitHub teams `@kroxylicious/code-reviewers` and `@kroxylicious/doc-reviewers` can be used to request a PR review from contributors. ## I just have a question diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 2ab0b9b..dca5281 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -25,18 +25,18 @@ All participants in the project are expected to adhere to the project's [Code of - **Users:** Anyone using the software is a User. While the Project exists to provide the software to Users, the other participants' duties are to all current and potential Users collectively, any not to the interests of any one User, or subset of Users. -- **Contributors:** Anyone who contributes to the project in any form is a Contributor. +- **Contributors:** Anyone who contributes to the project, in any form, is a Contributor. Contributions can take a variety of forms, but many of them, such as source code and documentation, need to be approved before being accepted by the Project. - The most common kind of contribution requiring such approval is a github pull request (PR); the merging of the PR signifies its approval. + The most common kind of contribution requiring such approval is a github Pull Request (PR); the merging of the PR signifies its approval. The duty of a Contributor is to offer a contribution in good faith, to the best of their ability, and being honest when signing off on the [Developer Certificate of Origin][dco]. -- **Committers:** Individuals with write access to any repository within the Kroxylicious GitHub organisation, except for the repository containing this `GOVERNANCE.md` file. +- **Committers:** Committers are those individuals with write access to any repository within the Kroxylicious GitHub organisation, except for the repository containing this `GOVERNANCE.md` file. These people are listed in [COMMITTERS.md][committers]. The duty of a Committer is to help Contributors make high quality contributions to the Project. - As such Committers are responsible for reviewing and merging contributions. + As such, Committers are responsible for reviewing and merging contributions. An individual may act as both a Contributor and a Committer for a contribution. -- **Project Managers:** Individuals with write access to the repository containing this `GOVERNANCE.md` file within the Kroxylicious GitHub organisation. +- **Project Managers:** Project Managers are those individuals with write access to the repository containing this `GOVERNANCE.md` file within the Kroxylicious GitHub organisation. These people are listed in [PMs.md][PMs]. Project Managers are tasked sustaining the project, in part by identifying individuals who have made valuable contributions which further the Project's purpose. They can collectively decide to invite a Contributor to become a Committer; or to invite a Committer to become a Project Manager. @@ -59,7 +59,7 @@ This project uses the following decision making process. Existing Committers are encouraged to: * inform the Project Managers about the review burden they're experiencing. -* suggest to the Project Managers other individuals who they consider meet the above criteria. +* suggest to the Project Managers other individuals who they consider meet the Committer criteria below. The Project Managers should endevour to match the number of active committers to the reported review burden, by inviting Contributors to become Committers. @@ -96,6 +96,13 @@ Unlike the situation for Committers, the need for more Project Managers is not d A Committer or Project Manager can voluntarily cease their involvement in the project by opening a PR removing themselves from the [COMMITTERS.md][committers] and/or [PMs.md][PMs] files in this repository. Such PRs will be deemed as approved automatically, without recourse to the [Decision Making](#decision-making) process. + +**TODO** figure out how the gitub teams map to things. +`@kroxylicious/pms` team (was `@kroxylicious/admins`) == `kroxylicious-pms@` mailing list == the Project Managers +`@kroxylicious/committers` (was `@kroxylicious/developers`) == The Committers +`@kroxylicious/code-reviewers` == an informal team that contributors can ask to be added to if they're willing to review other people's PRs touching code +`@kroxylicious/doc-reviewers` == an informal team that contributors can ask to be added to if they're willing to review other people's PRs touching docs + ## Trademark Policy The Kroxylicious logos, icons, and domain names are protected by trademark rights. Usage of these trademarks must adhere to our [Trademark Policy][ctp]. diff --git a/PMs.md b/PMs.md new file mode 100644 index 0000000..1698e06 --- /dev/null +++ b/PMs.md @@ -0,0 +1,15 @@ + +# Project Managers + +The following people are [Project Managers](GOVERANCE.md). +The format is: `{preferred name}, {affiliation} (@{github_username})`. + +* Tom Bentley, IBM (@tombentley) +* Robert Young, IBM (@robobario) +* Sam Barker, IBM (@SamBarker) +* Grace Grimwood, IBM (@gracegrimwood) +* Keith Wall, IBM (@k-wall) +* Francisco Vila, IBM (@franvila) +* Paul Mellor, IBM (@PaulRMellor) + +The project managers can be addressed collectively in GitHub using the `@kroxylicious/pms` team, or via email to to . From 06d2a40d9568c9206cc7f367fbd921b1fd66e733 Mon Sep 17 00:00:00 2001 From: Tom Bentley Date: Thu, 5 Feb 2026 11:59:44 +1300 Subject: [PATCH 06/15] Remove TODO Signed-off-by: Tom Bentley --- GOVERNANCE.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/GOVERNANCE.md b/GOVERNANCE.md index dca5281..f33f6d1 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -96,13 +96,6 @@ Unlike the situation for Committers, the need for more Project Managers is not d A Committer or Project Manager can voluntarily cease their involvement in the project by opening a PR removing themselves from the [COMMITTERS.md][committers] and/or [PMs.md][PMs] files in this repository. Such PRs will be deemed as approved automatically, without recourse to the [Decision Making](#decision-making) process. - -**TODO** figure out how the gitub teams map to things. -`@kroxylicious/pms` team (was `@kroxylicious/admins`) == `kroxylicious-pms@` mailing list == the Project Managers -`@kroxylicious/committers` (was `@kroxylicious/developers`) == The Committers -`@kroxylicious/code-reviewers` == an informal team that contributors can ask to be added to if they're willing to review other people's PRs touching code -`@kroxylicious/doc-reviewers` == an informal team that contributors can ask to be added to if they're willing to review other people's PRs touching docs - ## Trademark Policy The Kroxylicious logos, icons, and domain names are protected by trademark rights. Usage of these trademarks must adhere to our [Trademark Policy][ctp]. From c73b9b63c66ddc9d438e753ef4c8e03fea52c5e3 Mon Sep 17 00:00:00 2001 From: Tom Bentley Date: Thu, 5 Feb 2026 12:02:24 +1300 Subject: [PATCH 07/15] Fixup Signed-off-by: Tom Bentley --- COMMITTERS.md | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/COMMITTERS.md b/COMMITTERS.md index edd51c1..2500818 100644 --- a/COMMITTERS.md +++ b/COMMITTERS.md @@ -11,34 +11,5 @@ The format is: `{preferred name}, {affiliation} (@{github_username})`. * Francisco Vila, IBM (@franvila) * Paul Mellor, IBM (@PaulRMellor) -The project managers can be addressed collectively in GitHub using the `@kroxylicious/committers` team. - - - -# Teams - -The following sections publicise the membership of the organization's teams. -The format for each item is `@{github_username}`, which can be cross-referenced with the people above. - -# `@kroxylicious/admins` - -* @tombentley -* @robobario -* @SamBarker -* @gracegrimwood -* @k-wall -* @franvila - -## `@kroxylicious/developers` - -* @tombentley -* @robobario -* @SamBarker -* @gracegrimwood -* @k-wall -* @franvila - -## `@kroxylicious/documentationwriters` - -* @PaulRMellor +The committers can be addressed collectively in GitHub using the `@kroxylicious/committers` team. From 3b64b3a3cb1306afd796d2282c10a80ea4c3aaef Mon Sep 17 00:00:00 2001 From: Tom Bentley Date: Thu, 5 Feb 2026 18:26:08 +1300 Subject: [PATCH 08/15] Rob's comments + more clarity wrt voting Signed-off-by: Tom Bentley --- GOVERNANCE.md | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/GOVERNANCE.md b/GOVERNANCE.md index f33f6d1..cc7dd8e 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -36,7 +36,7 @@ All participants in the project are expected to adhere to the project's [Code of As such, Committers are responsible for reviewing and merging contributions. An individual may act as both a Contributor and a Committer for a contribution. -- **Project Managers:** Project Managers are those individuals with write access to the repository containing this `GOVERNANCE.md` file within the Kroxylicious GitHub organisation. +- **Project Managers:** Project Managers are Committers who also have write access to the repository containing this `GOVERNANCE.md` file within the Kroxylicious GitHub organisation. These people are listed in [PMs.md][PMs]. Project Managers are tasked sustaining the project, in part by identifying individuals who have made valuable contributions which further the Project's purpose. They can collectively decide to invite a Contributor to become a Committer; or to invite a Committer to become a Project Manager. @@ -48,12 +48,18 @@ We welcome all forms of contribution, from code improvements to documentation an ## Decision Making This project follows The [Commonhaus decision making][cdm] process. -This project uses the following decision making process. + +This project uses the following decision making process for PRs in all repositories except for the repository containing this `GOVERNANCE.md`: 1. **Consensus-seeking (lazy consensus):** The project primarily aims for a consensus-based decision-making process, where committers and active contributors discuss and come to an agreement. 2. **Voting:** In situations where consensus cannot be reached about a PR, decisions may be made through a simple majority vote among the committers. 3. **Conflict Resolution:** If conflicts arise, project managers are responsible for facilitating a resolution. The [Commonhaus Foundation Council][cfc] (CFC) can be asked to mediate the discussion, if necessary. +This project uses the following decision making process for PRs in the repository containing this `GOVERNANCE.md`, [COMMITTERS.md][committers] and [PMs.md][PMs] files: + +1. **Voting:** Decisions may be made through a simple majority vote among the committers who participate in a vote, as tallied 7 days after the start of the voting process. +2. **Conflict Resolution:** If conflicts arise, project managers are responsible for facilitating a resolution. The [Commonhaus Foundation Council][cfc] (CFC) can be asked to mediate the discussion, if necessary. + ## Becoming a Committer Existing Committers are encouraged to: @@ -61,9 +67,9 @@ Existing Committers are encouraged to: * inform the Project Managers about the review burden they're experiencing. * suggest to the Project Managers other individuals who they consider meet the Committer criteria below. -The Project Managers should endevour to match the number of active committers to the reported review burden, by inviting Contributors to become Committers. +The Project Managers should endeavour to match the number of active committers to the reported review burden, by inviting Contributors to become Committers. -New Committers are elected by a majority vote of the Project Managers following the [Decision Making](#decision-making) process. +New Committers are elected by the Project Managers following the above [Decision Making](#decision-making) process to approve a PR which adds an individual to the [COMMITTERS.md][committers] file. To ensure that all potential Committers are judged fairly and consistently, the following criteria should be taken into account in electing new Committers: @@ -78,9 +84,9 @@ To ensure that all potential Committers are judged fairly and consistently, the * Knowing when to ask for help or seek consensus. * An indication of being committed to the long term success of the project. -## Becoming a Committer or Project Manager +## Becoming a Project Manager -New Project Managers can be elected by a majority vote of the Project Managers following the [Decision Making](#decision-making) process. +New Project Managers are elected by the existing Project Managers following the above [Decision Making](#decision-making) process to approve a PR which adds an individual to the [PMs.md][PMs] file. To ensure that all potential Project Managers are judged fairly and consistently, the following criteria (in addition to those for being a Committer) should be taken into account in electing new Project Managers: From b7bd0f32dded14843d3498249e18bd1584d65b5c Mon Sep 17 00:00:00 2001 From: Tom Bentley Date: Thu, 5 Feb 2026 18:33:08 +1300 Subject: [PATCH 09/15] doh Signed-off-by: Tom Bentley --- GOVERNANCE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GOVERNANCE.md b/GOVERNANCE.md index cc7dd8e..61bff5d 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -57,7 +57,7 @@ This project uses the following decision making process for PRs in all repositor This project uses the following decision making process for PRs in the repository containing this `GOVERNANCE.md`, [COMMITTERS.md][committers] and [PMs.md][PMs] files: -1. **Voting:** Decisions may be made through a simple majority vote among the committers who participate in a vote, as tallied 7 days after the start of the voting process. +1. **Voting:** Decisions may be made through a simple majority vote among the project managers who participate in a vote, as tallied 7 days after the start of the voting process. 2. **Conflict Resolution:** If conflicts arise, project managers are responsible for facilitating a resolution. The [Commonhaus Foundation Council][cfc] (CFC) can be asked to mediate the discussion, if necessary. ## Becoming a Committer From 3b36a6c2b12b665344ac89432f04dee866de5333 Mon Sep 17 00:00:00 2001 From: Tom Bentley Date: Mon, 9 Feb 2026 10:08:19 +1300 Subject: [PATCH 10/15] Tweak words Signed-off-by: Tom Bentley --- GOVERNANCE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 61bff5d..6091a4b 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -28,7 +28,7 @@ All participants in the project are expected to adhere to the project's [Code of - **Contributors:** Anyone who contributes to the project, in any form, is a Contributor. Contributions can take a variety of forms, but many of them, such as source code and documentation, need to be approved before being accepted by the Project. The most common kind of contribution requiring such approval is a github Pull Request (PR); the merging of the PR signifies its approval. - The duty of a Contributor is to offer a contribution in good faith, to the best of their ability, and being honest when signing off on the [Developer Certificate of Origin][dco]. + The duty of a Contributor is to offer a contribution in good faith, to the best of their ability, and to be honest when signing off on the [Developer Certificate of Origin][dco]. - **Committers:** Committers are those individuals with write access to any repository within the Kroxylicious GitHub organisation, except for the repository containing this `GOVERNANCE.md` file. These people are listed in [COMMITTERS.md][committers]. @@ -38,7 +38,7 @@ All participants in the project are expected to adhere to the project's [Code of - **Project Managers:** Project Managers are Committers who also have write access to the repository containing this `GOVERNANCE.md` file within the Kroxylicious GitHub organisation. These people are listed in [PMs.md][PMs]. - Project Managers are tasked sustaining the project, in part by identifying individuals who have made valuable contributions which further the Project's purpose. + Project Managers are tasked with sustaining the project, in part by identifying individuals who have made valuable contributions which further the Project's purpose. They can collectively decide to invite a Contributor to become a Committer; or to invite a Committer to become a Project Manager. ## Contributing From a8aabff8e327ee3051cea68568b8cb5c88dc5477 Mon Sep 17 00:00:00 2001 From: Tom Bentley Date: Thu, 12 Feb 2026 15:15:37 +1300 Subject: [PATCH 11/15] EGC and shared secrets Signed-off-by: Tom Bentley --- GOVERNANCE.md | 5 +++++ PMs.md | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 6091a4b..640df80 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -97,6 +97,11 @@ To ensure that all potential Project Managers are judged fairly and consistently Unlike the situation for Committers, the need for more Project Managers is not driven by the review burden, and is left to the discretion of the existing Project Managers. +The Commonhaus [Extended Governance Committee](https://www.commonhaus.org/bylaws/cf-council.html#extended-governance-committee-egc) has a [primary and secondary](https://github.com/commonhaus/foundation/blob/main/CONTACTS.yaml) representitive from the Project. +These will be selected from, and by, the Project Managers. +Other aspects of this representation are left to the discretion of the Project Managers using the [Decision Making](#decision-making) process. + + ## Ceasing participation A Committer or Project Manager can voluntarily cease their involvement in the project by opening a PR removing themselves from the [COMMITTERS.md][committers] and/or [PMs.md][PMs] files in this repository. diff --git a/PMs.md b/PMs.md index 1698e06..5dc0dee 100644 --- a/PMs.md +++ b/PMs.md @@ -3,12 +3,13 @@ The following people are [Project Managers](GOVERANCE.md). The format is: `{preferred name}, {affiliation} (@{github_username})`. +Those marked with a * have access to the project's shared secrets. * Tom Bentley, IBM (@tombentley) -* Robert Young, IBM (@robobario) -* Sam Barker, IBM (@SamBarker) +* Robert Young*, IBM (@robobario) +* Sam Barker*, IBM (@SamBarker) * Grace Grimwood, IBM (@gracegrimwood) -* Keith Wall, IBM (@k-wall) +* Keith Wall*, IBM (@k-wall) * Francisco Vila, IBM (@franvila) * Paul Mellor, IBM (@PaulRMellor) From 1d30e708d0902d081a33009b23a8a3e9057fb677 Mon Sep 17 00:00:00 2001 From: Tom Bentley Date: Mon, 16 Feb 2026 11:02:25 +1300 Subject: [PATCH 12/15] grace affiliation Signed-off-by: Tom Bentley --- COMMITTERS.md | 2 +- PMs.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/COMMITTERS.md b/COMMITTERS.md index 2500818..b4a5ec1 100644 --- a/COMMITTERS.md +++ b/COMMITTERS.md @@ -6,7 +6,7 @@ The format is: `{preferred name}, {affiliation} (@{github_username})`. * Tom Bentley, IBM (@tombentley) * Robert Young, IBM (@robobario) * Sam Barker, IBM (@SamBarker) -* Grace Grimwood, IBM (@gracegrimwood) +* Grace Grimwood, unaffiliated (@gracegrimwood) * Keith Wall, IBM (@k-wall) * Francisco Vila, IBM (@franvila) * Paul Mellor, IBM (@PaulRMellor) diff --git a/PMs.md b/PMs.md index 5dc0dee..d9e6eb5 100644 --- a/PMs.md +++ b/PMs.md @@ -8,7 +8,7 @@ Those marked with a * have access to the project's shared secrets. * Tom Bentley, IBM (@tombentley) * Robert Young*, IBM (@robobario) * Sam Barker*, IBM (@SamBarker) -* Grace Grimwood, IBM (@gracegrimwood) +* Grace Grimwood, unaffiliated (@gracegrimwood) * Keith Wall*, IBM (@k-wall) * Francisco Vila, IBM (@franvila) * Paul Mellor, IBM (@PaulRMellor) From 08145e6fa2d6daf0f465cb273d59023ad2e02b08 Mon Sep 17 00:00:00 2001 From: Tom Bentley Date: Mon, 16 Feb 2026 11:05:09 +1300 Subject: [PATCH 13/15] Clarify teams Signed-off-by: Tom Bentley --- COMMITTERS.md | 1 + CONTRIBUTING.md | 2 ++ PMs.md | 1 + 3 files changed, 4 insertions(+) diff --git a/COMMITTERS.md b/COMMITTERS.md index b4a5ec1..f249315 100644 --- a/COMMITTERS.md +++ b/COMMITTERS.md @@ -3,6 +3,7 @@ The following people are [Committers](GOVERANCE.md). The format is: `{preferred name}, {affiliation} (@{github_username})`. + * Tom Bentley, IBM (@tombentley) * Robert Young, IBM (@robobario) * Sam Barker, IBM (@SamBarker) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8b66a2a..5dbcf81 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -33,6 +33,8 @@ All changes which are to be committed in project source control must be reviewed If the change is being authored by someone who is a Committer, that change must be reviewed by at least one other Committer before being merged. The GitHub teams `@kroxylicious/code-reviewers` and `@kroxylicious/doc-reviewers` can be used to request a PR review from contributors. +If you're willing to provide code and/or reviews to others then let one of the [project managers](PMs.md) know know and we can add you to the relevant GitHub team. + ## I just have a question If you encounter any issues while using Kroxylicious, you can get help using: diff --git a/PMs.md b/PMs.md index d9e6eb5..b7ce26e 100644 --- a/PMs.md +++ b/PMs.md @@ -5,6 +5,7 @@ The following people are [Project Managers](GOVERANCE.md). The format is: `{preferred name}, {affiliation} (@{github_username})`. Those marked with a * have access to the project's shared secrets. + * Tom Bentley, IBM (@tombentley) * Robert Young*, IBM (@robobario) * Sam Barker*, IBM (@SamBarker) From ac7d6ef3f98f226095086c9c7c51bbc5eaa78c82 Mon Sep 17 00:00:00 2001 From: Tom Bentley Date: Mon, 16 Feb 2026 11:05:21 +1300 Subject: [PATCH 14/15] Clarify Signed-off-by: Tom Bentley --- GOVERNANCE.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 640df80..ab3f134 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -107,6 +107,8 @@ Other aspects of this representation are left to the discretion of the Project M A Committer or Project Manager can voluntarily cease their involvement in the project by opening a PR removing themselves from the [COMMITTERS.md][committers] and/or [PMs.md][PMs] files in this repository. Such PRs will be deemed as approved automatically, without recourse to the [Decision Making](#decision-making) process. +All other changes to the Committers or Project Managers are, by definition, a change to the `COMMITTERS.md` and/or `PMs.md` files in this repo, which are handled by the decision making processes described above. + ## Trademark Policy The Kroxylicious logos, icons, and domain names are protected by trademark rights. Usage of these trademarks must adhere to our [Trademark Policy][ctp]. From 84696f14dc8bdfed3172459115bad9e0b456f901 Mon Sep 17 00:00:00 2001 From: Tom Bentley Date: Mon, 16 Feb 2026 11:12:13 +1300 Subject: [PATCH 15/15] Typo Signed-off-by: Tom Bentley --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5dbcf81..a007ad7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -33,7 +33,7 @@ All changes which are to be committed in project source control must be reviewed If the change is being authored by someone who is a Committer, that change must be reviewed by at least one other Committer before being merged. The GitHub teams `@kroxylicious/code-reviewers` and `@kroxylicious/doc-reviewers` can be used to request a PR review from contributors. -If you're willing to provide code and/or reviews to others then let one of the [project managers](PMs.md) know know and we can add you to the relevant GitHub team. +If you're willing to provide code and/or reviews to others then let one of the [project managers](PMs.md) know and we can add you to the relevant GitHub team. ## I just have a question