Skip to content

Commit 8ee3d32

Browse files
authored
doc: modify ASF and remove meaningless CLA (#2237)
1 parent 5227248 commit 8ee3d32

File tree

2 files changed

+18
-7
lines changed

2 files changed

+18
-7
lines changed

.asf.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,5 @@ notifications:
5757
issues: issues@hugegraph.apache.org
5858
issues_status: dev@hugegraph.apache.org
5959
issues_comment: issues@hugegraph.apache.org
60-
discussions: dev@hugegraph.apache.org
60+
discussions_status: dev@hugegraph.apache.org
61+
discussions_comment: issues@hugegraph.apache.org

CONTRIBUTING.md

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ The following is a contribution guide for HugeGraph:
99

1010
## 1. Preparation
1111

12+
**Recommended**: You can use [GitHub desktop](https://desktop.github.com/) to greatly simplify the PR process.
13+
1214
We can contribute by reporting issues, submitting code patches or any other feedback.
1315

1416
Before submitting the code, we need to do some preparation:
@@ -37,8 +39,6 @@ Before submitting the code, we need to do some preparation:
3739
git config user.email "{email-address-of-github}" # like "jermy@apache.org"
3840
```
3941

40-
**Recommended**: You can use [GitHub desktop](https://desktop.github.com/) to greatly simplify the PR process.
41-
4242
## 2. Create an Issue on GitHub
4343

4444
If you encounter bugs or have any questions, please go to [GitHub Issues](https://github.com/apache/incubator-hugegraph/issues) to report them and feel free to [create an issue](https://github.com/apache/incubator-hugegraph/issues/new).
@@ -71,6 +71,20 @@ mvn test -Pcore-test,memory
7171
```
7272
Note: In order to be consistent with the code style easily, if you use [IDEA](https://www.jetbrains.com/idea/) as your IDE, you can directly [import](https://www.jetbrains.com/help/idea/configuring-code-style.html) our code style [configuration file](./hugegraph-style.xml).
7373

74+
##### 3.2.1 Check licenses
75+
If we want to add new third-party dependencies to the `HugeGraph` project, we need to do the following things:
76+
1. Find the third-party dependent repository, put the dependent `license` file into [./hugegraph-dist/release-docs/licenses/](https://github.com/apache/incubator-hugegraph/tree/master/hugegraph-dist/release-docs/licenses) path.
77+
2. Declare the dependency in [./hugegraph-dist/release-docs/LICENSE](https://github.com/apache/incubator-hugegraph/blob/master/hugegraph-dist/release-docs/LICENSE) `LICENSE` information.
78+
3. Find the NOTICE file in the repository and append it to [./hugegraph-dist/release-docs/NOTICE](https://github.com/apache/incubator-hugegraph/blob/master/hugegraph-dist/release-docs/NOTICE) file (skip this step if there is no NOTICE file).
79+
4. Execute locally [./hugegraph-dist/scripts/dependency/regenerate_known_dependencies.sh](https://github.com/apache/incubator-hugegraph/blob/master/hugegraph-dist/scripts/dependency/regenerate_known_dependencies.sh) to update the dependency list [known-dependencies.txt](https://github.com/apache/incubator-hugegraph/blob/master/hugegraph-dist/scripts/dependency/known-dependencies.txt) (or manually update) .
80+
81+
**Example**: A new third-party dependency is introduced into the project -> `ant-1.9.1.jar`
82+
- The project source code is located at: https://github.com/apache/ant/tree/rel/1.9.1
83+
- LICENSE file: https://github.com/apache/ant/blob/rel/1.9.1/LICENSE
84+
- NOTICE file: https://github.com/apache/ant/blob/rel/1.9.1/NOTICE
85+
86+
The license information of `ant-1.9.1.jar` needs to be specified in the LICENSE file, and the notice information needs to be specified in the NOTICE file. The detailed LICENSE file corresponding to ant-1.9.1.jar needs to be copied to our licenses/ directory. Finally update the known-dependencies.txt file.
87+
7488
#### 3.3 Commit changes to git repo
7589

7690
After the code has been completed, we submit them to the local git repo:
@@ -109,10 +123,6 @@ Note that since GitHub requires submitting code through `username + token` (inst
109123

110124
Go to the web page of GitHub fork repo, there would be a chance to create a Pull Request after pushing to a new branch, just click button "Compare & pull request" to do it. Then edit the description for proposed changes, which can just be copied from the commit message.
111125

112-
Please sign the HugeGraph CLA when contributing code for the first time. You can sign the CLA by just posting a Pull Request Comment same as the below format:
113-
114-
`I have read the CLA Document and I hereby sign the CLA`
115-
116126
Note: please make sure the email address you used to submit the code is bound to the GitHub account. For how to bind the email address, please refer to https://github.com/settings/emails:
117127
<img width="1280" alt="image" src="https://user-images.githubusercontent.com/9625821/163522445-2a50a72a-dea2-434f-9868-3a0d40d0d037.png">
118128

0 commit comments

Comments
 (0)