From d5b5263f5a2d8c36855a18e1895bd440c85f5ad3 Mon Sep 17 00:00:00 2001
From: spring-builds <builds@springframework.org>
Date: Mon, 13 Jan 2025 21:49:07 +0000
Subject: [PATCH 1/3] Bumping versions

---
 pom.xml                               | 6 +++---
 spring-cloud-bus-dependencies/pom.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index e2835fb..bbbec5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.1.5-SNAPSHOT</version>
+		<version>4.1.6-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -31,8 +31,8 @@
 
 	<properties>
 		<spring-cloud-commons.version>4.1.6-SNAPSHOT</spring-cloud-commons.version>
-		<spring-cloud-stream.version>4.1.5-SNAPSHOT</spring-cloud-stream.version>
-		<spring-cloud-function.version>4.1.5-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-stream.version>4.1.6-SNAPSHOT</spring-cloud-stream.version>
+		<spring-cloud-function.version>4.1.6-SNAPSHOT</spring-cloud-function.version>
 		<bintray.package>bus</bintray.package>
 	</properties>
 
diff --git a/spring-cloud-bus-dependencies/pom.xml b/spring-cloud-bus-dependencies/pom.xml
index 87e2257..87ae264 100644
--- a/spring-cloud-bus-dependencies/pom.xml
+++ b/spring-cloud-bus-dependencies/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>4.1.5-SNAPSHOT</version>
+		<version>4.1.6-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-bus-dependencies</artifactId>

From b77591b102622345db39caebdd6c79b91f0aaddb Mon Sep 17 00:00:00 2001
From: spring-builds <builds@springframework.org>
Date: Fri, 17 Jan 2025 10:03:31 +0000
Subject: [PATCH 2/3] Bumping versions

---
 README.adoc | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/README.adoc b/README.adoc
index 78df911..59af5b4 100644
--- 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
+[[developer-certificate-of-origin]]
+== Developer Certificate of Origin (DCO)
 
-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.
+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

From 954feba7132867abf6676d09a782af4c78509fa2 Mon Sep 17 00:00:00 2001
From: Ryan Baxter <ryan.baxter@broadcom.com>
Date: Fri, 17 Jan 2025 11:51:13 -0500
Subject: [PATCH 3/3] DCO changes

---
 .github/dco.yml              |  2 ++
 .github/workflows/maven.yaml | 12 ++++++------
 .java-version                |  1 +
 docs/.java-version           |  1 +
 4 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 .github/dco.yml
 create mode 100644 .java-version
 create mode 100644 docs/.java-version

diff --git a/.github/dco.yml b/.github/dco.yml
new file mode 100644
index 0000000..0c4b142
--- /dev/null
+++ b/.github/dco.yml
@@ -0,0 +1,2 @@
+require:
+  members: false
diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
index a55f144..0bc9385 100644
--- a/.github/workflows/maven.yaml
+++ b/.github/workflows/maven.yaml
@@ -4,21 +4,21 @@
 name: Build
 on:
     push:
-        branches: [ main, 3.1.x ]
+        branches: [ main, 4.2.x, 4.1.x, 3.1.x ]
     pull_request:
-        branches: [ main, 3.1.x ]
+        branches: [ main, 4.2.x, 4.1.x, 3.1.x ]
 jobs:
     build:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
             - name: Set up JDK
-              uses: actions/setup-java@v2
+              uses: actions/setup-java@v4
               with:
                   distribution: 'temurin'
                   java-version: '17'
             - name: Cache local Maven repository
-              uses: actions/cache@v2
+              uses: actions/cache@v4
               with:
                   path: ~/.m2/repository
                   key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -32,7 +32,7 @@ jobs:
               with:
                   report_paths: '**/surefire-reports/TEST-*.xml'
             - name: Archive code coverage results
-              uses: actions/upload-artifact@v2
+              uses: actions/upload-artifact@v4
               with:
                   name: surefire-reports
                   path: '**/surefire-reports/*'
diff --git a/.java-version b/.java-version
new file mode 100644
index 0000000..98d9bcb
--- /dev/null
+++ b/.java-version
@@ -0,0 +1 @@
+17
diff --git a/docs/.java-version b/docs/.java-version
new file mode 100644
index 0000000..98d9bcb
--- /dev/null
+++ b/docs/.java-version
@@ -0,0 +1 @@
+17