From 170e1692c477017aaf07428b36e532fbae16f6dd Mon Sep 17 00:00:00 2001 From: spring-builds Date: Thu, 16 Jan 2025 21:07:07 +0000 Subject: [PATCH 01/13] Bumping versions --- README.adoc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/README.adoc b/README.adoc index 26b6ede2..abbc1754 100644 --- a/README.adoc +++ b/README.adoc @@ -146,15 +146,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 6c869885e9a83773f0a3ed4c39cce0ce6892a37b Mon Sep 17 00:00:00 2001 From: spring-builds Date: Fri, 17 Jan 2025 07:52:25 +0000 Subject: [PATCH 02/13] Bumping versions --- README.adoc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/README.adoc b/README.adoc index 26b6ede2..abbc1754 100644 --- a/README.adoc +++ b/README.adoc @@ -146,15 +146,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 bfaddb4888cdcb94fd1b2f70311fb3efdf46df05 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Wed, 12 Mar 2025 21:05:35 +0000 Subject: [PATCH 03/13] Bumping versions --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index abbc1754..582ab525 100644 --- a/README.adoc +++ b/README.adoc @@ -330,7 +330,7 @@ Spring Cloud Build brings along the `basepom:duplicate-finder-maven-plugin`, th [[duplicate-finder-configuration]] === Duplicate Finder configuration -Duplicate finder is *enabled by default* and will run in the `verify` phase of your Maven build, but it will only take effect in your project if you add the `duplicate-finder-maven-plugin` to the `build` section of the projecst's `pom.xml`. +Duplicate finder is *enabled by default* and will run in the `verify` phase of your Maven build, but it will only take effect in your project if you add the `duplicate-finder-maven-plugin` to the `build` section of the project's `pom.xml`. .pom.xml [source,xml] From f5d766a1995b9abbf4438e164ce872d2b110e2d1 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Thu, 13 Mar 2025 07:50:39 +0000 Subject: [PATCH 04/13] Bumping versions --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index abbc1754..582ab525 100644 --- a/README.adoc +++ b/README.adoc @@ -330,7 +330,7 @@ Spring Cloud Build brings along the `basepom:duplicate-finder-maven-plugin`, th [[duplicate-finder-configuration]] === Duplicate Finder configuration -Duplicate finder is *enabled by default* and will run in the `verify` phase of your Maven build, but it will only take effect in your project if you add the `duplicate-finder-maven-plugin` to the `build` section of the projecst's `pom.xml`. +Duplicate finder is *enabled by default* and will run in the `verify` phase of your Maven build, but it will only take effect in your project if you add the `duplicate-finder-maven-plugin` to the `build` section of the project's `pom.xml`. .pom.xml [source,xml] From ed0e50aac8e28f50583bcfaebcce405466a05c85 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 18 Mar 2025 23:57:55 +0000 Subject: [PATCH 05/13] Update SNAPSHOT to 4.2.1 --- docs/pom.xml | 2 +- pom.xml | 12 ++++++------ spring-cloud-starter-zookeeper-all/pom.xml | 2 +- spring-cloud-starter-zookeeper-config/pom.xml | 2 +- spring-cloud-starter-zookeeper-discovery/pom.xml | 2 +- spring-cloud-starter-zookeeper/pom.xml | 2 +- spring-cloud-zookeeper-config/pom.xml | 2 +- spring-cloud-zookeeper-core/pom.xml | 2 +- spring-cloud-zookeeper-dependencies/pom.xml | 4 ++-- spring-cloud-zookeeper-discovery/pom.xml | 2 +- spring-cloud-zookeeper-sample/pom.xml | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 07dcaff6..6493c865 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1-SNAPSHOT + 4.2.1 .. spring-cloud-zookeeper-docs diff --git a/pom.xml b/pom.xml index edc61285..20e31ec0 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-cloud-zookeeper - 4.2.1-SNAPSHOT + 4.2.1 pom Spring Cloud Zookeeper Spring Cloud Zookeeper @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 4.2.1-SNAPSHOT + 4.2.1 @@ -150,10 +150,10 @@ - 4.2.1-SNAPSHOT - 4.2.1-SNAPSHOT - 4.2.1-SNAPSHOT - 4.2.1-SNAPSHOT + 4.2.1 + 4.2.1 + 4.2.1 + 4.2.1 1.17.6 5.15.0 diff --git a/spring-cloud-starter-zookeeper-all/pom.xml b/spring-cloud-starter-zookeeper-all/pom.xml index b1f4522e..90ccb4f9 100644 --- a/spring-cloud-starter-zookeeper-all/pom.xml +++ b/spring-cloud-starter-zookeeper-all/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1-SNAPSHOT + 4.2.1 .. spring-cloud-starter-zookeeper-all diff --git a/spring-cloud-starter-zookeeper-config/pom.xml b/spring-cloud-starter-zookeeper-config/pom.xml index e5d5af29..83f14ef5 100644 --- a/spring-cloud-starter-zookeeper-config/pom.xml +++ b/spring-cloud-starter-zookeeper-config/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1-SNAPSHOT + 4.2.1 .. spring-cloud-starter-zookeeper-config diff --git a/spring-cloud-starter-zookeeper-discovery/pom.xml b/spring-cloud-starter-zookeeper-discovery/pom.xml index 71aa5943..213f8ec1 100644 --- a/spring-cloud-starter-zookeeper-discovery/pom.xml +++ b/spring-cloud-starter-zookeeper-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1-SNAPSHOT + 4.2.1 .. spring-cloud-starter-zookeeper-discovery diff --git a/spring-cloud-starter-zookeeper/pom.xml b/spring-cloud-starter-zookeeper/pom.xml index 85fb0b85..b0c97c25 100644 --- a/spring-cloud-starter-zookeeper/pom.xml +++ b/spring-cloud-starter-zookeeper/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1-SNAPSHOT + 4.2.1 .. spring-cloud-starter-zookeeper diff --git a/spring-cloud-zookeeper-config/pom.xml b/spring-cloud-zookeeper-config/pom.xml index a02dec56..51b88234 100644 --- a/spring-cloud-zookeeper-config/pom.xml +++ b/spring-cloud-zookeeper-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1-SNAPSHOT + 4.2.1 .. diff --git a/spring-cloud-zookeeper-core/pom.xml b/spring-cloud-zookeeper-core/pom.xml index c998e41d..de9a14ee 100644 --- a/spring-cloud-zookeeper-core/pom.xml +++ b/spring-cloud-zookeeper-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1-SNAPSHOT + 4.2.1 .. diff --git a/spring-cloud-zookeeper-dependencies/pom.xml b/spring-cloud-zookeeper-dependencies/pom.xml index 0626bd02..cba4c4c3 100644 --- a/spring-cloud-zookeeper-dependencies/pom.xml +++ b/spring-cloud-zookeeper-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.2.1-SNAPSHOT + 4.2.1 spring-cloud-zookeeper-dependencies - 4.2.1-SNAPSHOT + 4.2.1 pom spring-cloud-zookeeper-dependencies Spring Cloud Zookeeper Dependencies diff --git a/spring-cloud-zookeeper-discovery/pom.xml b/spring-cloud-zookeeper-discovery/pom.xml index fbfa02ff..57441f10 100644 --- a/spring-cloud-zookeeper-discovery/pom.xml +++ b/spring-cloud-zookeeper-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1-SNAPSHOT + 4.2.1 .. diff --git a/spring-cloud-zookeeper-sample/pom.xml b/spring-cloud-zookeeper-sample/pom.xml index 08775e40..0654eae3 100644 --- a/spring-cloud-zookeeper-sample/pom.xml +++ b/spring-cloud-zookeeper-sample/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1-SNAPSHOT + 4.2.1 .. From e5f9d24e390bdbcd1417dbf649da94e5edc3498f Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 18 Mar 2025 23:58:58 +0000 Subject: [PATCH 06/13] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 12 ++++++------ spring-cloud-starter-zookeeper-all/pom.xml | 2 +- spring-cloud-starter-zookeeper-config/pom.xml | 2 +- spring-cloud-starter-zookeeper-discovery/pom.xml | 2 +- spring-cloud-starter-zookeeper/pom.xml | 2 +- spring-cloud-zookeeper-config/pom.xml | 2 +- spring-cloud-zookeeper-core/pom.xml | 2 +- spring-cloud-zookeeper-dependencies/pom.xml | 4 ++-- spring-cloud-zookeeper-discovery/pom.xml | 2 +- spring-cloud-zookeeper-sample/pom.xml | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 6493c865..07dcaff6 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1 + 4.2.1-SNAPSHOT .. spring-cloud-zookeeper-docs diff --git a/pom.xml b/pom.xml index 20e31ec0..edc61285 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-cloud-zookeeper - 4.2.1 + 4.2.1-SNAPSHOT pom Spring Cloud Zookeeper Spring Cloud Zookeeper @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 4.2.1 + 4.2.1-SNAPSHOT @@ -150,10 +150,10 @@ - 4.2.1 - 4.2.1 - 4.2.1 - 4.2.1 + 4.2.1-SNAPSHOT + 4.2.1-SNAPSHOT + 4.2.1-SNAPSHOT + 4.2.1-SNAPSHOT 1.17.6 5.15.0 diff --git a/spring-cloud-starter-zookeeper-all/pom.xml b/spring-cloud-starter-zookeeper-all/pom.xml index 90ccb4f9..b1f4522e 100644 --- a/spring-cloud-starter-zookeeper-all/pom.xml +++ b/spring-cloud-starter-zookeeper-all/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1 + 4.2.1-SNAPSHOT .. spring-cloud-starter-zookeeper-all diff --git a/spring-cloud-starter-zookeeper-config/pom.xml b/spring-cloud-starter-zookeeper-config/pom.xml index 83f14ef5..e5d5af29 100644 --- a/spring-cloud-starter-zookeeper-config/pom.xml +++ b/spring-cloud-starter-zookeeper-config/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1 + 4.2.1-SNAPSHOT .. spring-cloud-starter-zookeeper-config diff --git a/spring-cloud-starter-zookeeper-discovery/pom.xml b/spring-cloud-starter-zookeeper-discovery/pom.xml index 213f8ec1..71aa5943 100644 --- a/spring-cloud-starter-zookeeper-discovery/pom.xml +++ b/spring-cloud-starter-zookeeper-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1 + 4.2.1-SNAPSHOT .. spring-cloud-starter-zookeeper-discovery diff --git a/spring-cloud-starter-zookeeper/pom.xml b/spring-cloud-starter-zookeeper/pom.xml index b0c97c25..85fb0b85 100644 --- a/spring-cloud-starter-zookeeper/pom.xml +++ b/spring-cloud-starter-zookeeper/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1 + 4.2.1-SNAPSHOT .. spring-cloud-starter-zookeeper diff --git a/spring-cloud-zookeeper-config/pom.xml b/spring-cloud-zookeeper-config/pom.xml index 51b88234..a02dec56 100644 --- a/spring-cloud-zookeeper-config/pom.xml +++ b/spring-cloud-zookeeper-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1 + 4.2.1-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-core/pom.xml b/spring-cloud-zookeeper-core/pom.xml index de9a14ee..c998e41d 100644 --- a/spring-cloud-zookeeper-core/pom.xml +++ b/spring-cloud-zookeeper-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1 + 4.2.1-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-dependencies/pom.xml b/spring-cloud-zookeeper-dependencies/pom.xml index cba4c4c3..0626bd02 100644 --- a/spring-cloud-zookeeper-dependencies/pom.xml +++ b/spring-cloud-zookeeper-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.2.1 + 4.2.1-SNAPSHOT spring-cloud-zookeeper-dependencies - 4.2.1 + 4.2.1-SNAPSHOT pom spring-cloud-zookeeper-dependencies Spring Cloud Zookeeper Dependencies diff --git a/spring-cloud-zookeeper-discovery/pom.xml b/spring-cloud-zookeeper-discovery/pom.xml index 57441f10..fbfa02ff 100644 --- a/spring-cloud-zookeeper-discovery/pom.xml +++ b/spring-cloud-zookeeper-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1 + 4.2.1-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-sample/pom.xml b/spring-cloud-zookeeper-sample/pom.xml index 0654eae3..08775e40 100644 --- a/spring-cloud-zookeeper-sample/pom.xml +++ b/spring-cloud-zookeeper-sample/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1 + 4.2.1-SNAPSHOT .. From b6b747d0ce2bc9b6696dd04b5be37d0511aa188e Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 18 Mar 2025 23:58:59 +0000 Subject: [PATCH 07/13] Bumping versions to 4.2.2-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-starter-zookeeper-all/pom.xml | 2 +- spring-cloud-starter-zookeeper-config/pom.xml | 2 +- spring-cloud-starter-zookeeper-discovery/pom.xml | 2 +- spring-cloud-starter-zookeeper/pom.xml | 2 +- spring-cloud-zookeeper-config/pom.xml | 2 +- spring-cloud-zookeeper-core/pom.xml | 2 +- spring-cloud-zookeeper-dependencies/pom.xml | 2 +- spring-cloud-zookeeper-discovery/pom.xml | 2 +- spring-cloud-zookeeper-sample/pom.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 07dcaff6..2636100e 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT .. spring-cloud-zookeeper-docs diff --git a/pom.xml b/pom.xml index edc61285..328fe612 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-cloud-zookeeper - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT pom Spring Cloud Zookeeper Spring Cloud Zookeeper diff --git a/spring-cloud-starter-zookeeper-all/pom.xml b/spring-cloud-starter-zookeeper-all/pom.xml index b1f4522e..6ffc4096 100644 --- a/spring-cloud-starter-zookeeper-all/pom.xml +++ b/spring-cloud-starter-zookeeper-all/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT .. spring-cloud-starter-zookeeper-all diff --git a/spring-cloud-starter-zookeeper-config/pom.xml b/spring-cloud-starter-zookeeper-config/pom.xml index e5d5af29..2409e77f 100644 --- a/spring-cloud-starter-zookeeper-config/pom.xml +++ b/spring-cloud-starter-zookeeper-config/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT .. spring-cloud-starter-zookeeper-config diff --git a/spring-cloud-starter-zookeeper-discovery/pom.xml b/spring-cloud-starter-zookeeper-discovery/pom.xml index 71aa5943..8dff550c 100644 --- a/spring-cloud-starter-zookeeper-discovery/pom.xml +++ b/spring-cloud-starter-zookeeper-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT .. spring-cloud-starter-zookeeper-discovery diff --git a/spring-cloud-starter-zookeeper/pom.xml b/spring-cloud-starter-zookeeper/pom.xml index 85fb0b85..f5db1662 100644 --- a/spring-cloud-starter-zookeeper/pom.xml +++ b/spring-cloud-starter-zookeeper/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT .. spring-cloud-starter-zookeeper diff --git a/spring-cloud-zookeeper-config/pom.xml b/spring-cloud-zookeeper-config/pom.xml index a02dec56..da59db02 100644 --- a/spring-cloud-zookeeper-config/pom.xml +++ b/spring-cloud-zookeeper-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-core/pom.xml b/spring-cloud-zookeeper-core/pom.xml index c998e41d..3b439ec7 100644 --- a/spring-cloud-zookeeper-core/pom.xml +++ b/spring-cloud-zookeeper-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-dependencies/pom.xml b/spring-cloud-zookeeper-dependencies/pom.xml index 0626bd02..0003ae99 100644 --- a/spring-cloud-zookeeper-dependencies/pom.xml +++ b/spring-cloud-zookeeper-dependencies/pom.xml @@ -9,7 +9,7 @@ spring-cloud-zookeeper-dependencies - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT pom spring-cloud-zookeeper-dependencies Spring Cloud Zookeeper Dependencies diff --git a/spring-cloud-zookeeper-discovery/pom.xml b/spring-cloud-zookeeper-discovery/pom.xml index fbfa02ff..9bdb8d2b 100644 --- a/spring-cloud-zookeeper-discovery/pom.xml +++ b/spring-cloud-zookeeper-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-sample/pom.xml b/spring-cloud-zookeeper-sample/pom.xml index 08775e40..46332c48 100644 --- a/spring-cloud-zookeeper-sample/pom.xml +++ b/spring-cloud-zookeeper-sample/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT .. From 2a8fc0f138974cd8d8547ba5a212eacc2008a164 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 18 Mar 2025 23:59:43 +0000 Subject: [PATCH 08/13] Bumping dependency versions after release --- pom.xml | 10 +++++----- spring-cloud-zookeeper-dependencies/pom.xml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 328fe612..bb8334bd 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT @@ -150,10 +150,10 @@ - 4.2.1-SNAPSHOT - 4.2.1-SNAPSHOT - 4.2.1-SNAPSHOT - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT + 4.2.2-SNAPSHOT + 4.2.2-SNAPSHOT + 4.2.2-SNAPSHOT 1.17.6 5.15.0 diff --git a/spring-cloud-zookeeper-dependencies/pom.xml b/spring-cloud-zookeeper-dependencies/pom.xml index 0003ae99..9fb43da7 100644 --- a/spring-cloud-zookeeper-dependencies/pom.xml +++ b/spring-cloud-zookeeper-dependencies/pom.xml @@ -5,7 +5,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT spring-cloud-zookeeper-dependencies From e2df9eae78261fe22e61207350cd25b70c790b0b Mon Sep 17 00:00:00 2001 From: spring-builds Date: Wed, 19 Mar 2025 07:50:28 +0000 Subject: [PATCH 09/13] Bumping versions --- docs/pom.xml | 2 +- pom.xml | 12 ++++++------ spring-cloud-starter-zookeeper-all/pom.xml | 2 +- spring-cloud-starter-zookeeper-config/pom.xml | 2 +- spring-cloud-starter-zookeeper-discovery/pom.xml | 2 +- spring-cloud-starter-zookeeper/pom.xml | 2 +- spring-cloud-zookeeper-config/pom.xml | 2 +- spring-cloud-zookeeper-core/pom.xml | 2 +- spring-cloud-zookeeper-dependencies/pom.xml | 4 ++-- spring-cloud-zookeeper-discovery/pom.xml | 2 +- spring-cloud-zookeeper-sample/pom.xml | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 2636100e..07dcaff6 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.2-SNAPSHOT + 4.2.1-SNAPSHOT .. spring-cloud-zookeeper-docs diff --git a/pom.xml b/pom.xml index bb8334bd..edc61285 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-cloud-zookeeper - 4.2.2-SNAPSHOT + 4.2.1-SNAPSHOT pom Spring Cloud Zookeeper Spring Cloud Zookeeper @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 4.2.2-SNAPSHOT + 4.2.1-SNAPSHOT @@ -150,10 +150,10 @@ - 4.2.2-SNAPSHOT - 4.2.2-SNAPSHOT - 4.2.2-SNAPSHOT - 4.2.2-SNAPSHOT + 4.2.1-SNAPSHOT + 4.2.1-SNAPSHOT + 4.2.1-SNAPSHOT + 4.2.1-SNAPSHOT 1.17.6 5.15.0 diff --git a/spring-cloud-starter-zookeeper-all/pom.xml b/spring-cloud-starter-zookeeper-all/pom.xml index 6ffc4096..b1f4522e 100644 --- a/spring-cloud-starter-zookeeper-all/pom.xml +++ b/spring-cloud-starter-zookeeper-all/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.2-SNAPSHOT + 4.2.1-SNAPSHOT .. spring-cloud-starter-zookeeper-all diff --git a/spring-cloud-starter-zookeeper-config/pom.xml b/spring-cloud-starter-zookeeper-config/pom.xml index 2409e77f..e5d5af29 100644 --- a/spring-cloud-starter-zookeeper-config/pom.xml +++ b/spring-cloud-starter-zookeeper-config/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.2-SNAPSHOT + 4.2.1-SNAPSHOT .. spring-cloud-starter-zookeeper-config diff --git a/spring-cloud-starter-zookeeper-discovery/pom.xml b/spring-cloud-starter-zookeeper-discovery/pom.xml index 8dff550c..71aa5943 100644 --- a/spring-cloud-starter-zookeeper-discovery/pom.xml +++ b/spring-cloud-starter-zookeeper-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.2-SNAPSHOT + 4.2.1-SNAPSHOT .. spring-cloud-starter-zookeeper-discovery diff --git a/spring-cloud-starter-zookeeper/pom.xml b/spring-cloud-starter-zookeeper/pom.xml index f5db1662..85fb0b85 100644 --- a/spring-cloud-starter-zookeeper/pom.xml +++ b/spring-cloud-starter-zookeeper/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.2-SNAPSHOT + 4.2.1-SNAPSHOT .. spring-cloud-starter-zookeeper diff --git a/spring-cloud-zookeeper-config/pom.xml b/spring-cloud-zookeeper-config/pom.xml index da59db02..a02dec56 100644 --- a/spring-cloud-zookeeper-config/pom.xml +++ b/spring-cloud-zookeeper-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.2-SNAPSHOT + 4.2.1-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-core/pom.xml b/spring-cloud-zookeeper-core/pom.xml index 3b439ec7..c998e41d 100644 --- a/spring-cloud-zookeeper-core/pom.xml +++ b/spring-cloud-zookeeper-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.2-SNAPSHOT + 4.2.1-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-dependencies/pom.xml b/spring-cloud-zookeeper-dependencies/pom.xml index 9fb43da7..0626bd02 100644 --- a/spring-cloud-zookeeper-dependencies/pom.xml +++ b/spring-cloud-zookeeper-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.2.2-SNAPSHOT + 4.2.1-SNAPSHOT spring-cloud-zookeeper-dependencies - 4.2.2-SNAPSHOT + 4.2.1-SNAPSHOT pom spring-cloud-zookeeper-dependencies Spring Cloud Zookeeper Dependencies diff --git a/spring-cloud-zookeeper-discovery/pom.xml b/spring-cloud-zookeeper-discovery/pom.xml index 9bdb8d2b..fbfa02ff 100644 --- a/spring-cloud-zookeeper-discovery/pom.xml +++ b/spring-cloud-zookeeper-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.2-SNAPSHOT + 4.2.1-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-sample/pom.xml b/spring-cloud-zookeeper-sample/pom.xml index 46332c48..08775e40 100644 --- a/spring-cloud-zookeeper-sample/pom.xml +++ b/spring-cloud-zookeeper-sample/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.2-SNAPSHOT + 4.2.1-SNAPSHOT .. From 680e778f7ef68ef61ffda7715f47bcd335875b67 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Thu, 20 Mar 2025 07:50:24 +0000 Subject: [PATCH 10/13] Bumping versions --- docs/pom.xml | 2 +- pom.xml | 12 ++++++------ spring-cloud-starter-zookeeper-all/pom.xml | 2 +- spring-cloud-starter-zookeeper-config/pom.xml | 2 +- spring-cloud-starter-zookeeper-discovery/pom.xml | 2 +- spring-cloud-starter-zookeeper/pom.xml | 2 +- spring-cloud-zookeeper-config/pom.xml | 2 +- spring-cloud-zookeeper-core/pom.xml | 2 +- spring-cloud-zookeeper-dependencies/pom.xml | 4 ++-- spring-cloud-zookeeper-discovery/pom.xml | 2 +- spring-cloud-zookeeper-sample/pom.xml | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 07dcaff6..2636100e 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT .. spring-cloud-zookeeper-docs diff --git a/pom.xml b/pom.xml index edc61285..bb8334bd 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-cloud-zookeeper - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT pom Spring Cloud Zookeeper Spring Cloud Zookeeper @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT @@ -150,10 +150,10 @@ - 4.2.1-SNAPSHOT - 4.2.1-SNAPSHOT - 4.2.1-SNAPSHOT - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT + 4.2.2-SNAPSHOT + 4.2.2-SNAPSHOT + 4.2.2-SNAPSHOT 1.17.6 5.15.0 diff --git a/spring-cloud-starter-zookeeper-all/pom.xml b/spring-cloud-starter-zookeeper-all/pom.xml index b1f4522e..6ffc4096 100644 --- a/spring-cloud-starter-zookeeper-all/pom.xml +++ b/spring-cloud-starter-zookeeper-all/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT .. spring-cloud-starter-zookeeper-all diff --git a/spring-cloud-starter-zookeeper-config/pom.xml b/spring-cloud-starter-zookeeper-config/pom.xml index e5d5af29..2409e77f 100644 --- a/spring-cloud-starter-zookeeper-config/pom.xml +++ b/spring-cloud-starter-zookeeper-config/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT .. spring-cloud-starter-zookeeper-config diff --git a/spring-cloud-starter-zookeeper-discovery/pom.xml b/spring-cloud-starter-zookeeper-discovery/pom.xml index 71aa5943..8dff550c 100644 --- a/spring-cloud-starter-zookeeper-discovery/pom.xml +++ b/spring-cloud-starter-zookeeper-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT .. spring-cloud-starter-zookeeper-discovery diff --git a/spring-cloud-starter-zookeeper/pom.xml b/spring-cloud-starter-zookeeper/pom.xml index 85fb0b85..f5db1662 100644 --- a/spring-cloud-starter-zookeeper/pom.xml +++ b/spring-cloud-starter-zookeeper/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT .. spring-cloud-starter-zookeeper diff --git a/spring-cloud-zookeeper-config/pom.xml b/spring-cloud-zookeeper-config/pom.xml index a02dec56..da59db02 100644 --- a/spring-cloud-zookeeper-config/pom.xml +++ b/spring-cloud-zookeeper-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-core/pom.xml b/spring-cloud-zookeeper-core/pom.xml index c998e41d..3b439ec7 100644 --- a/spring-cloud-zookeeper-core/pom.xml +++ b/spring-cloud-zookeeper-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-dependencies/pom.xml b/spring-cloud-zookeeper-dependencies/pom.xml index 0626bd02..9fb43da7 100644 --- a/spring-cloud-zookeeper-dependencies/pom.xml +++ b/spring-cloud-zookeeper-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT spring-cloud-zookeeper-dependencies - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT pom spring-cloud-zookeeper-dependencies Spring Cloud Zookeeper Dependencies diff --git a/spring-cloud-zookeeper-discovery/pom.xml b/spring-cloud-zookeeper-discovery/pom.xml index fbfa02ff..9bdb8d2b 100644 --- a/spring-cloud-zookeeper-discovery/pom.xml +++ b/spring-cloud-zookeeper-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-sample/pom.xml b/spring-cloud-zookeeper-sample/pom.xml index 08775e40..46332c48 100644 --- a/spring-cloud-zookeeper-sample/pom.xml +++ b/spring-cloud-zookeeper-sample/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT .. From afebc258b6275049b7ae749d8f082a01c5575d3d Mon Sep 17 00:00:00 2001 From: spring-builds Date: Fri, 4 Apr 2025 21:05:42 +0000 Subject: [PATCH 11/13] Bumping versions --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fa51f2a6..6807a629 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ 4.1.6-SNAPSHOT 4.1.6-SNAPSHOT - 4.1.6-SNAPSHOT + 4.1.7-SNAPSHOT 4.1.5-SNAPSHOT 1.17.6 5.15.0 From 7bfa56e807b1f27d3aee116a9a6e46676108194a Mon Sep 17 00:00:00 2001 From: spring-builds Date: Sat, 5 Apr 2025 07:49:58 +0000 Subject: [PATCH 12/13] Bumping versions --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bb8334bd..eac676bb 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ 4.2.2-SNAPSHOT 4.2.2-SNAPSHOT - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT 4.2.2-SNAPSHOT 1.17.6 5.15.0 From 1d8e9102b72f270eb966c9c47bde956029a8756f Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 10 Apr 2025 11:37:55 -0400 Subject: [PATCH 13/13] Use Assert4J --- .../DefaultDependencyPresenceOnStartupVerifierTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/DefaultDependencyPresenceOnStartupVerifierTests.java b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/DefaultDependencyPresenceOnStartupVerifierTests.java index b93e3df4..6c07c6ee 100644 --- a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/DefaultDependencyPresenceOnStartupVerifierTests.java +++ b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/DefaultDependencyPresenceOnStartupVerifierTests.java @@ -19,10 +19,10 @@ package org.springframework.cloud.zookeeper.discovery.watcher.presence; import java.util.Collections; import org.apache.curator.x.discovery.ServiceCache; -import org.junit.Assert; import org.junit.Test; import static org.assertj.core.api.BDDAssertions.then; +import static org.assertj.core.api.Fail.fail; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; @@ -42,7 +42,7 @@ public class DefaultDependencyPresenceOnStartupVerifierTests { // when: try { dependencyVerifier.verifyDependencyPresence(SERVICE_NAME, serviceCache, true); - Assert.fail("Should throw no instances running exception"); + fail("Should throw no instances running exception"); } catch (Exception e) { // then: