From b92f0004e1be61d8b29974ecaad30336319ca428 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Fri, 10 Jan 2025 00:23:27 +0000 Subject: [PATCH 1/6] Update SNAPSHOT to 3.1.4 --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-circuitbreaker-dependencies/pom.xml | 4 ++-- spring-cloud-circuitbreaker-resilience4j/pom.xml | 2 +- spring-cloud-circuitbreaker-spring-retry/pom.xml | 2 +- spring-cloud-starter-circuitbreaker/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 12e219f..4942db4 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-circuitbreaker - 3.1.4-SNAPSHOT + 3.1.4 4.0.0 diff --git a/pom.xml b/pom.xml index 4d9b92f..a1c69fa 100644 --- a/pom.xml +++ b/pom.xml @@ -6,12 +6,12 @@ spring-cloud-circuitbreaker pom - 3.1.4-SNAPSHOT + 3.1.4 org.springframework.cloud spring-cloud-build - 4.1.5-SNAPSHOT + 4.1.5 @@ -21,7 +21,7 @@ reuseReports ${project.basedir}/../target/jacoco.exec java - 4.1.6-SNAPSHOT + 4.1.5 diff --git a/spring-cloud-circuitbreaker-dependencies/pom.xml b/spring-cloud-circuitbreaker-dependencies/pom.xml index 565fcd8..df661a9 100644 --- a/spring-cloud-circuitbreaker-dependencies/pom.xml +++ b/spring-cloud-circuitbreaker-dependencies/pom.xml @@ -7,12 +7,12 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.1.5-SNAPSHOT + 4.1.5 spring-cloud-circuitbreaker-dependencies - 3.1.4-SNAPSHOT + 3.1.4 pom spring-cloud-circuitbreaker-dependencies Spring Cloud Circuit Breaker Dependencies diff --git a/spring-cloud-circuitbreaker-resilience4j/pom.xml b/spring-cloud-circuitbreaker-resilience4j/pom.xml index 9eec7ee..1d43183 100644 --- a/spring-cloud-circuitbreaker-resilience4j/pom.xml +++ b/spring-cloud-circuitbreaker-resilience4j/pom.xml @@ -5,7 +5,7 @@ spring-cloud-circuitbreaker org.springframework.cloud - 3.1.4-SNAPSHOT + 3.1.4 .. 4.0.0 diff --git a/spring-cloud-circuitbreaker-spring-retry/pom.xml b/spring-cloud-circuitbreaker-spring-retry/pom.xml index ecd5489..f382d3e 100644 --- a/spring-cloud-circuitbreaker-spring-retry/pom.xml +++ b/spring-cloud-circuitbreaker-spring-retry/pom.xml @@ -5,7 +5,7 @@ spring-cloud-circuitbreaker org.springframework.cloud - 3.1.4-SNAPSHOT + 3.1.4 4.0.0 diff --git a/spring-cloud-starter-circuitbreaker/pom.xml b/spring-cloud-starter-circuitbreaker/pom.xml index b8acc43..194dee3 100644 --- a/spring-cloud-starter-circuitbreaker/pom.xml +++ b/spring-cloud-starter-circuitbreaker/pom.xml @@ -5,7 +5,7 @@ spring-cloud-circuitbreaker org.springframework.cloud - 3.1.4-SNAPSHOT + 3.1.4 4.0.0 diff --git a/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-reactor-resilience4j/pom.xml b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-reactor-resilience4j/pom.xml index d5172d2..b247bdb 100644 --- a/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-reactor-resilience4j/pom.xml +++ b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-reactor-resilience4j/pom.xml @@ -5,7 +5,7 @@ spring-cloud-starter-circuitbreaker org.springframework.cloud - 3.1.4-SNAPSHOT + 3.1.4 4.0.0 diff --git a/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-resilience4j/pom.xml b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-resilience4j/pom.xml index 8a89b4b..4296352 100644 --- a/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-resilience4j/pom.xml +++ b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-resilience4j/pom.xml @@ -5,7 +5,7 @@ spring-cloud-starter-circuitbreaker org.springframework.cloud - 3.1.4-SNAPSHOT + 3.1.4 4.0.0 spring-cloud-starter-circuitbreaker-resilience4j diff --git a/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-spring-retry/pom.xml b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-spring-retry/pom.xml index de07bf4..2b96fae 100644 --- a/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-spring-retry/pom.xml +++ b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-spring-retry/pom.xml @@ -5,7 +5,7 @@ spring-cloud-starter-circuitbreaker org.springframework.cloud - 3.1.4-SNAPSHOT + 3.1.4 4.0.0 From be46c20c26c6e287c5e7d56484530c9fa6e3b9c9 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Fri, 10 Jan 2025 00:24:26 +0000 Subject: [PATCH 2/6] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-circuitbreaker-dependencies/pom.xml | 4 ++-- spring-cloud-circuitbreaker-resilience4j/pom.xml | 2 +- spring-cloud-circuitbreaker-spring-retry/pom.xml | 2 +- spring-cloud-starter-circuitbreaker/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 4942db4..12e219f 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-circuitbreaker - 3.1.4 + 3.1.4-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index a1c69fa..4d9b92f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,12 +6,12 @@ spring-cloud-circuitbreaker pom - 3.1.4 + 3.1.4-SNAPSHOT org.springframework.cloud spring-cloud-build - 4.1.5 + 4.1.5-SNAPSHOT @@ -21,7 +21,7 @@ reuseReports ${project.basedir}/../target/jacoco.exec java - 4.1.5 + 4.1.6-SNAPSHOT diff --git a/spring-cloud-circuitbreaker-dependencies/pom.xml b/spring-cloud-circuitbreaker-dependencies/pom.xml index df661a9..565fcd8 100644 --- a/spring-cloud-circuitbreaker-dependencies/pom.xml +++ b/spring-cloud-circuitbreaker-dependencies/pom.xml @@ -7,12 +7,12 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.1.5 + 4.1.5-SNAPSHOT spring-cloud-circuitbreaker-dependencies - 3.1.4 + 3.1.4-SNAPSHOT pom spring-cloud-circuitbreaker-dependencies Spring Cloud Circuit Breaker Dependencies diff --git a/spring-cloud-circuitbreaker-resilience4j/pom.xml b/spring-cloud-circuitbreaker-resilience4j/pom.xml index 1d43183..9eec7ee 100644 --- a/spring-cloud-circuitbreaker-resilience4j/pom.xml +++ b/spring-cloud-circuitbreaker-resilience4j/pom.xml @@ -5,7 +5,7 @@ spring-cloud-circuitbreaker org.springframework.cloud - 3.1.4 + 3.1.4-SNAPSHOT .. 4.0.0 diff --git a/spring-cloud-circuitbreaker-spring-retry/pom.xml b/spring-cloud-circuitbreaker-spring-retry/pom.xml index f382d3e..ecd5489 100644 --- a/spring-cloud-circuitbreaker-spring-retry/pom.xml +++ b/spring-cloud-circuitbreaker-spring-retry/pom.xml @@ -5,7 +5,7 @@ spring-cloud-circuitbreaker org.springframework.cloud - 3.1.4 + 3.1.4-SNAPSHOT 4.0.0 diff --git a/spring-cloud-starter-circuitbreaker/pom.xml b/spring-cloud-starter-circuitbreaker/pom.xml index 194dee3..b8acc43 100644 --- a/spring-cloud-starter-circuitbreaker/pom.xml +++ b/spring-cloud-starter-circuitbreaker/pom.xml @@ -5,7 +5,7 @@ spring-cloud-circuitbreaker org.springframework.cloud - 3.1.4 + 3.1.4-SNAPSHOT 4.0.0 diff --git a/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-reactor-resilience4j/pom.xml b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-reactor-resilience4j/pom.xml index b247bdb..d5172d2 100644 --- a/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-reactor-resilience4j/pom.xml +++ b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-reactor-resilience4j/pom.xml @@ -5,7 +5,7 @@ spring-cloud-starter-circuitbreaker org.springframework.cloud - 3.1.4 + 3.1.4-SNAPSHOT 4.0.0 diff --git a/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-resilience4j/pom.xml b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-resilience4j/pom.xml index 4296352..8a89b4b 100644 --- a/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-resilience4j/pom.xml +++ b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-resilience4j/pom.xml @@ -5,7 +5,7 @@ spring-cloud-starter-circuitbreaker org.springframework.cloud - 3.1.4 + 3.1.4-SNAPSHOT 4.0.0 spring-cloud-starter-circuitbreaker-resilience4j diff --git a/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-spring-retry/pom.xml b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-spring-retry/pom.xml index 2b96fae..de07bf4 100644 --- a/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-spring-retry/pom.xml +++ b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-spring-retry/pom.xml @@ -5,7 +5,7 @@ spring-cloud-starter-circuitbreaker org.springframework.cloud - 3.1.4 + 3.1.4-SNAPSHOT 4.0.0 From 75484eb3d646621b1dfec7fdfa0a5cb994e2a57c Mon Sep 17 00:00:00 2001 From: spring-builds Date: Fri, 10 Jan 2025 00:24:26 +0000 Subject: [PATCH 3/6] Bumping versions to 3.1.5-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-circuitbreaker-dependencies/pom.xml | 2 +- spring-cloud-circuitbreaker-resilience4j/pom.xml | 2 +- spring-cloud-circuitbreaker-spring-retry/pom.xml | 2 +- spring-cloud-starter-circuitbreaker/pom.xml | 2 +- .../pom.xml | 2 +- .../spring-cloud-starter-circuitbreaker-resilience4j/pom.xml | 2 +- .../spring-cloud-starter-circuitbreaker-spring-retry/pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 12e219f..a6f32c0 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-circuitbreaker - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 4d9b92f..73c2f41 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ spring-cloud-circuitbreaker pom - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT org.springframework.cloud diff --git a/spring-cloud-circuitbreaker-dependencies/pom.xml b/spring-cloud-circuitbreaker-dependencies/pom.xml index 565fcd8..30017bd 100644 --- a/spring-cloud-circuitbreaker-dependencies/pom.xml +++ b/spring-cloud-circuitbreaker-dependencies/pom.xml @@ -12,7 +12,7 @@ spring-cloud-circuitbreaker-dependencies - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT pom spring-cloud-circuitbreaker-dependencies Spring Cloud Circuit Breaker Dependencies diff --git a/spring-cloud-circuitbreaker-resilience4j/pom.xml b/spring-cloud-circuitbreaker-resilience4j/pom.xml index 9eec7ee..0fa47b2 100644 --- a/spring-cloud-circuitbreaker-resilience4j/pom.xml +++ b/spring-cloud-circuitbreaker-resilience4j/pom.xml @@ -5,7 +5,7 @@ spring-cloud-circuitbreaker org.springframework.cloud - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT .. 4.0.0 diff --git a/spring-cloud-circuitbreaker-spring-retry/pom.xml b/spring-cloud-circuitbreaker-spring-retry/pom.xml index ecd5489..fddcb8e 100644 --- a/spring-cloud-circuitbreaker-spring-retry/pom.xml +++ b/spring-cloud-circuitbreaker-spring-retry/pom.xml @@ -5,7 +5,7 @@ spring-cloud-circuitbreaker org.springframework.cloud - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-starter-circuitbreaker/pom.xml b/spring-cloud-starter-circuitbreaker/pom.xml index b8acc43..06cd4c2 100644 --- a/spring-cloud-starter-circuitbreaker/pom.xml +++ b/spring-cloud-starter-circuitbreaker/pom.xml @@ -5,7 +5,7 @@ spring-cloud-circuitbreaker org.springframework.cloud - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-reactor-resilience4j/pom.xml b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-reactor-resilience4j/pom.xml index d5172d2..59ed10d 100644 --- a/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-reactor-resilience4j/pom.xml +++ b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-reactor-resilience4j/pom.xml @@ -5,7 +5,7 @@ spring-cloud-starter-circuitbreaker org.springframework.cloud - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-resilience4j/pom.xml b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-resilience4j/pom.xml index 8a89b4b..7f7d35d 100644 --- a/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-resilience4j/pom.xml +++ b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-resilience4j/pom.xml @@ -5,7 +5,7 @@ spring-cloud-starter-circuitbreaker org.springframework.cloud - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT 4.0.0 spring-cloud-starter-circuitbreaker-resilience4j diff --git a/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-spring-retry/pom.xml b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-spring-retry/pom.xml index de07bf4..a7048d7 100644 --- a/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-spring-retry/pom.xml +++ b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-spring-retry/pom.xml @@ -5,7 +5,7 @@ spring-cloud-starter-circuitbreaker org.springframework.cloud - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT 4.0.0 From a4f3bb88b376fb5b1a6b100aa6d8114551b6d130 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Fri, 10 Jan 2025 00:25:04 +0000 Subject: [PATCH 4/6] Bumping dependency versions after release --- pom.xml | 4 ++-- spring-cloud-circuitbreaker-dependencies/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 73c2f41..5f23368 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-build - 4.1.5-SNAPSHOT + 4.1.6-SNAPSHOT @@ -21,7 +21,7 @@ reuseReports ${project.basedir}/../target/jacoco.exec java - 4.1.6-SNAPSHOT + 4.1.5 diff --git a/spring-cloud-circuitbreaker-dependencies/pom.xml b/spring-cloud-circuitbreaker-dependencies/pom.xml index 30017bd..05a7c86 100644 --- a/spring-cloud-circuitbreaker-dependencies/pom.xml +++ b/spring-cloud-circuitbreaker-dependencies/pom.xml @@ -7,7 +7,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.1.5-SNAPSHOT + 4.1.6-SNAPSHOT From 6e4072f43bba740c55454a4573fcf0c0a84e9a14 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 14 Jan 2025 11:06:39 +0000 Subject: [PATCH 5/6] Bumping versions --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5f23368..95afccf 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ reuseReports ${project.basedir}/../target/jacoco.exec java - 4.1.5 + 4.1.6-SNAPSHOT From 77c84fe3760eb9bc0f74a75aaf2434abbae4266b Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 16 Jan 2025 11:26:50 -0500 Subject: [PATCH 6/6] Updating for DCO --- .github/dco.yml | 2 ++ README.adoc | 12 ++++-------- 2 files changed, 6 insertions(+), 8 deletions(-) create mode 100644 .github/dco.yml 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/README.adoc b/README.adoc index 24ae3e2..ef05052 100644 --- a/README.adoc +++ b/README.adoc @@ -111,15 +111,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