Skip to content

Commit f894c66

Browse files
authored
Use linux DCO not our old contributors certificate of origin (#3598)
* Use linux DCO not our old contributors certificate of origin * Revert "Use linux DCO not our old contributors certificate of origin" This reverts commit b0f8551. * use linux DCO * use linux DCO * Use linux DCO not our old contributors certificate of origin * update release documentation Signed-off-by: Terence Parr <[email protected]>
1 parent 374c361 commit f894c66

4 files changed

+81
-3
lines changed

.github/PULL_REQUEST_TEMPLATE.md

+21-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
11
<!--
2-
Thank you for proposing a contribution to the ANTLR project. In order to accept changes from the outside world, all contributors must "sign" the [contributors.txt](https://github.com/antlr/antlr4/blob/master/contributors.txt) contributors certificate of origin. It's an unfortunate reality of today's fuzzy and bizarre world of open-source ownership.
2+
Thank you for proposing a contribution to the ANTLR project!
33
4-
Make sure you are already in the contributors.txt file or add a commit to this pull request with the appropriate change. Thanks!
5-
-->
4+
(Please make sure your PR is in a branch other than dev or master
5+
and also make sure that you derive this branch from dev.)
6+
7+
As of 4.10, ANTLR uses the Linux Foundation's Developer
8+
Certificate of Origin, DCO, version 1.1. See either
9+
https://developercertificate.org/ or file
10+
contributors-cert-of-origin.txt in the main directory.
11+
12+
Each commit requires a "signature", which is simple as
13+
using `-s` (not `-S`) to the git commit command:
14+
15+
git commit -s -m 'This is my commit message'
16+
17+
Github's pull request process enforces the sig and gives
18+
instructions on how to fix any commits that lack the sig.
19+
See https://github.com/apps/dco for more info.
20+
21+
No signature is required in this file (unlike the
22+
previous ANTLR contributor's certificate of origin.)
23+
-->

developer-cert-of-origin.txt

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
As of 4.10, ANTLR uses the Linux Foundation's Developer
2+
Certificate of Origin, DCO, version 1.1. See either
3+
https://developercertificate.org/ or the text below.
4+
5+
Each commit requires a "signature", which is simple as
6+
using `-s` (not `-S`) to the git commit command:
7+
8+
git commit -s -m 'This is my commit message'
9+
10+
Github's pull request process enforces the sig and gives
11+
instructions on how to fix any commits that lack the sig.
12+
See https://github.com/apps/dco for more info.
13+
14+
No signature is required in this file (unlike the
15+
previous ANTLR contributor's certificate of origin.)
16+
17+
----- https://developercertificate.org/ ------
18+
19+
Developer Certificate of Origin
20+
Version 1.1
21+
22+
Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
23+
24+
Everyone is permitted to copy and distribute verbatim copies of this
25+
license document, but changing it is not allowed.
26+
27+
28+
Developer's Certificate of Origin 1.1
29+
30+
By making a contribution to this project, I certify that:
31+
32+
(a) The contribution was created in whole or in part by me and I
33+
have the right to submit it under the open source license
34+
indicated in the file; or
35+
36+
(b) The contribution is based upon previous work that, to the best
37+
of my knowledge, is covered under an appropriate open source
38+
license and I have the right under that license to submit that
39+
work with modifications, whether created in whole or in part
40+
by me, under the same open source license (unless I am
41+
permitted to submit under a different license), as indicated
42+
in the file; or
43+
44+
(c) The contribution was provided directly to me by some other
45+
person who certified (a), (b) or (c) and I have not modified
46+
it.
47+
48+
(d) I understand and agree that this project and the contribution
49+
are public and that a record of the contribution (including all
50+
personal information I submit with it, including my sign-off) is
51+
maintained indefinitely and may be redistributed consistent with
52+
this project or the open source license(s) involved.

doc/releasing-antlr.md

+8
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@
44

55
Create a pre-release or full release at github; [Example 4.5-rc-1](https://github.com/antlr/antlr4/releases/tag/4.5-rc-1).
66

7+
### Turn on DCO Enforcement
8+
9+
As of 4.10, we will be using the Linux DCO not the previous contributors license agreement that required signing the file. Now, we use the DCO and contributors must use `-s` on each commit to the branch associated with a pull request.
10+
11+
See [GitHub App DCO](https://github.com/apps/dco).
12+
13+
Make sure this has turned on for the `dev` and `master` branch.
14+
715
### Delete existing release tag
816

917
Wack any existing tag as mvn will create one and it fails if already there.
File renamed without changes.

0 commit comments

Comments
 (0)