Merge branch '4.1.x'

spring-cloud · Jan 17, 2025 · 5ed7ae8 · 5ed7ae8
2 parents a853289 + 954feba
commit 5ed7ae8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.github/dco.yml b/.github/dco.yml
@@ -0,0 +1,2 @@
+require:
+  members: false
diff --git a/.java-version b/.java-version
@@ -0,0 +1 @@
+17
diff --git a/README.adoc b/README.adoc
@@ -115,15 +115,11 @@ tracker for issues and merging pull requests into main. If you want
 to contribute even something trivial please do not hesitate, but
 follow the guidelines below.
 
-[[sign-the-contributor-license-agreement]]
-== Sign the Contributor License Agreement
-
-Before we accept a non-trivial patch or pull request we will need you to sign the
-https://cla.pivotal.io/sign/spring[Contributor License Agreement].
-Signing the contributor's agreement does not grant anyone commit rights to the main
-repository, but it does mean that we can accept your contributions, and you will get an
-author credit if we do.  Active contributors might be asked to join the core team, and
-given the ability to merge pull requests.
+[[developer-certificate-of-origin]]
+== Developer Certificate of Origin (DCO)
+
+All commits must include a __Signed-off-by__ trailer at the end of each commit message to indicate that the contributor agrees to the Developer Certificate of Origin.
+For additional details, please refer to the blog post https://spring.io/blog/2025/01/06/hello-dco-goodbye-cla-simplifying-contributions-to-spring[Hello DCO, Goodbye CLA: Simplifying Contributions to Spring].
 
 [[code-of-conduct]]
 == Code of Conduct

diff --git a/docs/.java-version b/docs/.java-version
@@ -0,0 +1 @@
+17