From d923c37ca78fe87634f7930e5cb8cc4783e7aab5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 09:00:53 -0500 Subject: [PATCH 01/20] Bump antora from 3.2.0-alpha.6 to 3.2.0-alpha.8 in /docs (#1438) Bumps [antora](https://gitlab.com/antora/antora) from 3.2.0-alpha.6 to 3.2.0-alpha.8. - [Changelog](https://gitlab.com/antora/antora/blob/main/CHANGELOG.adoc) - [Commits](https://gitlab.com/antora/antora/compare/v3.2.0-alpha.6...v3.2.0-alpha.8) --- updated-dependencies: - dependency-name: antora dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/package.json b/docs/package.json index 8a33a6ca..73108a7a 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "antora": "3.2.0-alpha.6", + "antora": "3.2.0-alpha.8", "@antora/atlas-extension": "1.0.0-alpha.2", "@antora/collector-extension": "1.0.0-alpha.3", "@asciidoctor/tabs": "1.0.0-beta.6", From a7b145d66fc8c3c4e82fbb2f6d8be98342e44d9f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 11:59:59 +0100 Subject: [PATCH 02/20] Bump @antora/collector-extension from 1.0.0-alpha.3 to 1.0.1 in /docs (#1435) --- updated-dependencies: - dependency-name: "@antora/collector-extension" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/package.json b/docs/package.json index 73108a7a..be5065c9 100644 --- a/docs/package.json +++ b/docs/package.json @@ -2,7 +2,7 @@ "dependencies": { "antora": "3.2.0-alpha.8", "@antora/atlas-extension": "1.0.0-alpha.2", - "@antora/collector-extension": "1.0.0-alpha.3", + "@antora/collector-extension": "1.0.1", "@asciidoctor/tabs": "1.0.0-beta.6", "@springio/antora-extensions": "1.11.1", "@springio/asciidoctor-extensions": "1.0.0-alpha.14" From 9ca9d9028afed19cea475a71fcdfbc055831c606 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 12:00:34 +0100 Subject: [PATCH 03/20] Bump @springio/antora-extensions from 1.11.1 to 1.14.2 in /docs (#1429) Bumps [@springio/antora-extensions](https://github.com/spring-io/antora-extensions) from 1.11.1 to 1.14.2. - [Changelog](https://github.com/spring-io/antora-extensions/blob/main/CHANGELOG.adoc) - [Commits](https://github.com/spring-io/antora-extensions/compare/v1.11.1...v1.14.2) --- updated-dependencies: - dependency-name: "@springio/antora-extensions" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/package.json b/docs/package.json index be5065c9..ca5b2ce8 100644 --- a/docs/package.json +++ b/docs/package.json @@ -4,7 +4,7 @@ "@antora/atlas-extension": "1.0.0-alpha.2", "@antora/collector-extension": "1.0.1", "@asciidoctor/tabs": "1.0.0-beta.6", - "@springio/antora-extensions": "1.11.1", + "@springio/antora-extensions": "1.14.2", "@springio/asciidoctor-extensions": "1.0.0-alpha.14" } } From b8ec43ca194ac3fe1cf76cbe33b1fd625c71085d Mon Sep 17 00:00:00 2001 From: spring-builds Date: Mon, 13 Jan 2025 22:18:19 +0000 Subject: [PATCH 04/20] Bumping versions --- pom.xml | 2 +- spring-cloud-commons-dependencies/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a4cec7a8..eeb45599 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 4.1.5-SNAPSHOT + 4.1.6-SNAPSHOT diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml index ac4c9c23..c9b87287 100644 --- a/spring-cloud-commons-dependencies/pom.xml +++ b/spring-cloud-commons-dependencies/pom.xml @@ -6,7 +6,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.1.5-SNAPSHOT + 4.1.6-SNAPSHOT spring-cloud-commons-dependencies From bdb1e606f8fff8bfa217c3b822329a8ac956435e Mon Sep 17 00:00:00 2001 From: spencergibb Date: Thu, 16 Jan 2025 12:27:18 -0500 Subject: [PATCH 05/20] Adds dco.yml --- .github/dco.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .github/dco.yml diff --git a/.github/dco.yml b/.github/dco.yml new file mode 100644 index 00000000..37e411e1 --- /dev/null +++ b/.github/dco.yml @@ -0,0 +1,2 @@ +require: + members: false \ No newline at end of file From 6bf064c1a322384a81c546fcfff7ef6c9f3fd2ee Mon Sep 17 00:00:00 2001 From: spencergibb Date: Thu, 16 Jan 2025 12:40:20 -0500 Subject: [PATCH 06/20] Updates to version 4.3.0-SNAPSHOT --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-commons-dependencies/pom.xml | 4 ++-- spring-cloud-commons/pom.xml | 2 +- spring-cloud-context-integration-tests/pom.xml | 2 +- spring-cloud-context-webflux-integration-tests/pom.xml | 2 +- spring-cloud-context/pom.xml | 2 +- spring-cloud-loadbalancer/pom.xml | 2 +- spring-cloud-starter-bootstrap/pom.xml | 2 +- spring-cloud-starter-loadbalancer/pom.xml | 2 +- spring-cloud-starter/pom.xml | 2 +- spring-cloud-test-support/pom.xml | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index e9f98a28..333bf8e9 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-commons-parent - 4.2.1-SNAPSHOT + 4.3.0-SNAPSHOT jar Spring Cloud Commons Docs diff --git a/pom.xml b/pom.xml index 8b6f2781..162991b7 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-commons-parent - 4.2.1-SNAPSHOT + 4.3.0-SNAPSHOT pom Spring Cloud Commons Parent Spring Cloud Commons Parent @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 4.2.1-SNAPSHOT + 4.3.0-SNAPSHOT diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml index af72a3c7..80b4971e 100644 --- a/spring-cloud-commons-dependencies/pom.xml +++ b/spring-cloud-commons-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.2.1-SNAPSHOT + 4.3.0-SNAPSHOT spring-cloud-commons-dependencies - 4.2.1-SNAPSHOT + 4.3.0-SNAPSHOT pom spring-cloud-commons-dependencies Spring Cloud Commons Dependencies diff --git a/spring-cloud-commons/pom.xml b/spring-cloud-commons/pom.xml index a0c55a7c..d246f36f 100644 --- a/spring-cloud-commons/pom.xml +++ b/spring-cloud-commons/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 4.2.1-SNAPSHOT + 4.3.0-SNAPSHOT .. spring-cloud-commons diff --git a/spring-cloud-context-integration-tests/pom.xml b/spring-cloud-context-integration-tests/pom.xml index 4d29611b..b316f1b2 100644 --- a/spring-cloud-context-integration-tests/pom.xml +++ b/spring-cloud-context-integration-tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 4.2.1-SNAPSHOT + 4.3.0-SNAPSHOT .. spring-cloud-context-integration-tests diff --git a/spring-cloud-context-webflux-integration-tests/pom.xml b/spring-cloud-context-webflux-integration-tests/pom.xml index 84e83679..3a181468 100644 --- a/spring-cloud-context-webflux-integration-tests/pom.xml +++ b/spring-cloud-context-webflux-integration-tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 4.2.1-SNAPSHOT + 4.3.0-SNAPSHOT .. spring-cloud-context-webflux-integration-tests diff --git a/spring-cloud-context/pom.xml b/spring-cloud-context/pom.xml index 8eeb6c06..02277300 100644 --- a/spring-cloud-context/pom.xml +++ b/spring-cloud-context/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 4.2.1-SNAPSHOT + 4.3.0-SNAPSHOT .. spring-cloud-context diff --git a/spring-cloud-loadbalancer/pom.xml b/spring-cloud-loadbalancer/pom.xml index f8a0d717..d05d4b4a 100644 --- a/spring-cloud-loadbalancer/pom.xml +++ b/spring-cloud-loadbalancer/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 4.2.1-SNAPSHOT + 4.3.0-SNAPSHOT .. spring-cloud-loadbalancer diff --git a/spring-cloud-starter-bootstrap/pom.xml b/spring-cloud-starter-bootstrap/pom.xml index 9394e2c9..3749612b 100644 --- a/spring-cloud-starter-bootstrap/pom.xml +++ b/spring-cloud-starter-bootstrap/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-commons-parent - 4.2.1-SNAPSHOT + 4.3.0-SNAPSHOT .. jar diff --git a/spring-cloud-starter-loadbalancer/pom.xml b/spring-cloud-starter-loadbalancer/pom.xml index 01f9b82e..6caac92c 100644 --- a/spring-cloud-starter-loadbalancer/pom.xml +++ b/spring-cloud-starter-loadbalancer/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-commons-parent - 4.2.1-SNAPSHOT + 4.3.0-SNAPSHOT .. 4.0.0 diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml index 3eebcede..220b42ca 100644 --- a/spring-cloud-starter/pom.xml +++ b/spring-cloud-starter/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 4.2.1-SNAPSHOT + 4.3.0-SNAPSHOT spring-cloud-starter spring-cloud-starter diff --git a/spring-cloud-test-support/pom.xml b/spring-cloud-test-support/pom.xml index 8f78edeb..0c688687 100644 --- a/spring-cloud-test-support/pom.xml +++ b/spring-cloud-test-support/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 4.2.1-SNAPSHOT + 4.3.0-SNAPSHOT .. spring-cloud-test-support From bb2936d86d46565b6111c360800019485121de0a Mon Sep 17 00:00:00 2001 From: spencergibb Date: Thu, 16 Jan 2025 12:57:49 -0500 Subject: [PATCH 07/20] Updates to support boot 3.5.0-SNAPSHOT --- .../CompatibilityVerifierProperties.java | 4 ++-- .../SpringBootVersionVerifier.java | 20 +++++++++---------- .../SpringBootDependencyTests.java | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompatibilityVerifierProperties.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompatibilityVerifierProperties.java index 97ae7d2d..a5663ab7 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompatibilityVerifierProperties.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompatibilityVerifierProperties.java @@ -34,9 +34,9 @@ public class CompatibilityVerifierProperties { /** * Default accepted versions for the Spring Boot dependency. You can set {@code x} for * the patch version if you don't want to specify a concrete value. Example: - * {@code 3.4.x} + * {@code 3.5.x} */ - private List compatibleBootVersions = List.of("3.4.x"); + private List compatibleBootVersions = List.of("3.5.x"); public boolean isEnabled() { return this.enabled; diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/SpringBootVersionVerifier.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/SpringBootVersionVerifier.java index 6da9c9bf..900eca88 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/SpringBootVersionVerifier.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/SpringBootVersionVerifier.java @@ -35,7 +35,7 @@ class SpringBootVersionVerifier implements CompatibilityVerifier { final Map ACCEPTED_VERSIONS = new HashMap<>() { { - this.put("3.4", is3_4()); + this.put("3.5", is3_5()); } }; @@ -70,23 +70,23 @@ class SpringBootVersionVerifier implements CompatibilityVerifier { return SpringBootVersion.getVersion(); } - CompatibilityPredicate is3_4() { + CompatibilityPredicate is3_5() { return new CompatibilityPredicate() { @Override public String toString() { - return "Predicate for Boot 3.4"; + return "Predicate for Boot 3.5"; } @Override public boolean isCompatible() { - try { - Class.forName("org.springframework.boot.autoconfigure.web.client.RestClientSsl"); - return true; - } - catch (ClassNotFoundException e) { - return false; - } + // try { + // Class.forName("org.springframework.boot.autoconfigure.web.client.RestClientSsl"); + return true; + // } + // catch (ClassNotFoundException e) { + // return false; + // } } }; } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/SpringBootDependencyTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/SpringBootDependencyTests.java index cef25841..825ddc6a 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/SpringBootDependencyTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/SpringBootDependencyTests.java @@ -176,8 +176,8 @@ public class SpringBootDependencyTests { @Test public void should_match_against_current_manifest() { try { - verifyCurrentVersionFromManifest("3.4"); - verifyCurrentVersionFromManifest("3.4.x"); + verifyCurrentVersionFromManifest("3.5"); + verifyCurrentVersionFromManifest("3.5.x"); } catch (AssertionError e) { // if (e.getMessage() != null && e.getMessage().contains("3.3.")) { @@ -212,7 +212,7 @@ public class SpringBootDependencyTests { } }; versionVerifier.ACCEPTED_VERSIONS.clear(); - versionVerifier.ACCEPTED_VERSIONS.put("3.0", versionVerifier.is3_4()); + versionVerifier.ACCEPTED_VERSIONS.put("3.0", versionVerifier.is3_5()); VerificationResult verificationResult = versionVerifier.verify(); @@ -230,7 +230,7 @@ public class SpringBootDependencyTests { } }; versionVerifier.ACCEPTED_VERSIONS.clear(); - versionVerifier.ACCEPTED_VERSIONS.put("3.0", versionVerifier.is3_4()); + versionVerifier.ACCEPTED_VERSIONS.put("3.0", versionVerifier.is3_5()); VerificationResult verificationResult = versionVerifier.verify(); From b030dd16bc21105c29b8e51b1cc9731840b63a6d Mon Sep 17 00:00:00 2001 From: spring-builds Date: Fri, 17 Jan 2025 01:53:06 +0000 Subject: [PATCH 08/20] Bumping versions --- README.adoc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/README.adoc b/README.adoc index 03410549..4a826d42 100644 --- a/README.adoc +++ b/README.adoc @@ -109,15 +109,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 a9cc5cf978ef0cb103062761f64911b918a4c628 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 17 Jan 2025 12:36:13 -0500 Subject: [PATCH 09/20] Updates boot 3.5 verification with class from boot 3.5 --- .../configuration/SpringBootVersionVerifier.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/SpringBootVersionVerifier.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/SpringBootVersionVerifier.java index 900eca88..880f49f9 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/SpringBootVersionVerifier.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/SpringBootVersionVerifier.java @@ -80,13 +80,13 @@ class SpringBootVersionVerifier implements CompatibilityVerifier { @Override public boolean isCompatible() { - // try { - // Class.forName("org.springframework.boot.autoconfigure.web.client.RestClientSsl"); - return true; - // } - // catch (ClassNotFoundException e) { - // return false; - // } + try { + Class.forName("org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty"); + return true; + } + catch (ClassNotFoundException e) { + return false; + } } }; } From 7e1cbf8961819644cbfc9fbe03e6cfe5c74728a2 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Sat, 18 Jan 2025 14:52:04 +0000 Subject: [PATCH 10/20] Bumping versions --- README.adoc | 12 ++++-------- docs/modules/ROOT/partials/_configprops.adoc | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/README.adoc b/README.adoc index 03410549..4a826d42 100644 --- a/README.adoc +++ b/README.adoc @@ -109,15 +109,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 diff --git a/docs/modules/ROOT/partials/_configprops.adoc b/docs/modules/ROOT/partials/_configprops.adoc index 7d261e79..45941b98 100644 --- a/docs/modules/ROOT/partials/_configprops.adoc +++ b/docs/modules/ROOT/partials/_configprops.adoc @@ -1,7 +1,7 @@ |=== |Name | Default | Description -|spring.cloud.compatibility-verifier.compatible-boot-versions | `+++3.4.x+++` | Default accepted versions for the Spring Boot dependency. You can set {@code x} for the patch version if you don't want to specify a concrete value. Example: {@code 3.4.x} +|spring.cloud.compatibility-verifier.compatible-boot-versions | `+++3.5.x+++` | Default accepted versions for the Spring Boot dependency. You can set {@code x} for the patch version if you don't want to specify a concrete value. Example: {@code 3.5.x} |spring.cloud.compatibility-verifier.enabled | `+++false+++` | Enables creation of Spring Cloud compatibility verification. |spring.cloud.config.allow-override | `+++true+++` | Flag to indicate that {@link #isOverrideSystemProperties() systemPropertiesOverride} can be used. Set to false to prevent users from changing the default accidentally. Default true. |spring.cloud.config.initialize-on-context-refresh | `+++false+++` | Flag to initialize bootstrap configuration on context refresh event. Default false. From f4e078ad034c3129ee12863b88b71853c1ecd65c Mon Sep 17 00:00:00 2001 From: Yanming Zhou Date: Wed, 22 Jan 2025 04:24:33 +0800 Subject: [PATCH 11/20] Fix typo (#1444) Signed-off-by: Yanming Zhou --- .../main/java/org/springframework/cloud/util/PropertyUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/util/PropertyUtils.java b/spring-cloud-context/src/main/java/org/springframework/cloud/util/PropertyUtils.java index 0150d2ad..fca2231c 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/util/PropertyUtils.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/util/PropertyUtils.java @@ -42,7 +42,7 @@ public abstract class PropertyUtils { public static final boolean MARKER_CLASS_EXISTS = ClassUtils.isPresent(MARKER_CLASS, null); private PropertyUtils() { - throw new UnsupportedOperationException("unable to instatiate utils class"); + throw new UnsupportedOperationException("unable to instantiate utils class"); } public static boolean bootstrapEnabled(Environment environment) { From 6002301d1be2c7900531e4dbb1a5235efead7c1f Mon Sep 17 00:00:00 2001 From: Yanming Zhou Date: Wed, 22 Jan 2025 04:24:33 +0800 Subject: [PATCH 12/20] Fix typo (#1444) Signed-off-by: Yanming Zhou --- .../main/java/org/springframework/cloud/util/PropertyUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/util/PropertyUtils.java b/spring-cloud-context/src/main/java/org/springframework/cloud/util/PropertyUtils.java index 0150d2ad..fca2231c 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/util/PropertyUtils.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/util/PropertyUtils.java @@ -42,7 +42,7 @@ public abstract class PropertyUtils { public static final boolean MARKER_CLASS_EXISTS = ClassUtils.isPresent(MARKER_CLASS, null); private PropertyUtils() { - throw new UnsupportedOperationException("unable to instatiate utils class"); + throw new UnsupportedOperationException("unable to instantiate utils class"); } public static boolean bootstrapEnabled(Environment environment) { From e7aa45e88ea6102671de91760f836cf7b8b227ad Mon Sep 17 00:00:00 2001 From: Yanming Zhou Date: Wed, 22 Jan 2025 04:29:20 +0800 Subject: [PATCH 13/20] Use `Objects.equals()` instead (#1452) Signed-off-by: Yanming Zhou --- .../cloud/context/refresh/ContextRefresher.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ContextRefresher.java b/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ContextRefresher.java index 98149392..4982b980 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ContextRefresher.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ContextRefresher.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import org.apache.commons.logging.Log; @@ -139,7 +140,7 @@ public abstract class ContextRefresher { if (!after.containsKey(key)) { result.put(key, null); } - else if (!equal(before.get(key), after.get(key))) { + else if (!Objects.equals(before.get(key), after.get(key))) { result.put(key, after.get(key)); } } @@ -151,16 +152,6 @@ public abstract class ContextRefresher { return result; } - private boolean equal(Object one, Object two) { - if (one == null && two == null) { - return true; - } - if (one == null || two == null) { - return false; - } - return one.equals(two); - } - private Map extract(MutablePropertySources propertySources) { Map result = new HashMap<>(); List> sources = new ArrayList<>(); From d9a0bf923e3d71f56e48f897da5a14d996e96541 Mon Sep 17 00:00:00 2001 From: Yanming Zhou Date: Wed, 22 Jan 2025 04:29:20 +0800 Subject: [PATCH 14/20] Use `Objects.equals()` instead (#1452) Signed-off-by: Yanming Zhou --- .../cloud/context/refresh/ContextRefresher.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ContextRefresher.java b/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ContextRefresher.java index 98149392..4982b980 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ContextRefresher.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ContextRefresher.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import org.apache.commons.logging.Log; @@ -139,7 +140,7 @@ public abstract class ContextRefresher { if (!after.containsKey(key)) { result.put(key, null); } - else if (!equal(before.get(key), after.get(key))) { + else if (!Objects.equals(before.get(key), after.get(key))) { result.put(key, after.get(key)); } } @@ -151,16 +152,6 @@ public abstract class ContextRefresher { return result; } - private boolean equal(Object one, Object two) { - if (one == null && two == null) { - return true; - } - if (one == null || two == null) { - return false; - } - return one.equals(two); - } - private Map extract(MutablePropertySources propertySources) { Map result = new HashMap<>(); List> sources = new ArrayList<>(); From 129d49022942a91208a2fd569b5891f6be93af10 Mon Sep 17 00:00:00 2001 From: Yanming Zhou Date: Wed, 22 Jan 2025 04:34:54 +0800 Subject: [PATCH 15/20] Polish RefreshAutoConfiguration to reuse constants (#1443) Signed-off-by: Yanming Zhou --- .../cloud/autoconfigure/RefreshAutoConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java index e2004b5e..0cf8c890 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java @@ -119,7 +119,7 @@ public class RefreshAutoConfiguration { return new ConfigDataContextRefresher(context, scope, properties); } - @ConditionalOnProperty(value = "spring.cloud.refresh.on-restart.enabled", matchIfMissing = true) + @ConditionalOnProperty(value = REFRESH_SCOPE_PREFIX + ".on-restart.enabled", matchIfMissing = true) @Bean RefreshScopeLifecycle refreshScopeLifecycle(ContextRefresher contextRefresher) { return new RefreshScopeLifecycle(contextRefresher); From 375bc032e4384b552352977fbc5ac40c8c2d8284 Mon Sep 17 00:00:00 2001 From: Yanming Zhou Date: Wed, 22 Jan 2025 04:34:54 +0800 Subject: [PATCH 16/20] Polish RefreshAutoConfiguration to reuse constants (#1443) Signed-off-by: Yanming Zhou --- .../cloud/autoconfigure/RefreshAutoConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java index e2004b5e..0cf8c890 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java @@ -119,7 +119,7 @@ public class RefreshAutoConfiguration { return new ConfigDataContextRefresher(context, scope, properties); } - @ConditionalOnProperty(value = "spring.cloud.refresh.on-restart.enabled", matchIfMissing = true) + @ConditionalOnProperty(value = REFRESH_SCOPE_PREFIX + ".on-restart.enabled", matchIfMissing = true) @Bean RefreshScopeLifecycle refreshScopeLifecycle(ContextRefresher contextRefresher) { return new RefreshScopeLifecycle(contextRefresher); From e78f9c5307b5728e829905b72afc16f0e120a677 Mon Sep 17 00:00:00 2001 From: Yanming Zhou Date: Wed, 22 Jan 2025 04:43:52 +0800 Subject: [PATCH 17/20] Revise dependencies (#1449) jakarta.validation-api is transmitted by hibernate-validator Signed-off-by: Yanming Zhou --- spring-cloud-test-support/pom.xml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/spring-cloud-test-support/pom.xml b/spring-cloud-test-support/pom.xml index 0c688687..5bfaef1f 100644 --- a/spring-cloud-test-support/pom.xml +++ b/spring-cloud-test-support/pom.xml @@ -84,17 +84,6 @@ org.hibernate.validator hibernate-validator test - - - javax.validation - validation-api - - - - - jakarta.validation - jakarta.validation-api - test From ae6c7db0f09c05679f2d58cb3907d02339fb1a07 Mon Sep 17 00:00:00 2001 From: Yanming Zhou Date: Wed, 22 Jan 2025 04:43:52 +0800 Subject: [PATCH 18/20] Revise dependencies (#1449) jakarta.validation-api is transmitted by hibernate-validator Signed-off-by: Yanming Zhou --- spring-cloud-test-support/pom.xml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/spring-cloud-test-support/pom.xml b/spring-cloud-test-support/pom.xml index 7d796fcd..81fd19b5 100644 --- a/spring-cloud-test-support/pom.xml +++ b/spring-cloud-test-support/pom.xml @@ -84,17 +84,6 @@ org.hibernate.validator hibernate-validator test - - - javax.validation - validation-api - - - - - jakarta.validation - jakarta.validation-api - test From c507a221d1d4b0c1ccf1517299a9a2e260a14a05 Mon Sep 17 00:00:00 2001 From: Yanming Zhou Date: Wed, 22 Jan 2025 22:33:35 +0800 Subject: [PATCH 19/20] Remove workaround for data source cycle (#1445) It should be fixed at Spring Boot side, see https://github.com/spring-projects/spring-boot/commit/2f83a6714bf258c3fcc8ca92c89f02cf2043c97a Signed-off-by: Yanming Zhou --- .../RefreshAutoConfiguration.java | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java index 0cf8c890..57e26fc0 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java @@ -23,9 +23,6 @@ import java.util.Set; import org.springframework.aop.scope.ScopedProxyUtils; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.ListableBeanFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanDefinitionHolder; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; @@ -53,11 +50,9 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.EnvironmentAware; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.weaving.LoadTimeWeaverAware; import org.springframework.core.env.Environment; import org.springframework.core.env.StandardEnvironment; import org.springframework.core.style.ToStringCreator; -import org.springframework.instrument.classloading.LoadTimeWeaver; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; @@ -158,27 +153,6 @@ public class RefreshAutoConfiguration { } - @Configuration(proxyBeanMethods = false) - @ConditionalOnClass(name = "javax.persistence.EntityManagerFactory") - protected static class JpaInvokerConfiguration implements LoadTimeWeaverAware, InitializingBean { - - @Autowired - private ListableBeanFactory beanFactory; - - @Override - public void afterPropertiesSet() { - String cls = "org.springframework.boot.autoconfigure.jdbc.DataSourceInitializerInvoker"; - if (this.beanFactory.containsBean(cls)) { - this.beanFactory.getBean(cls); - } - } - - @Override - public void setLoadTimeWeaver(LoadTimeWeaver ltw) { - } - - } - @Component protected static class RefreshScopeBeanDefinitionEnhancer implements BeanDefinitionRegistryPostProcessor, EnvironmentAware { From 1e15993f7308e97ed7798f524a74b88c46461ed0 Mon Sep 17 00:00:00 2001 From: Yanming Zhou Date: Wed, 22 Jan 2025 22:33:35 +0800 Subject: [PATCH 20/20] Remove workaround for data source cycle (#1445) It should be fixed at Spring Boot side, see https://github.com/spring-projects/spring-boot/commit/2f83a6714bf258c3fcc8ca92c89f02cf2043c97a Signed-off-by: Yanming Zhou --- .../RefreshAutoConfiguration.java | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java index 0cf8c890..57e26fc0 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java @@ -23,9 +23,6 @@ import java.util.Set; import org.springframework.aop.scope.ScopedProxyUtils; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.ListableBeanFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanDefinitionHolder; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; @@ -53,11 +50,9 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.EnvironmentAware; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.weaving.LoadTimeWeaverAware; import org.springframework.core.env.Environment; import org.springframework.core.env.StandardEnvironment; import org.springframework.core.style.ToStringCreator; -import org.springframework.instrument.classloading.LoadTimeWeaver; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; @@ -158,27 +153,6 @@ public class RefreshAutoConfiguration { } - @Configuration(proxyBeanMethods = false) - @ConditionalOnClass(name = "javax.persistence.EntityManagerFactory") - protected static class JpaInvokerConfiguration implements LoadTimeWeaverAware, InitializingBean { - - @Autowired - private ListableBeanFactory beanFactory; - - @Override - public void afterPropertiesSet() { - String cls = "org.springframework.boot.autoconfigure.jdbc.DataSourceInitializerInvoker"; - if (this.beanFactory.containsBean(cls)) { - this.beanFactory.getBean(cls); - } - } - - @Override - public void setLoadTimeWeaver(LoadTimeWeaver ltw) { - } - - } - @Component protected static class RefreshScopeBeanDefinitionEnhancer implements BeanDefinitionRegistryPostProcessor, EnvironmentAware {