This is an automated email from the ASF dual-hosted git repository.

jshao pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/gravitino.git


The following commit(s) were added to refs/heads/main by this push:
     new 2133d95ac [#4073] Update policies to be in line with ASF policy. 
(#4080)
2133d95ac is described below

commit 2133d95ac86918c9345e9a2440fc646c0fbbe0d3
Author: Justin Mclean <[email protected]>
AuthorDate: Fri Jul 5 13:05:58 2024 +1000

    [#4073] Update policies to be in line with ASF policy. (#4080)
    
    ### What changes were proposed in this pull request?
    
    Update project's current policies to be in line with ASF policy.
    
    ### Why are the changes needed?
    
    To comply with ASF policy.
    
    Fix: #4073
    
    ### Does this PR introduce _any_ user-facing change?
    
    No.
    
    ### How was this patch tested?
    
    Built locally.
---
 CODE_OF_CONDUCT.md |   2 +-
 CONTRIBUTING.md    |   2 +-
 GOVERNANCE.md      |  30 +--------------
 MAINTAINERS.md     | 106 ++++++++++++++++++++++++++++-------------------------
 SECURITY.md        |  27 +-------------
 5 files changed, 61 insertions(+), 106 deletions(-)

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index c83f1d12e..7c9052a60 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -58,7 +58,7 @@ Examples of representing our community include using an 
official e-mail address,
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be 
reported to the community leaders responsible for enforcement at 
<[email protected]>.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be 
reported to the community leaders responsible for enforcement at 
<[email protected]>.
 All complaints will be reviewed and investigated promptly and fairly.
 All community leaders are obligated to respect the privacy and security of the 
reporter of any incident.
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 028b782be..c4c83b6f6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -281,7 +281,7 @@ All text files should use macOS/unix style line endings 
(LF) not windows style l
 
 ## Community and communication
 
-Join the [community discourse group](https://gravitino.discourse.group) to 
discuss ideas and seek help. You are also encouraged to use GitHub discussions 
and follow Datastrato on social media to stay updated on project news.
+Join the [community mailing 
list](https://lists.apache.org/[email protected]) to discuss 
ideas and seek help and are also encouraged to use GitHub discussions.
 
 ## License
 
diff --git a/GOVERNANCE.md b/GOVERNANCE.md
index 5d28e44b4..37418d608 100644
--- a/GOVERNANCE.md
+++ b/GOVERNANCE.md
@@ -19,32 +19,4 @@
 
 # Governance Policy
 
-This document provides the governance policy for the project. Maintainers 
agree to this policy and to follow all project polices by adding their name to 
the [maintainers.md file](./MAINTAINERS.md).
-
-## 1. Roles
-
-This project includes the following roles.
-
-**1.1. Maintainers**. Maintainers oversee the development, maintenance, and 
updates of the project, and play a role in consensus decision-making. The 
addition or removal of Maintainers requires approval from the existing 
Maintainers.
-
-**1.2. Contributors**. Contributors are individuals who have made 
contributions to the project.
-
-## 2. Decisions
-
-**2.1. Consensus-Based Decision Making**. Decisions in projects are reached 
through consensus. Although unanimous agreement is preferred, it's not required.
-
-## 3. How We Work
-
-**3.1. Openness**. Anyone can participate in the project, and there should be 
minimal barriers to entry.
-
-**3.2. Balance**. The development process should balance the interests of all 
stakeholders.
-
-**3.3. Harmonization**. Good-faith efforts shall be made to resolve any 
conflicts.
-
-## 4. Trademarks
-
-Any names, trademarks or logos of the project may only be used if they 
indicate the project's source.
-
-## 5. Amendments
-
-Amendments to this governance policy may be made by approval of the 
Maintainers.
+The Apache Gravitino project follows the standard [ASF governance 
model](https://www.apache.org/foundation/governance/) and [ASF 
policies](https://www.apache.org/foundation/policies/) and [ASF Incubator 
policies] (https://incubator.apache.org/policy/incubation.html).
\ No newline at end of file
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index ceb250584..f9b693345 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -17,58 +17,11 @@
   under the License.
 -->
 
-This document lists the maintainers and contributors of the Project.
+Note: This maintainer and contributor tables at the end of this document list 
the maintainers and contributors of the project before it become an ASF project 
and are no longer updated.
 
-# Maintainers
+# Committers
 
-Maintainers may be added once approved by the existing maintainers (see 
[Governance document](GOVERNANCE.md)). By adding your name to this list you 
agree to follow the project's guidelines and governance including the [Code of 
Conduct](CODE-OF-CONDUCT.md) and that you have permission to contribute from 
your employer. All contributions are licensed under the Apache License version 
2.
-
-| **NAME**      | **GitHub Username** | **Organization** |
-|---------------|---------------------|------------------|
-| Justin Mclean | justinmclean        | Datastrato       |
-| He Qi         | qqqttt123           | Datastrato       |
-| Minghuang Li  | mchades             | Datastrato       |
-| Xun Liu       | xunliu              | Datastrato       |
-| Hui Yu        | diqiu50             | Datastrato       |
-| Xiaojing Fang | FANNG1              | Datastrato       |
-| Qi Yu         | yuqi1129            | Datastrato       |
-| Decheng Liu   | ch3yne              | Datastrato       |
-| Saisai Shao   | jerryshao           | Datastrato       |
-| Shaofeng Shi  | shaofengshi         | Datastrato       |
-| Lisa Cao      | lisancao            | Datastrato       |
-| Qian Xia      | LauraXia123         | Datastrato       |
-| Danhua Wang   | danhuawang          | Datastrato       |
-
-# Contributors
-
-Contributors may be added by existing maintainers (see [Governance 
document](GOVERNANCE.md)). By adding your name to this list you agree to follow 
the project's guidelines and governance including the [Code of 
Conduct](CODE-OF-CONDUCT.md) and that you have permission to contribute from 
your employer. All contributions are licensed under the Apache License version 
2.
-
-| **NAME**       | **GitHub Username** | **Organization** |
-|----------------|---------------------|------------------|
-| Kuan-Po Tseng  | brandboat           | SUSE             |
-| Nicholas Jiang | SteNicholas         | Bilibili         |
-| Eric Chang     | unknowntpo          | Lawsnote         |
-| Sophie Sun     | SophieTech88        | ExtraHop Network |
-| Xing Yong      | YxAc                | Xiaomi           |
-| Liwei Yang     | lw-yang             | Xiaomi           |
-| Yu-Ting Wang   | noidname01          | opensource4you   |
-| Ziva Li        | zivali              | Yahoo            |
-| Kang Zhou      | zhoukangcn          | Xiaomi           |
-| Han Zhang      | xiaozcy             | Xiaomi           |
-| Yu-Hsin Lai    | laiyousin           | Virginia Tech    |
-| Charlie Cheng  | charliecheng630     | cacaFly          |
-| PoAn Yang      | FrankYang0592       | SUSE             |
-| Congling Xia   | xiacongling         | Xiaomi           |
-| JieBao Xiao    | xloya               | Xiaomi           |
-| Can Cai        | caican00            | Xiaomi           |
-| Peidian Li     | coolderli           | Xiaomi           |
-| Brandon Lu     | Lanznx              | LINE             |
-| Lewis Jackson  | xnge                | opensource4you   |
-| Li-Hsing Liu   | austin362667        | opensource4you   |
-| Tianhang Li    | TEOTEO520           | Bilibili         |
-| Hiren Sharma   | hiirrxnn            | opensource4you   |
-| Chun-Hung Tseng| henrybear327        | opensource4you   |
-| Carl Chang     | ichuniq             | opensource4you   |
+The current Apache Gravitino project committers can be [viewed 
here](https://projects.apache.org/project.html?incubator-gravitino).
 
 ## Review process
 
@@ -131,3 +84,56 @@ For those bug fixes we should not backport:
    that could introduce new bugs.
 2. The bug being addressed is low priority or not critical to the community.
 3. The backported fix varies widely from the main branch fix.
+
+# Pre-ASF Maintainers
+
+Maintainers of the project are now called committers.
+
+All contributions from the people listed are licensed under the Apache License 
version 2.
+
+| **NAME**      | **GitHub Username** | **Organization** |
+|---------------|---------------------|------------------|
+| Justin Mclean | justinmclean        | Datastrato       |
+| He Qi         | qqqttt123           | Datastrato       |
+| Minghuang Li  | mchades             | Datastrato       |
+| Xun Liu       | xunliu              | Datastrato       |
+| Hui Yu        | diqiu50             | Datastrato       |
+| Xiaojing Fang | FANNG1              | Datastrato       |
+| Qi Yu         | yuqi1129            | Datastrato       |
+| Decheng Liu   | ch3yne              | Datastrato       |
+| Saisai Shao   | jerryshao           | Datastrato       |
+| Shaofeng Shi  | shaofengshi         | Datastrato       |
+| Lisa Cao      | lisancao            | Datastrato       |
+| Qian Xia      | LauraXia123         | Datastrato       |
+| Danhua Wang   | danhuawang          | Datastrato       |
+
+# Pre-ASF Contributors
+
+All contributions from the people listed are licensed under the Apache License 
version 2.
+
+| **NAME**       | **GitHub Username** | **Organization** |
+|----------------|---------------------|------------------|
+| Kuan-Po Tseng  | brandboat           | SUSE             |
+| Nicholas Jiang | SteNicholas         | Bilibili         |
+| Eric Chang     | unknowntpo          | Lawsnote         |
+| Sophie Sun     | SophieTech88        | ExtraHop Network |
+| Xing Yong      | YxAc                | Xiaomi           |
+| Liwei Yang     | lw-yang             | Xiaomi           |
+| Yu-Ting Wang   | noidname01          | opensource4you   |
+| Ziva Li        | zivali              | Yahoo            |
+| Kang Zhou      | zhoukangcn          | Xiaomi           |
+| Han Zhang      | xiaozcy             | Xiaomi           |
+| Yu-Hsin Lai    | laiyousin           | Virginia Tech    |
+| Charlie Cheng  | charliecheng630     | cacaFly          |
+| PoAn Yang      | FrankYang0592       | SUSE             |
+| Congling Xia   | xiacongling         | Xiaomi           |
+| JieBao Xiao    | xloya               | Xiaomi           |
+| Can Cai        | caican00            | Xiaomi           |
+| Peidian Li     | coolderli           | Xiaomi           |
+| Brandon Lu     | Lanznx              | LINE             |
+| Lewis Jackson  | xnge                | opensource4you   |
+| Li-Hsing Liu   | austin362667        | opensource4you   |
+| Tianhang Li    | TEOTEO520           | Bilibili         |
+| Hiren Sharma   | hiirrxnn            | opensource4you   |
+| Chun-Hung Tseng| henrybear327        | opensource4you   |
+| Carl Chang     | ichuniq             | opensource4you   |
diff --git a/SECURITY.md b/SECURITY.md
index c24077d17..9d80d9461 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -19,29 +19,6 @@
 
 # Security Policy
 
-## Reporting a Security Issue
+The Apache Gravitino project follows the standard processes as set out by the 
[ASF security team](https://www.apache.org/security/).
 
-If you discover a security issue in our software, please report it to us 
immediately. We take security seriously and will respond to verified issues as 
quickly as possible.
-
-**To report a security issue:**
-
-1. Email us at [[email protected]](mailto:[email protected]) with 
a detailed description of the issue. Please do not disclose the issue publicly 
until we have had a chance to address it.
-
-2. We will acknowledge your report within 3 working days and work to 
investigate and resolve the issue.
-
-## Responsible Disclosure
-
-We appreciate your help in responsibly disclosing security issues to us. We 
follow the principles of responsible disclosure, and we ask that you:
-
-- Do not publicly disclose the issue until we have had a chance to address it.
-- Provide us with a reasonable amount of time to address and fix the issue 
before making it public.
-
-## Our Commitment
-
-We will make every effort to resolve security issues in a timely manner and 
keep you informed of our progress.
-
-## Security Updates
-
-We will post updates regarding security incidents or resolutions.
-
-Thank you for your help in keeping our software secure.
+Please report any security issues to 
[[email protected]](mailto:[email protected]) or to 
([email protected])[mailto:[email protected]].

Reply via email to