Skip to content

Commit 75669c6

Browse files
committed
docs: Update CONTRIBUTING.md to reference DCO instead of CLA
Replace the outdated CLA (Contributor License Agreement) section with the current DCO (Developer Certificate of Origin) requirement. The README.adoc already references DCO, but .github/CONTRIBUTING.md still pointed to the retired Pivotal CLA. Also aligned a few other stale references: - master → main (branch references on lines 6, 29, 40) - spring-code-of-conduct@pivotal.io → code-of-conduct@spring.io (matching spring-cloud-build contributing docs) Fixes gh-3884 Signed-off-by: Meyon Soo Kim <39788337+PreAgile@users.noreply.github.com>
1 parent 9c38aad commit 75669c6

1 file changed

Lines changed: 12 additions & 11 deletions

File tree

.github/CONTRIBUTING.md

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,22 @@
33

44
Spring Cloud is released under the non-restrictive Apache 2.0 license,
55
and follows a very standard Github development process, using Github
6-
tracker for issues and merging pull requests into master. If you want
6+
tracker for issues and merging pull requests into main. If you want
77
to contribute even something trivial please do not hesitate, but
88
follow the guidelines below.
99

10-
## Sign the Contributor License Agreement
11-
Before we accept a non-trivial patch or pull request we will need you to sign the
12-
[Contributor License Agreement](https://cla.pivotal.io/sign/spring).
13-
Signing the contributor's agreement does not grant anyone commit rights to the main
14-
repository, but it does mean that we can accept your contributions, and you will get an
15-
author credit if we do. Active contributors might be asked to join the core team, and
16-
given the ability to merge pull requests.
10+
## Developer Certificate of Origin (DCO)
11+
All commits must include a `Signed-off-by` trailer at the end of each commit message
12+
to indicate that the contributor agrees to the
13+
[Developer Certificate of Origin](https://developercertificate.org/).
14+
You can add this automatically by using `git commit -s`.
15+
16+
For additional details, please refer to the blog post
17+
[Hello DCO, Goodbye CLA: Simplifying Contributions to Spring](https://spring.io/blog/2025/01/06/hello-dco-goodbye-cla-simplifying-contributions-to-spring).
1718

1819
## Code of Conduct
1920
This project adheres to the Contributor Covenant [Code of conduct](https://github.com/spring-cloud/spring-cloud-build/blob/main/docs/modules/ROOT/partials/code-of-conduct.adoc). By participating, you are expected to uphold this code. Please report
20-
unacceptable behavior to spring-code-of-conduct@pivotal.io.
21+
unacceptable behavior to code-of-conduct@spring.io.
2122

2223
## Code Conventions and Housekeeping
2324
None of these is essential for a pull request, but they will all help. They can also be
@@ -26,7 +27,7 @@ added after the original pull request but before a merge.
2627
* Use the Spring Framework code format conventions. If you use Eclipse
2728
you can import formatter settings using the
2829
`eclipse-code-formatter.xml` file from the
29-
[Spring Cloud Build](https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml) project. If using IntelliJ, you can use the
30+
[Spring Cloud Build](https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/spring-cloud-dependencies-parent/eclipse-code-formatter.xml) project. If using IntelliJ, you can use the
3031
[Eclipse Code Formatter Plugin](https://plugins.jetbrains.com/plugin/6546) to import the same file.
3132
* Make sure all new `.java` files to have a simple Javadoc class comment with at least an
3233
`@author` tag identifying you, and preferably at least a paragraph on what the class is
@@ -37,7 +38,7 @@ added after the original pull request but before a merge.
3738
than cosmetic changes).
3839
* Add some Javadocs and, if you change the namespace, some XSD doc elements.
3940
* A few unit tests would help a lot as well -- someone has to do it.
40-
* If no-one else is using your branch, please rebase it against the current master (or
41+
* If no-one else is using your branch, please rebase it against the current main (or
4142
other target branch in the main project).
4243
* When writing a commit message please follow [these conventions](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html),
4344
if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit

0 commit comments

Comments
 (0)