From a18676686639d723969c23f9d00285cd871be4ef Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Mon, 5 Aug 2024 16:36:38 +0200 Subject: [PATCH 01/27] Adjust to changes in Framework. --- .../ClientHttpResponseStatusCodeException.java | 11 ++++++----- .../ClientHttpResponseStatusCodeExceptionTest.java | 14 ++++++++------ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/ClientHttpResponseStatusCodeException.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/ClientHttpResponseStatusCodeException.java index fd83c895..166ffdf2 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/ClientHttpResponseStatusCodeException.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/ClientHttpResponseStatusCodeException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2024 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. @@ -21,13 +21,14 @@ import java.io.IOException; import java.io.InputStream; import org.springframework.http.HttpHeaders; -import org.springframework.http.client.AbstractClientHttpResponse; +import org.springframework.http.HttpStatusCode; import org.springframework.http.client.ClientHttpResponse; /** * {@link RetryableStatusCodeException} that captures a {@link ClientHttpResponse}. * * @author Ryan Baxter + * @author Olga Maciaszek-Sharma */ public class ClientHttpResponseStatusCodeException extends RetryableStatusCodeException { @@ -52,7 +53,7 @@ public class ClientHttpResponseStatusCodeException extends RetryableStatusCodeEx return this.response; } - static class ClientHttpResponseWrapper extends AbstractClientHttpResponse { + static class ClientHttpResponseWrapper implements ClientHttpResponse { private ClientHttpResponse response; @@ -64,8 +65,8 @@ public class ClientHttpResponseStatusCodeException extends RetryableStatusCodeEx } @Override - public int getRawStatusCode() throws IOException { - return this.response.getStatusCode().value(); + public HttpStatusCode getStatusCode() throws IOException { + return this.response.getStatusCode(); } @Override diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/ClientHttpResponseStatusCodeExceptionTest.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/ClientHttpResponseStatusCodeExceptionTest.java index a51f3330..06f5855b 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/ClientHttpResponseStatusCodeExceptionTest.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/ClientHttpResponseStatusCodeExceptionTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2024 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. @@ -25,7 +25,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.http.HttpHeaders; -import org.springframework.http.client.AbstractClientHttpResponse; +import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; import org.springframework.http.client.ClientHttpResponse; import org.springframework.util.StreamUtils; @@ -33,6 +34,7 @@ import static org.assertj.core.api.BDDAssertions.then; /** * @author Ryan Baxter + * @author Olga Maciaszek-Sharma */ @ExtendWith(MockitoExtension.class) public class ClientHttpResponseStatusCodeExceptionTest { @@ -44,19 +46,19 @@ public class ClientHttpResponseStatusCodeExceptionTest { ClientHttpResponseStatusCodeException exp = new ClientHttpResponseStatusCodeException("service", response, response.getStatusText().getBytes()); ClientHttpResponse expResponse = exp.getResponse(); - then(expResponse.getStatusCode().value()).isEqualTo(response.getRawStatusCode()); + then(expResponse.getStatusCode()).isEqualTo(response.getStatusCode()); then(expResponse.getStatusText()).isEqualTo(response.getStatusText()); then(expResponse.getHeaders()).isEqualTo(response.getHeaders()); then(new String(StreamUtils.copyToByteArray(expResponse.getBody()))).isEqualTo(response.getStatusText()); } - static class MyClientHttpResponse extends AbstractClientHttpResponse { + static class MyClientHttpResponse implements ClientHttpResponse { private boolean closed = false; @Override - public int getRawStatusCode() { - return 200; + public HttpStatusCode getStatusCode() { + return HttpStatus.OK; } @Override From 1e7d5dc2a1c8e2f350140bb7b7b6f137cd1dde33 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 5 Aug 2024 11:22:02 -0400 Subject: [PATCH 02/27] Updates version to 4.2.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 c9c56458..655955a7 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-commons-parent - 4.1.5-SNAPSHOT + 4.2.0-SNAPSHOT jar Spring Cloud Commons Docs diff --git a/pom.xml b/pom.xml index 2990f654..a3d7f469 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-commons-parent - 4.1.5-SNAPSHOT + 4.2.0-SNAPSHOT pom Spring Cloud Commons Parent Spring Cloud Commons Parent @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml index 54d18aee..9cc3e198 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.1.4-SNAPSHOT + 4.2.0-SNAPSHOT spring-cloud-commons-dependencies - 4.1.5-SNAPSHOT + 4.2.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 bcaee7d4..70f12033 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.1.5-SNAPSHOT + 4.2.0-SNAPSHOT .. spring-cloud-commons diff --git a/spring-cloud-context-integration-tests/pom.xml b/spring-cloud-context-integration-tests/pom.xml index 7e0d6a57..00477adf 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.1.5-SNAPSHOT + 4.2.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 28663fd6..68986af6 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.1.5-SNAPSHOT + 4.2.0-SNAPSHOT .. spring-cloud-context-webflux-integration-tests diff --git a/spring-cloud-context/pom.xml b/spring-cloud-context/pom.xml index f548abe6..ce9ec5b4 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.1.5-SNAPSHOT + 4.2.0-SNAPSHOT .. spring-cloud-context diff --git a/spring-cloud-loadbalancer/pom.xml b/spring-cloud-loadbalancer/pom.xml index 478a548e..99d03970 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.1.5-SNAPSHOT + 4.2.0-SNAPSHOT .. spring-cloud-loadbalancer diff --git a/spring-cloud-starter-bootstrap/pom.xml b/spring-cloud-starter-bootstrap/pom.xml index 39950c27..0d641e77 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.1.5-SNAPSHOT + 4.2.0-SNAPSHOT .. jar diff --git a/spring-cloud-starter-loadbalancer/pom.xml b/spring-cloud-starter-loadbalancer/pom.xml index aa677963..f030aede 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.1.5-SNAPSHOT + 4.2.0-SNAPSHOT .. 4.0.0 diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml index 670937b7..600fe2a6 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.1.5-SNAPSHOT + 4.2.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 87163933..39dbd6c4 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.1.5-SNAPSHOT + 4.2.0-SNAPSHOT .. spring-cloud-test-support From b59d266bf8171742b2b479c529946740a68c5402 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 5 Aug 2024 11:22:23 -0400 Subject: [PATCH 03/27] Adds temporary copy of removed Base64Utils class --- .../org/springframework/util/Base64Utils.java | 132 ++++++++++++++++++ 1 file changed, 132 insertions(+) create mode 100644 spring-cloud-context/src/main/java/org/springframework/util/Base64Utils.java diff --git a/spring-cloud-context/src/main/java/org/springframework/util/Base64Utils.java b/spring-cloud-context/src/main/java/org/springframework/util/Base64Utils.java new file mode 100644 index 00000000..00c27368 --- /dev/null +++ b/spring-cloud-context/src/main/java/org/springframework/util/Base64Utils.java @@ -0,0 +1,132 @@ +/* + * Copyright 2002-2023 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.util; + +import java.util.Base64; + +/** + * A simple utility class for Base64 encoding and decoding. + * + *

Adapts to Java 8's {@link java.util.Base64} in a convenience fashion. + * + * @author Juergen Hoeller + * @author Gary Russell + * @since 4.1 + * @see java.util.Base64 + * @deprecated as of Spring Framework 6.0.5 in favor of {@link Base64}; scheduled + * for removal in 6.2 + */ +@Deprecated(since = "6.0.5", forRemoval = true) +public abstract class Base64Utils { + + /** + * Base64-encode the given byte array. + * @param src the original byte array + * @return the encoded byte array + */ + public static byte[] encode(byte[] src) { + if (src.length == 0) { + return src; + } + return Base64.getEncoder().encode(src); + } + + /** + * Base64-decode the given byte array. + * @param src the encoded byte array + * @return the original byte array + */ + public static byte[] decode(byte[] src) { + if (src.length == 0) { + return src; + } + return Base64.getDecoder().decode(src); + } + + /** + * Base64-encode the given byte array using the RFC 4648 + * "URL and Filename Safe Alphabet". + * @param src the original byte array + * @return the encoded byte array + * @since 4.2.4 + */ + public static byte[] encodeUrlSafe(byte[] src) { + if (src.length == 0) { + return src; + } + return Base64.getUrlEncoder().encode(src); + } + + /** + * Base64-decode the given byte array using the RFC 4648 + * "URL and Filename Safe Alphabet". + * @param src the encoded byte array + * @return the original byte array + * @since 4.2.4 + */ + public static byte[] decodeUrlSafe(byte[] src) { + if (src.length == 0) { + return src; + } + return Base64.getUrlDecoder().decode(src); + } + + /** + * Base64-encode the given byte array to a String. + * @param src the original byte array + * @return the encoded byte array as a UTF-8 String + */ + public static String encodeToString(byte[] src) { + if (src.length == 0) { + return ""; + } + return Base64.getEncoder().encodeToString(src); + } + + /** + * Base64-decode the given byte array from a UTF-8 String. + * @param src the encoded UTF-8 String + * @return the original byte array + */ + public static byte[] decodeFromString(String src) { + if (src.isEmpty()) { + return new byte[0]; + } + return Base64.getDecoder().decode(src); + } + + /** + * Base64-encode the given byte array to a String using the RFC 4648 + * "URL and Filename Safe Alphabet". + * @param src the original byte array + * @return the encoded byte array as a UTF-8 String + */ + public static String encodeToUrlSafeString(byte[] src) { + return Base64.getUrlEncoder().encodeToString(src); + } + + /** + * Base64-decode the given byte array from a UTF-8 String using the RFC 4648 + * "URL and Filename Safe Alphabet". + * @param src the encoded UTF-8 String + * @return the original byte array + */ + public static byte[] decodeFromUrlSafeString(String src) { + return Base64.getUrlDecoder().decode(src); + } + +} \ No newline at end of file From 40808a31d5945a70a3496d381d681a90c809c393 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 5 Aug 2024 11:46:42 -0400 Subject: [PATCH 04/27] formatting Base64Utils --- .../org/springframework/util/Base64Utils.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/spring-cloud-context/src/main/java/org/springframework/util/Base64Utils.java b/spring-cloud-context/src/main/java/org/springframework/util/Base64Utils.java index 00c27368..f8f4ee3c 100644 --- a/spring-cloud-context/src/main/java/org/springframework/util/Base64Utils.java +++ b/spring-cloud-context/src/main/java/org/springframework/util/Base64Utils.java @@ -21,14 +21,15 @@ import java.util.Base64; /** * A simple utility class for Base64 encoding and decoding. * - *

Adapts to Java 8's {@link java.util.Base64} in a convenience fashion. + *

+ * Adapts to Java 8's {@link java.util.Base64} in a convenience fashion. * * @author Juergen Hoeller * @author Gary Russell * @since 4.1 * @see java.util.Base64 - * @deprecated as of Spring Framework 6.0.5 in favor of {@link Base64}; scheduled - * for removal in 6.2 + * @deprecated as of Spring Framework 6.0.5 in favor of {@link Base64}; scheduled for + * removal in 6.2 */ @Deprecated(since = "6.0.5", forRemoval = true) public abstract class Base64Utils { @@ -58,8 +59,8 @@ public abstract class Base64Utils { } /** - * Base64-encode the given byte array using the RFC 4648 - * "URL and Filename Safe Alphabet". + * Base64-encode the given byte array using the RFC 4648 "URL and Filename Safe + * Alphabet". * @param src the original byte array * @return the encoded byte array * @since 4.2.4 @@ -72,8 +73,8 @@ public abstract class Base64Utils { } /** - * Base64-decode the given byte array using the RFC 4648 - * "URL and Filename Safe Alphabet". + * Base64-decode the given byte array using the RFC 4648 "URL and Filename Safe + * Alphabet". * @param src the encoded byte array * @return the original byte array * @since 4.2.4 @@ -110,8 +111,8 @@ public abstract class Base64Utils { } /** - * Base64-encode the given byte array to a String using the RFC 4648 - * "URL and Filename Safe Alphabet". + * Base64-encode the given byte array to a String using the RFC 4648 "URL and Filename + * Safe Alphabet". * @param src the original byte array * @return the encoded byte array as a UTF-8 String */ @@ -120,8 +121,8 @@ public abstract class Base64Utils { } /** - * Base64-decode the given byte array from a UTF-8 String using the RFC 4648 - * "URL and Filename Safe Alphabet". + * Base64-decode the given byte array from a UTF-8 String using the RFC 4648 "URL and + * Filename Safe Alphabet". * @param src the encoded UTF-8 String * @return the original byte array */ @@ -129,4 +130,4 @@ public abstract class Base64Utils { return Base64.getUrlDecoder().decode(src); } -} \ No newline at end of file +} From bf7ddb17f581c9130318e7e945d0e952ba9387bb Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 5 Aug 2024 13:21:35 -0400 Subject: [PATCH 05/27] Adds support for boot 3.4 --- .../CompatibilityVerifierProperties.java | 2 +- .../SpringBootVersionVerifier.java | 28 ++----------------- .../SpringBootDependencyTests.java | 24 ++++++++-------- 3 files changed, 16 insertions(+), 38 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 cbcfa50c..97ae7d2d 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 @@ -36,7 +36,7 @@ public class CompatibilityVerifierProperties { * the patch version if you don't want to specify a concrete value. Example: * {@code 3.4.x} */ - private List compatibleBootVersions = List.of("3.2.x", "3.3.x"); + private List compatibleBootVersions = List.of("3.4.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 691a957a..6da9c9bf 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,8 +35,7 @@ class SpringBootVersionVerifier implements CompatibilityVerifier { final Map ACCEPTED_VERSIONS = new HashMap<>() { { - this.put("3.2", is3_2()); - this.put("3.3", is3_3()); + this.put("3.4", is3_4()); } }; @@ -71,12 +70,12 @@ class SpringBootVersionVerifier implements CompatibilityVerifier { return SpringBootVersion.getVersion(); } - CompatibilityPredicate is3_2() { + CompatibilityPredicate is3_4() { return new CompatibilityPredicate() { @Override public String toString() { - return "Predicate for Boot 3.2"; + return "Predicate for Boot 3.4"; } @Override @@ -92,27 +91,6 @@ class SpringBootVersionVerifier implements CompatibilityVerifier { }; } - CompatibilityPredicate is3_3() { - return new CompatibilityPredicate() { - - @Override - public String toString() { - return "Predicate for Boot 3.3"; - } - - @Override - public boolean isCompatible() { - try { - Class.forName("org.springframework.boot.autoconfigure.ldap.PropertiesLdapConnectionDetails"); - return true; - } - catch (ClassNotFoundException e) { - return false; - } - } - }; - } - private String errorDescription() { String versionFromManifest = getVersionFromManifest(); if (StringUtils.hasText(versionFromManifest)) { 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 d50ed412..cef25841 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,18 +176,18 @@ public class SpringBootDependencyTests { @Test public void should_match_against_current_manifest() { try { - verifyCurrentVersionFromManifest("3.2"); - verifyCurrentVersionFromManifest("3.2.x"); + verifyCurrentVersionFromManifest("3.4"); + verifyCurrentVersionFromManifest("3.4.x"); } catch (AssertionError e) { - if (e.getMessage() != null && e.getMessage().contains("3.3.")) { - // we're likely running a boot 3.3 compatibility test, try 3.3 - verifyCurrentVersionFromManifest("3.3"); - verifyCurrentVersionFromManifest("3.3.x"); - } - else { - throw e; - } + // if (e.getMessage() != null && e.getMessage().contains("3.3.")) { + // // we're likely running a boot 3.3 compatibility test, try 3.3 + // verifyCurrentVersionFromManifest("3.3"); + // verifyCurrentVersionFromManifest("3.3.x"); + // } + // else { + throw e; + // } } } @@ -212,7 +212,7 @@ public class SpringBootDependencyTests { } }; versionVerifier.ACCEPTED_VERSIONS.clear(); - versionVerifier.ACCEPTED_VERSIONS.put("3.0", versionVerifier.is3_2()); + versionVerifier.ACCEPTED_VERSIONS.put("3.0", versionVerifier.is3_4()); VerificationResult verificationResult = versionVerifier.verify(); @@ -230,7 +230,7 @@ public class SpringBootDependencyTests { } }; versionVerifier.ACCEPTED_VERSIONS.clear(); - versionVerifier.ACCEPTED_VERSIONS.put("3.0", versionVerifier.is3_2()); + versionVerifier.ACCEPTED_VERSIONS.put("3.0", versionVerifier.is3_4()); VerificationResult verificationResult = versionVerifier.verify(); From 1fff6f122074cc45be45517324807be95af21f45 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 5 Aug 2024 13:33:07 -0400 Subject: [PATCH 06/27] Disables tests in LifecycleMvcAutoConfigurationTests See gh-1362 --- .../autoconfigure/LifecycleMvcAutoConfigurationTests.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/LifecycleMvcAutoConfigurationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/LifecycleMvcAutoConfigurationTests.java index cf3af23d..d5ed488d 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/LifecycleMvcAutoConfigurationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/LifecycleMvcAutoConfigurationTests.java @@ -20,6 +20,7 @@ import java.util.List; import java.util.function.Function; import org.assertj.core.util.Lists; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -57,6 +58,7 @@ public class LifecycleMvcAutoConfigurationTests { } @Test + @Disabled("TODO: https://github.com/spring-cloud/spring-cloud-commons/issues/1362") public void environmentWebEndpointExtensionEnabled() { beanCreated("writableEnvironmentEndpointWebExtension", "management.endpoint.env.enabled=true", "management.endpoint.env.post.enabled=true", "management.endpoints.web.exposure.include=env"); @@ -117,6 +119,7 @@ public class LifecycleMvcAutoConfigurationTests { } @Test + @Disabled("TODO: https://github.com/spring-cloud/spring-cloud-commons/issues/1362") public void resumeEndpointGloballyDisabled() { beanNotCreated("resumeEndpoint", "management.endpoint.default.enabled=false"); } From ba9d83dfdb1e715dd3799ac3006b56771002287e Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 5 Aug 2024 17:40:00 +0000 Subject: [PATCH 07/27] Bumping versions --- docs/modules/ROOT/partials/_configprops.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/modules/ROOT/partials/_configprops.adoc b/docs/modules/ROOT/partials/_configprops.adoc index d5698893..0f7da897 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 | | 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.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.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 27e43e59efbfcd23a6c843f0f83877f40784e24a Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 5 Aug 2024 15:02:12 -0400 Subject: [PATCH 08/27] Removes Base64Utils.java and updates spring-security-rsa to 1.1.5 --- spring-cloud-commons-dependencies/pom.xml | 2 +- .../org/springframework/util/Base64Utils.java | 133 ------------------ 2 files changed, 1 insertion(+), 134 deletions(-) delete mode 100644 spring-cloud-context/src/main/java/org/springframework/util/Base64Utils.java diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml index 9cc3e198..bef42e6f 100644 --- a/spring-cloud-commons-dependencies/pom.xml +++ b/spring-cloud-commons-dependencies/pom.xml @@ -15,7 +15,7 @@ spring-cloud-commons-dependencies Spring Cloud Commons Dependencies - 1.1.3 + 1.1.5 diff --git a/spring-cloud-context/src/main/java/org/springframework/util/Base64Utils.java b/spring-cloud-context/src/main/java/org/springframework/util/Base64Utils.java deleted file mode 100644 index f8f4ee3c..00000000 --- a/spring-cloud-context/src/main/java/org/springframework/util/Base64Utils.java +++ /dev/null @@ -1,133 +0,0 @@ -/* - * Copyright 2002-2023 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. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.util; - -import java.util.Base64; - -/** - * A simple utility class for Base64 encoding and decoding. - * - *

- * Adapts to Java 8's {@link java.util.Base64} in a convenience fashion. - * - * @author Juergen Hoeller - * @author Gary Russell - * @since 4.1 - * @see java.util.Base64 - * @deprecated as of Spring Framework 6.0.5 in favor of {@link Base64}; scheduled for - * removal in 6.2 - */ -@Deprecated(since = "6.0.5", forRemoval = true) -public abstract class Base64Utils { - - /** - * Base64-encode the given byte array. - * @param src the original byte array - * @return the encoded byte array - */ - public static byte[] encode(byte[] src) { - if (src.length == 0) { - return src; - } - return Base64.getEncoder().encode(src); - } - - /** - * Base64-decode the given byte array. - * @param src the encoded byte array - * @return the original byte array - */ - public static byte[] decode(byte[] src) { - if (src.length == 0) { - return src; - } - return Base64.getDecoder().decode(src); - } - - /** - * Base64-encode the given byte array using the RFC 4648 "URL and Filename Safe - * Alphabet". - * @param src the original byte array - * @return the encoded byte array - * @since 4.2.4 - */ - public static byte[] encodeUrlSafe(byte[] src) { - if (src.length == 0) { - return src; - } - return Base64.getUrlEncoder().encode(src); - } - - /** - * Base64-decode the given byte array using the RFC 4648 "URL and Filename Safe - * Alphabet". - * @param src the encoded byte array - * @return the original byte array - * @since 4.2.4 - */ - public static byte[] decodeUrlSafe(byte[] src) { - if (src.length == 0) { - return src; - } - return Base64.getUrlDecoder().decode(src); - } - - /** - * Base64-encode the given byte array to a String. - * @param src the original byte array - * @return the encoded byte array as a UTF-8 String - */ - public static String encodeToString(byte[] src) { - if (src.length == 0) { - return ""; - } - return Base64.getEncoder().encodeToString(src); - } - - /** - * Base64-decode the given byte array from a UTF-8 String. - * @param src the encoded UTF-8 String - * @return the original byte array - */ - public static byte[] decodeFromString(String src) { - if (src.isEmpty()) { - return new byte[0]; - } - return Base64.getDecoder().decode(src); - } - - /** - * Base64-encode the given byte array to a String using the RFC 4648 "URL and Filename - * Safe Alphabet". - * @param src the original byte array - * @return the encoded byte array as a UTF-8 String - */ - public static String encodeToUrlSafeString(byte[] src) { - return Base64.getUrlEncoder().encodeToString(src); - } - - /** - * Base64-decode the given byte array from a UTF-8 String using the RFC 4648 "URL and - * Filename Safe Alphabet". - * @param src the encoded UTF-8 String - * @return the original byte array - */ - public static byte[] decodeFromUrlSafeString(String src) { - return Base64.getUrlDecoder().decode(src); - } - -} From 6bbbaedcac5004c1973a1e7763115393d1f2750f Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 19 Aug 2024 18:14:37 +0000 Subject: [PATCH 09/27] Update SNAPSHOT to 4.2.0-M1 --- 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 655955a7..3e3a44d1 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-commons-parent - 4.2.0-SNAPSHOT + 4.2.0-M1 jar Spring Cloud Commons Docs diff --git a/pom.xml b/pom.xml index a3d7f469..c751d8a3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-commons-parent - 4.2.0-SNAPSHOT + 4.2.0-M1 pom Spring Cloud Commons Parent Spring Cloud Commons Parent @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 4.2.0-SNAPSHOT + 4.2.0-M1 diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml index bef42e6f..df24444a 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.0-SNAPSHOT + 4.2.0-M1 spring-cloud-commons-dependencies - 4.2.0-SNAPSHOT + 4.2.0-M1 pom spring-cloud-commons-dependencies Spring Cloud Commons Dependencies diff --git a/spring-cloud-commons/pom.xml b/spring-cloud-commons/pom.xml index 70f12033..d29a83c6 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.0-SNAPSHOT + 4.2.0-M1 .. spring-cloud-commons diff --git a/spring-cloud-context-integration-tests/pom.xml b/spring-cloud-context-integration-tests/pom.xml index 00477adf..3d512965 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.0-SNAPSHOT + 4.2.0-M1 .. 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 68986af6..850289d9 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.0-SNAPSHOT + 4.2.0-M1 .. spring-cloud-context-webflux-integration-tests diff --git a/spring-cloud-context/pom.xml b/spring-cloud-context/pom.xml index ce9ec5b4..e4b3b3cb 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.0-SNAPSHOT + 4.2.0-M1 .. spring-cloud-context diff --git a/spring-cloud-loadbalancer/pom.xml b/spring-cloud-loadbalancer/pom.xml index 99d03970..38ae0562 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.0-SNAPSHOT + 4.2.0-M1 .. spring-cloud-loadbalancer diff --git a/spring-cloud-starter-bootstrap/pom.xml b/spring-cloud-starter-bootstrap/pom.xml index 0d641e77..56eb6e6c 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.0-SNAPSHOT + 4.2.0-M1 .. jar diff --git a/spring-cloud-starter-loadbalancer/pom.xml b/spring-cloud-starter-loadbalancer/pom.xml index f030aede..de11dd0f 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.0-SNAPSHOT + 4.2.0-M1 .. 4.0.0 diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml index 600fe2a6..94c13d83 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.0-SNAPSHOT + 4.2.0-M1 spring-cloud-starter spring-cloud-starter diff --git a/spring-cloud-test-support/pom.xml b/spring-cloud-test-support/pom.xml index 39dbd6c4..63566474 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.0-SNAPSHOT + 4.2.0-M1 .. spring-cloud-test-support From 50dcb9b1edf06848085fbd0d868da9b18fc9f71d Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 19 Aug 2024 18:15:48 +0000 Subject: [PATCH 10/27] Going back to snapshots --- 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 3e3a44d1..655955a7 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-commons-parent - 4.2.0-M1 + 4.2.0-SNAPSHOT jar Spring Cloud Commons Docs diff --git a/pom.xml b/pom.xml index c751d8a3..a3d7f469 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-commons-parent - 4.2.0-M1 + 4.2.0-SNAPSHOT pom Spring Cloud Commons Parent Spring Cloud Commons Parent @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 4.2.0-M1 + 4.2.0-SNAPSHOT diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml index df24444a..bef42e6f 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.0-M1 + 4.2.0-SNAPSHOT spring-cloud-commons-dependencies - 4.2.0-M1 + 4.2.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 d29a83c6..70f12033 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.0-M1 + 4.2.0-SNAPSHOT .. spring-cloud-commons diff --git a/spring-cloud-context-integration-tests/pom.xml b/spring-cloud-context-integration-tests/pom.xml index 3d512965..00477adf 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.0-M1 + 4.2.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 850289d9..68986af6 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.0-M1 + 4.2.0-SNAPSHOT .. spring-cloud-context-webflux-integration-tests diff --git a/spring-cloud-context/pom.xml b/spring-cloud-context/pom.xml index e4b3b3cb..ce9ec5b4 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.0-M1 + 4.2.0-SNAPSHOT .. spring-cloud-context diff --git a/spring-cloud-loadbalancer/pom.xml b/spring-cloud-loadbalancer/pom.xml index 38ae0562..99d03970 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.0-M1 + 4.2.0-SNAPSHOT .. spring-cloud-loadbalancer diff --git a/spring-cloud-starter-bootstrap/pom.xml b/spring-cloud-starter-bootstrap/pom.xml index 56eb6e6c..0d641e77 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.0-M1 + 4.2.0-SNAPSHOT .. jar diff --git a/spring-cloud-starter-loadbalancer/pom.xml b/spring-cloud-starter-loadbalancer/pom.xml index de11dd0f..f030aede 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.0-M1 + 4.2.0-SNAPSHOT .. 4.0.0 diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml index 94c13d83..600fe2a6 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.0-M1 + 4.2.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 63566474..39dbd6c4 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.0-M1 + 4.2.0-SNAPSHOT .. spring-cloud-test-support From eef30000c6856790fbed9ad6d2c8537ea85bf09b Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 19 Aug 2024 18:34:50 +0000 Subject: [PATCH 11/27] Update SNAPSHOT to 4.2.0-M1 --- 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 655955a7..3e3a44d1 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-commons-parent - 4.2.0-SNAPSHOT + 4.2.0-M1 jar Spring Cloud Commons Docs diff --git a/pom.xml b/pom.xml index a3d7f469..c751d8a3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-commons-parent - 4.2.0-SNAPSHOT + 4.2.0-M1 pom Spring Cloud Commons Parent Spring Cloud Commons Parent @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 4.2.0-SNAPSHOT + 4.2.0-M1 diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml index bef42e6f..df24444a 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.0-SNAPSHOT + 4.2.0-M1 spring-cloud-commons-dependencies - 4.2.0-SNAPSHOT + 4.2.0-M1 pom spring-cloud-commons-dependencies Spring Cloud Commons Dependencies diff --git a/spring-cloud-commons/pom.xml b/spring-cloud-commons/pom.xml index 70f12033..d29a83c6 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.0-SNAPSHOT + 4.2.0-M1 .. spring-cloud-commons diff --git a/spring-cloud-context-integration-tests/pom.xml b/spring-cloud-context-integration-tests/pom.xml index 00477adf..3d512965 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.0-SNAPSHOT + 4.2.0-M1 .. 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 68986af6..850289d9 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.0-SNAPSHOT + 4.2.0-M1 .. spring-cloud-context-webflux-integration-tests diff --git a/spring-cloud-context/pom.xml b/spring-cloud-context/pom.xml index ce9ec5b4..e4b3b3cb 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.0-SNAPSHOT + 4.2.0-M1 .. spring-cloud-context diff --git a/spring-cloud-loadbalancer/pom.xml b/spring-cloud-loadbalancer/pom.xml index 99d03970..38ae0562 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.0-SNAPSHOT + 4.2.0-M1 .. spring-cloud-loadbalancer diff --git a/spring-cloud-starter-bootstrap/pom.xml b/spring-cloud-starter-bootstrap/pom.xml index 0d641e77..56eb6e6c 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.0-SNAPSHOT + 4.2.0-M1 .. jar diff --git a/spring-cloud-starter-loadbalancer/pom.xml b/spring-cloud-starter-loadbalancer/pom.xml index f030aede..de11dd0f 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.0-SNAPSHOT + 4.2.0-M1 .. 4.0.0 diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml index 600fe2a6..94c13d83 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.0-SNAPSHOT + 4.2.0-M1 spring-cloud-starter spring-cloud-starter diff --git a/spring-cloud-test-support/pom.xml b/spring-cloud-test-support/pom.xml index 39dbd6c4..63566474 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.0-SNAPSHOT + 4.2.0-M1 .. spring-cloud-test-support From 763c5ac676751987c7c7db4a59ce5f47f61a59bd Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 19 Aug 2024 18:36:08 +0000 Subject: [PATCH 12/27] Going back to snapshots --- 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 3e3a44d1..655955a7 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-commons-parent - 4.2.0-M1 + 4.2.0-SNAPSHOT jar Spring Cloud Commons Docs diff --git a/pom.xml b/pom.xml index c751d8a3..a3d7f469 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-commons-parent - 4.2.0-M1 + 4.2.0-SNAPSHOT pom Spring Cloud Commons Parent Spring Cloud Commons Parent @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 4.2.0-M1 + 4.2.0-SNAPSHOT diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml index df24444a..bef42e6f 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.0-M1 + 4.2.0-SNAPSHOT spring-cloud-commons-dependencies - 4.2.0-M1 + 4.2.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 d29a83c6..70f12033 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.0-M1 + 4.2.0-SNAPSHOT .. spring-cloud-commons diff --git a/spring-cloud-context-integration-tests/pom.xml b/spring-cloud-context-integration-tests/pom.xml index 3d512965..00477adf 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.0-M1 + 4.2.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 850289d9..68986af6 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.0-M1 + 4.2.0-SNAPSHOT .. spring-cloud-context-webflux-integration-tests diff --git a/spring-cloud-context/pom.xml b/spring-cloud-context/pom.xml index e4b3b3cb..ce9ec5b4 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.0-M1 + 4.2.0-SNAPSHOT .. spring-cloud-context diff --git a/spring-cloud-loadbalancer/pom.xml b/spring-cloud-loadbalancer/pom.xml index 38ae0562..99d03970 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.0-M1 + 4.2.0-SNAPSHOT .. spring-cloud-loadbalancer diff --git a/spring-cloud-starter-bootstrap/pom.xml b/spring-cloud-starter-bootstrap/pom.xml index 56eb6e6c..0d641e77 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.0-M1 + 4.2.0-SNAPSHOT .. jar diff --git a/spring-cloud-starter-loadbalancer/pom.xml b/spring-cloud-starter-loadbalancer/pom.xml index de11dd0f..f030aede 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.0-M1 + 4.2.0-SNAPSHOT .. 4.0.0 diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml index 94c13d83..600fe2a6 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.0-M1 + 4.2.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 63566474..39dbd6c4 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.0-M1 + 4.2.0-SNAPSHOT .. spring-cloud-test-support From aa04daa367dbb18ef58d054f9fd8243261640abb Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Fri, 23 Aug 2024 18:18:32 +0200 Subject: [PATCH 13/27] Update GH actions setup. --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index bb92bc17..96e8b1d4 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -5,9 +5,9 @@ name: Build on: push: - branches: [ main, 4.0.x, 3.1.x ] + branches: [ main, 4.1.x, 4.0.x, 3.1.x ] pull_request: - branches: [ main, 4.0.x, 3.1.x ] + branches: [ main, 4.1.x, 4.0.x, 3.1.x ] jobs: build: From f083a72c83639da98af762afa32072abf08e3d24 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Wed, 28 Aug 2024 15:27:14 -0700 Subject: [PATCH 14/27] Add a note that Java Records annotated with @ConfigurationProperties can't be refreshed. Fixes #1372 --- .../spring-cloud-commons/application-context-services.adoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/modules/ROOT/pages/spring-cloud-commons/application-context-services.adoc b/docs/modules/ROOT/pages/spring-cloud-commons/application-context-services.adoc index a20c40da..151cff39 100644 --- a/docs/modules/ROOT/pages/spring-cloud-commons/application-context-services.adoc +++ b/docs/modules/ROOT/pages/spring-cloud-commons/application-context-services.adoc @@ -173,6 +173,8 @@ For instance, a `DataSource` can have its `maxPoolSize` changed at runtime (the Re-binding `@ConfigurationProperties` does not cover another large class of use cases, where you need more control over the refresh and where you need a change to be atomic over the whole `ApplicationContext`. To address those concerns, we have `@RefreshScope`. +NOTE: Java Records annotated with `@ConfigurationProperties` cannot be refreshed. + [[refresh-scope]] == Refresh Scope From 78d884c50dfa8844c62d989db700a31fed5f6fe4 Mon Sep 17 00:00:00 2001 From: qnnn <65326092+qnnn@users.noreply.github.com> Date: Mon, 2 Sep 2024 22:19:26 +0800 Subject: [PATCH 15/27] Optimize instance selection performance (#1363) --- .../cloud/loadbalancer/core/RandomLoadBalancer.java | 13 ++++++++----- .../loadbalancer/core/RoundRobinLoadBalancer.java | 13 ++++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RandomLoadBalancer.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RandomLoadBalancer.java index ed97037c..f1b9f356 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RandomLoadBalancer.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RandomLoadBalancer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2024 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. @@ -29,11 +29,13 @@ import org.springframework.cloud.client.loadbalancer.DefaultResponse; import org.springframework.cloud.client.loadbalancer.EmptyResponse; import org.springframework.cloud.client.loadbalancer.Request; import org.springframework.cloud.client.loadbalancer.Response; +import org.springframework.util.function.SingletonSupplier; /** * A random-based implementation of {@link ReactorServiceInstanceLoadBalancer}. * * @author Olga Maciaszek-Sharma + * @author Nan Chiu * @since 2.2.7 */ public class RandomLoadBalancer implements ReactorServiceInstanceLoadBalancer { @@ -42,7 +44,7 @@ public class RandomLoadBalancer implements ReactorServiceInstanceLoadBalancer { private final String serviceId; - private ObjectProvider serviceInstanceListSupplierProvider; + private final SingletonSupplier serviceInstanceListSingletonSupplier; /** * @param serviceInstanceListSupplierProvider a provider of @@ -52,14 +54,15 @@ public class RandomLoadBalancer implements ReactorServiceInstanceLoadBalancer { public RandomLoadBalancer(ObjectProvider serviceInstanceListSupplierProvider, String serviceId) { this.serviceId = serviceId; - this.serviceInstanceListSupplierProvider = serviceInstanceListSupplierProvider; + this.serviceInstanceListSingletonSupplier = SingletonSupplier.of( + () -> serviceInstanceListSupplierProvider.getIfAvailable(NoopServiceInstanceListSupplier::new) + ); } @SuppressWarnings("rawtypes") @Override public Mono> choose(Request request) { - ServiceInstanceListSupplier supplier = serviceInstanceListSupplierProvider - .getIfAvailable(NoopServiceInstanceListSupplier::new); + ServiceInstanceListSupplier supplier = serviceInstanceListSingletonSupplier.obtain(); return supplier.get(request) .next() .map(serviceInstances -> processInstanceResponse(supplier, serviceInstances)); diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RoundRobinLoadBalancer.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RoundRobinLoadBalancer.java index 7bed7fe5..6eede246 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RoundRobinLoadBalancer.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RoundRobinLoadBalancer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2024 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. @@ -30,6 +30,7 @@ import org.springframework.cloud.client.loadbalancer.DefaultResponse; import org.springframework.cloud.client.loadbalancer.EmptyResponse; import org.springframework.cloud.client.loadbalancer.Request; import org.springframework.cloud.client.loadbalancer.Response; +import org.springframework.util.function.SingletonSupplier; /** * A Round-Robin-based implementation of {@link ReactorServiceInstanceLoadBalancer}. @@ -37,6 +38,7 @@ import org.springframework.cloud.client.loadbalancer.Response; * @author Spencer Gibb * @author Olga Maciaszek-Sharma * @author Zhuozhi JI + * @author Nan Chiu */ public class RoundRobinLoadBalancer implements ReactorServiceInstanceLoadBalancer { @@ -46,7 +48,7 @@ public class RoundRobinLoadBalancer implements ReactorServiceInstanceLoadBalance final String serviceId; - ObjectProvider serviceInstanceListSupplierProvider; + private final SingletonSupplier serviceInstanceListSingletonSupplier; /** * @param serviceInstanceListSupplierProvider a provider of @@ -67,7 +69,9 @@ public class RoundRobinLoadBalancer implements ReactorServiceInstanceLoadBalance public RoundRobinLoadBalancer(ObjectProvider serviceInstanceListSupplierProvider, String serviceId, int seedPosition) { this.serviceId = serviceId; - this.serviceInstanceListSupplierProvider = serviceInstanceListSupplierProvider; + this.serviceInstanceListSingletonSupplier = SingletonSupplier.of( + () -> serviceInstanceListSupplierProvider.getIfAvailable(NoopServiceInstanceListSupplier::new) + ); this.position = new AtomicInteger(seedPosition); } @@ -77,8 +81,7 @@ public class RoundRobinLoadBalancer implements ReactorServiceInstanceLoadBalance // https://github.com/Netflix/ocelli/blob/master/ocelli-core/ // src/main/java/netflix/ocelli/loadbalancer/RoundRobinLoadBalancer.java public Mono> choose(Request request) { - ServiceInstanceListSupplier supplier = serviceInstanceListSupplierProvider - .getIfAvailable(NoopServiceInstanceListSupplier::new); + ServiceInstanceListSupplier supplier = serviceInstanceListSingletonSupplier.obtain(); return supplier.get(request) .next() .map(serviceInstances -> processInstanceResponse(supplier, serviceInstances)); From a7995a49ad421920fdaa063d8c5894dc14e4dd40 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 2 Sep 2024 20:02:41 +0000 Subject: [PATCH 16/27] Bumping versions --- .../cloud/loadbalancer/core/RandomLoadBalancer.java | 5 ++--- .../cloud/loadbalancer/core/RoundRobinLoadBalancer.java | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RandomLoadBalancer.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RandomLoadBalancer.java index f1b9f356..67222ffa 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RandomLoadBalancer.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RandomLoadBalancer.java @@ -54,9 +54,8 @@ public class RandomLoadBalancer implements ReactorServiceInstanceLoadBalancer { public RandomLoadBalancer(ObjectProvider serviceInstanceListSupplierProvider, String serviceId) { this.serviceId = serviceId; - this.serviceInstanceListSingletonSupplier = SingletonSupplier.of( - () -> serviceInstanceListSupplierProvider.getIfAvailable(NoopServiceInstanceListSupplier::new) - ); + this.serviceInstanceListSingletonSupplier = SingletonSupplier + .of(() -> serviceInstanceListSupplierProvider.getIfAvailable(NoopServiceInstanceListSupplier::new)); } @SuppressWarnings("rawtypes") diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RoundRobinLoadBalancer.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RoundRobinLoadBalancer.java index 6eede246..64805204 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RoundRobinLoadBalancer.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RoundRobinLoadBalancer.java @@ -69,9 +69,8 @@ public class RoundRobinLoadBalancer implements ReactorServiceInstanceLoadBalance public RoundRobinLoadBalancer(ObjectProvider serviceInstanceListSupplierProvider, String serviceId, int seedPosition) { this.serviceId = serviceId; - this.serviceInstanceListSingletonSupplier = SingletonSupplier.of( - () -> serviceInstanceListSupplierProvider.getIfAvailable(NoopServiceInstanceListSupplier::new) - ); + this.serviceInstanceListSingletonSupplier = SingletonSupplier + .of(() -> serviceInstanceListSupplierProvider.getIfAvailable(NoopServiceInstanceListSupplier::new)); this.position = new AtomicInteger(seedPosition); } From 99a0e6eeb210c9d1f15aabba4a31690120e40c55 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 4 Sep 2024 12:04:12 +0200 Subject: [PATCH 17/27] Update GH actions. --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 96e8b1d4..7979a5c5 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -5,9 +5,9 @@ name: Build on: push: - branches: [ main, 4.1.x, 4.0.x, 3.1.x ] + branches: [ main, 4.1.x ] pull_request: - branches: [ main, 4.1.x, 4.0.x, 3.1.x ] + branches: [ main, 4.1.x ] jobs: build: From 29c9612b8ada48cddc294d88a4d43f26bb02e1db Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 4 Sep 2024 12:05:16 +0200 Subject: [PATCH 18/27] Update dependabot. --- .github/dependabot.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8546d0b2..c2bc6b95 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,6 +10,11 @@ updates: target-branch: "4.0.x" # oldest OSS supported branch schedule: interval: "weekly" + - package-ecosystem: "github-actions" + directory: "/" + target-branch: "4.1.x" + schedule: + interval: "weekly" - package-ecosystem: "github-actions" directory: "/" target-branch: "main" @@ -37,6 +42,17 @@ updates: update-types: - version-update:semver-major - version-update:semver-minor + - package-ecosystem: maven + directory: / + schedule: + interval: daily + target-branch: 4.1.x + ignore: + # only upgrade patch versions for maintenance branch + - dependency-name: "*" + update-types: + - version-update:semver-major + - version-update:semver-minor - package-ecosystem: maven directory: / schedule: From b911c0ca4126ba601b5a881f3c02b51c210ddb84 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 14:03:06 +0200 Subject: [PATCH 19/27] Bump maven-resolver.version from 1.9.16 to 1.9.22 (#1377) Bumps `maven-resolver.version` from 1.9.16 to 1.9.22. Updates `org.apache.maven.resolver:maven-resolver-connector-basic` from 1.9.16 to 1.9.22 - [Release notes](https://github.com/apache/maven-resolver/releases) - [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.9.16...maven-resolver-1.9.22) Updates `org.apache.maven.resolver:maven-resolver-impl` from 1.9.16 to 1.9.22 - [Release notes](https://github.com/apache/maven-resolver/releases) - [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.9.16...maven-resolver-1.9.22) Updates `org.apache.maven.resolver:maven-resolver-transport-http` from 1.9.16 to 1.9.22 --- updated-dependencies: - dependency-name: org.apache.maven.resolver:maven-resolver-connector-basic dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven.resolver:maven-resolver-impl dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven.resolver:maven-resolver-transport-http 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> --- spring-cloud-test-support/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-test-support/pom.xml b/spring-cloud-test-support/pom.xml index 87163933..406c455b 100644 --- a/spring-cloud-test-support/pom.xml +++ b/spring-cloud-test-support/pom.xml @@ -16,7 +16,7 @@ Spring Cloud Test Support 3.9.5 - 1.9.16 + 1.9.22 From 4c0a6fa492f3ec3173d5d72e8a104ba6badfd07e Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 4 Sep 2024 14:05:29 +0200 Subject: [PATCH 20/27] Upgrade maven resolver provider version. --- spring-cloud-test-support/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-test-support/pom.xml b/spring-cloud-test-support/pom.xml index 406c455b..d2b9b7b3 100644 --- a/spring-cloud-test-support/pom.xml +++ b/spring-cloud-test-support/pom.xml @@ -15,7 +15,7 @@ spring-cloud-test-support Spring Cloud Test Support - 3.9.5 + 3.9.9 1.9.22 From e5516f1da08899030ec45bb7686aa4972301bb96 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 14:06:34 +0200 Subject: [PATCH 21/27] Bump maven-resolver.version from 1.9.16 to 1.9.22 (#1375) Bumps `maven-resolver.version` from 1.9.16 to 1.9.22. Updates `org.apache.maven.resolver:maven-resolver-connector-basic` from 1.9.16 to 1.9.22 - [Release notes](https://github.com/apache/maven-resolver/releases) - [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.9.16...maven-resolver-1.9.22) Updates `org.apache.maven.resolver:maven-resolver-impl` from 1.9.16 to 1.9.22 - [Release notes](https://github.com/apache/maven-resolver/releases) - [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.9.16...maven-resolver-1.9.22) Updates `org.apache.maven.resolver:maven-resolver-transport-http` from 1.9.16 to 1.9.22 --- updated-dependencies: - dependency-name: org.apache.maven.resolver:maven-resolver-connector-basic dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven.resolver:maven-resolver-impl dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven.resolver:maven-resolver-transport-http 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> --- spring-cloud-test-support/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-test-support/pom.xml b/spring-cloud-test-support/pom.xml index 39dbd6c4..9f0ef05c 100644 --- a/spring-cloud-test-support/pom.xml +++ b/spring-cloud-test-support/pom.xml @@ -16,7 +16,7 @@ Spring Cloud Test Support 3.9.5 - 1.9.16 + 1.9.22 From 5412d6db541c94f604be38f821d658b81b55c283 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 4 Sep 2024 15:33:18 +0200 Subject: [PATCH 22/27] Add missing test dependency. --- spring-cloud-commons/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/spring-cloud-commons/pom.xml b/spring-cloud-commons/pom.xml index 70f12033..b4a439fa 100644 --- a/spring-cloud-commons/pom.xml +++ b/spring-cloud-commons/pom.xml @@ -225,5 +225,11 @@ micrometer-observation-test test + + org.apache.commons + commons-lang3 + 3.16.0 + test + From c2707f8222cf4d0e0dcd99aca2f8a00adfbdfb1d Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Wed, 4 Sep 2024 10:45:13 -0400 Subject: [PATCH 23/27] Fix README --- README.adoc | 328 ++++++++++++++++++++++++++++- docs/src/main/asciidoc/README.adoc | 4 +- 2 files changed, 328 insertions(+), 4 deletions(-) diff --git a/README.adoc b/README.adoc index 2f4363e7..97139044 100644 --- a/README.adoc +++ b/README.adoc @@ -10,10 +10,334 @@ Edit the files in the src/main/asciidoc/ directory instead. = Building :page-section-summary-toc: 1 -Unresolved directive in - include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/src/main/asciidoc/building.adoc[] +:jdkversion: 17 + +[[basic-compile-and-test]] +== Basic Compile and Test + +To build the source you will need to install JDK {jdkversion}. + +Spring Cloud uses Maven for most build-related activities, and you +should be able to get off the ground quite quickly by cloning the +project you are interested in and typing + +---- +$ ./mvnw install +---- + +NOTE: You can also install Maven (>=3.3.3) yourself and run the `mvn` command +in place of `./mvnw` in the examples below. If you do that you also +might need to add `-P spring` if your local Maven settings do not +contain repository declarations for spring pre-release artifacts. + +NOTE: Be aware that you might need to increase the amount of memory +available to Maven by setting a `MAVEN_OPTS` environment variable with +a value like `-Xmx512m -XX:MaxPermSize=128m`. We try to cover this in +the `.mvn` configuration, so if you find you have to do it to make a +build succeed, please raise a ticket to get the settings added to +source control. + +The projects that require middleware (i.e. Redis) for testing generally +require that a local instance of [Docker](https://www.docker.com/get-started) is installed and running. + +[[documentation]] +== Documentation + +The spring-cloud-build module has a "docs" profile, and if you switch +that on it will try to build asciidoc sources using https://docs.antora.org/antora/latest/[Antora] from +`modules/ROOT/`. + +As part of that process it will look for a +`docs/src/main/asciidoc/README.adoc` and process it by loading all the includes, but not +parsing or rendering it, just copying it to `${main.basedir}` +(defaults to `$\{basedir}`, i.e. the root of the project). If there are +any changes in the README it will then show up after a Maven build as +a modified file in the correct place. Just commit it and push the change. + +[[working-with-the-code]] +== Working with the code +If you don't have an IDE preference we would recommend that you use +https://www.springsource.com/developer/sts[Spring Tools Suite] or +https://eclipse.org[Eclipse] when working with the code. We use the +https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools +should also work without issue as long as they use Maven 3.3.3 or better. + +[[activate-the-spring-maven-profile]] +=== Activate the Spring Maven profile +Spring Cloud projects require the 'spring' Maven profile to be activated to resolve +the spring milestone and snapshot repositories. Use your preferred IDE to set this +profile to be active, or you may experience build errors. + +[[importing-into-eclipse-with-m2eclipse]] +=== Importing into eclipse with m2eclipse +We recommend the https://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with +eclipse. If you don't already have m2eclipse installed it is available from the "eclipse +marketplace". + +NOTE: Older versions of m2e do not support Maven 3.3, so once the +projects are imported into Eclipse you will also need to tell +m2eclipse to use the right profile for the projects. If you +see many different errors related to the POMs in the projects, check +that you have an up to date installation. If you can't upgrade m2e, +add the "spring" profile to your `settings.xml`. Alternatively you can +copy the repository settings from the "spring" profile of the parent +pom into your `settings.xml`. + +[[importing-into-eclipse-without-m2eclipse]] +=== Importing into eclipse without m2eclipse +If you prefer not to use m2eclipse you can generate eclipse project metadata using the +following command: + +[indent=0] +---- + $ ./mvnw eclipse:eclipse +---- + +The generated eclipse projects can be imported by selecting `import existing projects` +from the `file` menu. + [[contributing]] = Contributing :page-section-summary-toc: 1 -Unresolved directive in - include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/src/main/asciidoc/contributing.adoc[] +:spring-cloud-build-branch: main + +Spring Cloud is released under the non-restrictive Apache 2.0 license, +and follows a very standard Github development process, using Github +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. + +[[code-of-conduct]] +== Code of Conduct +This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/main/docs/src/main/asciidoc/code-of-conduct.adoc[code of +conduct]. By participating, you are expected to uphold this code. Please report +unacceptable behavior to spring-code-of-conduct@pivotal.io. + +[[code-conventions-and-housekeeping]] +== Code Conventions and Housekeeping +None of these is essential for a pull request, but they will all help. They can also be +added after the original pull request but before a merge. + +* Use the Spring Framework code format conventions. If you use Eclipse + you can import formatter settings using the + `eclipse-code-formatter.xml` file from the + https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring + Cloud Build] project. If using IntelliJ, you can use the + https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter + Plugin] to import the same file. +* Make sure all new `.java` files to have a simple Javadoc class comment with at least an + `@author` tag identifying you, and preferably at least a paragraph on what the class is + for. +* Add the ASF license header comment to all new `.java` files (copy from existing files + in the project) +* Add yourself as an `@author` to the .java files that you modify substantially (more + than cosmetic changes). +* Add some Javadocs and, if you change the namespace, some XSD doc elements. +* A few unit tests would help a lot as well -- someone has to do it. +* If no-one else is using your branch, please rebase it against the current main (or + other target branch in the main project). +* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], + if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit + message (where XXXX is the issue number). + +[[checkstyle]] +== Checkstyle + +Spring Cloud Build comes with a set of checkstyle rules. You can find them in the `spring-cloud-build-tools` module. The most notable files under the module are: + +.spring-cloud-build-tools/ +---- +└── src +    ├── checkstyle +    │   └── checkstyle-suppressions.xml <3> +    └── main +    └── resources +    ├── checkstyle-header.txt <2> +    └── checkstyle.xml <1> +---- +<1> Default Checkstyle rules +<2> File header setup +<3> Default suppression rules + +[[checkstyle-configuration]] +=== Checkstyle configuration + +Checkstyle rules are *disabled by default*. To add checkstyle to your project just define the following properties and plugins. + +.pom.xml +---- + +true <1> + true + <2> + true + <3> + + + + + <4> + io.spring.javaformat + spring-javaformat-maven-plugin + + <5> + org.apache.maven.plugins + maven-checkstyle-plugin + + + + + + <5> + org.apache.maven.plugins + maven-checkstyle-plugin + + + + +---- +<1> Fails the build upon Checkstyle errors +<2> Fails the build upon Checkstyle violations +<3> Checkstyle analyzes also the test sources +<4> Add the Spring Java Format plugin that will reformat your code to pass most of the Checkstyle formatting rules +<5> Add checkstyle plugin to your build and reporting phases + +If you need to suppress some rules (e.g. line length needs to be longer), then it's enough for you to define a file under `${project.root}/src/checkstyle/checkstyle-suppressions.xml` with your suppressions. Example: + +.projectRoot/src/checkstyle/checkstyle-suppresions.xml +---- + + + + + + +---- + +It's advisable to copy the `${spring-cloud-build.rootFolder}/.editorconfig` and `${spring-cloud-build.rootFolder}/.springformat` to your project. That way, some default formatting rules will be applied. You can do so by running this script: + +```bash +$ curl https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/.editorconfig -o .editorconfig +$ touch .springformat +``` + +[[ide-setup]] +== IDE setup + +[[intellij-idea]] +=== Intellij IDEA + +In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin. +The following files can be found in the https://github.com/spring-cloud/spring-cloud-build/tree/main/spring-cloud-build-tools[Spring Cloud Build] project. + +.spring-cloud-build-tools/ +---- +└── src +    ├── checkstyle +    │   └── checkstyle-suppressions.xml <3> +    └── main +    └── resources +    ├── checkstyle-header.txt <2> +    ├── checkstyle.xml <1> +    └── intellij +       ├── Intellij_Project_Defaults.xml <4> +       └── Intellij_Spring_Boot_Java_Conventions.xml <5> +---- +<1> Default Checkstyle rules +<2> File header setup +<3> Default suppression rules +<4> Project defaults for Intellij that apply most of Checkstyle rules +<5> Project style conventions for Intellij that apply most of Checkstyle rules + +.Code style + +image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/modules/ROOT/assets/images/intellij-code-style.png[Code style] + +Go to `File` -> `Settings` -> `Editor` -> `Code style`. There click on the icon next to the `Scheme` section. There, click on the `Import Scheme` value and pick the `Intellij IDEA code style XML` option. Import the `spring-cloud-build-tools/src/main/resources/intellij/Intellij_Spring_Boot_Java_Conventions.xml` file. + +.Inspection profiles + +image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/modules/ROOT/assets/images/intellij-inspections.png[Code style] + +Go to `File` -> `Settings` -> `Editor` -> `Inspections`. There click on the icon next to the `Profile` section. There, click on the `Import Profile` and import the `spring-cloud-build-tools/src/main/resources/intellij/Intellij_Project_Defaults.xml` file. + +.Checkstyle + +To have Intellij work with Checkstyle, you have to install the `Checkstyle` plugin. It's advisable to also install the `Assertions2Assertj` to automatically convert the JUnit assertions + +image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/modules/ROOT/assets/images/intellij-checkstyle.png[Checkstyle] + +Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on the `+` icon in the `Configuration file` section. There, you'll have to define where the checkstyle rules should be picked from. In the image above, we've picked the rules from the cloned Spring Cloud Build repository. However, you can point to the Spring Cloud Build's GitHub repository (e.g. for the `checkstyle.xml` : `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/spring-cloud-build-tools/src/main/resources/checkstyle.xml`). We need to provide the following variables: + +- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL. +- `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL. +- `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`. + +IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources. + +[[duplicate-finder]] +== Duplicate Finder + +Spring Cloud Build brings along the `basepom:duplicate-finder-maven-plugin`, that enables flagging duplicate and conflicting classes and resources on the java classpath. + +[[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`. + +.pom.xml +[source,xml] +---- + + + + org.basepom.maven + duplicate-finder-maven-plugin + + + +---- + +For other properties, we have set defaults as listed in the https://github.com/basepom/duplicate-finder-maven-plugin/wiki[plugin documentation]. + +You can easily override them but setting the value of the selected property prefixed with `duplicate-finder-maven-plugin`. For example, set `duplicate-finder-maven-plugin.skip` to `true` in order to skip duplicates check in your build. + +If you need to add `ignoredClassPatterns` or `ignoredResourcePatterns` to your setup, make sure to add them in the plugin configuration section of your project: + +[source,xml] +---- + + + + org.basepom.maven + duplicate-finder-maven-plugin + + + org.joda.time.base.BaseDateTime + .*module-info + + + changelog.txt + + + + + + + +---- + diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index 56db1c9d..32835c20 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -3,10 +3,10 @@ = Building :page-section-summary-toc: 1 -include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/src/main/asciidoc/building.adoc[] +include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/modules/ROOT/partials/building.adoc[] [[contributing]] = Contributing :page-section-summary-toc: 1 -include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/src/main/asciidoc/contributing.adoc[] +include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/modules/ROOT/partials/contributing.adoc[] From 91309f7ecbbf59d60716a06d07358fc6e913ef2c Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Wed, 4 Sep 2024 10:53:24 -0400 Subject: [PATCH 24/27] Adding npm to dependabot --- .github/dependabot.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index c2bc6b95..5b829a0c 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -62,4 +62,19 @@ updates: # only upgrade by minor or patch - dependency-name: "*" update-types: - - version-update:semver-major \ No newline at end of file + - version-update:semver-major + - package-ecosystem: npm + target-branch: docs-build + directory: / + schedule: + interval: weekly + - package-ecosystem: npm + target-branch: main + directory: /docs + schedule: + interval: weekly + - package-ecosystem: npm + target-branch: 4.1.x + directory: /docs + schedule: + interval: weekly From 4333960b39419ea9ee42736ae0b8fa0054f5259a Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Wed, 4 Sep 2024 14:07:03 -0400 Subject: [PATCH 25/27] Fixing test --- .../loadbalancer/reactive/LoadBalancerTestUtils.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerTestUtils.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerTestUtils.java index 6cca54bd..348b2fd6 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerTestUtils.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerTestUtils.java @@ -16,10 +16,9 @@ package org.springframework.cloud.client.loadbalancer.reactive; +import java.util.Arrays; import java.util.List; -import org.apache.commons.lang3.ArrayUtils; - import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; @@ -42,9 +41,9 @@ final class LoadBalancerTestUtils { } static ConfigurableApplicationContext init(Class... configClasses) { - return new SpringApplicationBuilder().web(WebApplicationType.NONE) - .sources(ArrayUtils.add(configClasses, WebClientAutoConfiguration.class)) - .run(); + Class[] classes = Arrays.copyOf(configClasses, configClasses.length + 1); + classes[configClasses.length] = WebClientAutoConfiguration.class; + return new SpringApplicationBuilder().web(WebApplicationType.NONE).sources(classes).run(); } @SuppressWarnings("unchecked") From d578cb5aee5fd94c9a6a826aa24d873125820fe4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 16:06:33 -0400 Subject: [PATCH 26/27] Bump @springio/asciidoctor-extensions in /docs (#1380) Bumps [@springio/asciidoctor-extensions](https://github.com/spring-io/asciidoctor-extensions) from 1.0.0-alpha.10 to 1.0.0-alpha.13. - [Changelog](https://github.com/spring-io/asciidoctor-extensions/blob/main/CHANGELOG.adoc) - [Commits](https://github.com/spring-io/asciidoctor-extensions/compare/v1.0.0-alpha.10...v1.0.0-alpha.13) --- updated-dependencies: - dependency-name: "@springio/asciidoctor-extensions" 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 c3570e2f..3e40fead 100644 --- a/docs/package.json +++ b/docs/package.json @@ -5,6 +5,6 @@ "@antora/collector-extension": "1.0.0-alpha.3", "@asciidoctor/tabs": "1.0.0-beta.6", "@springio/antora-extensions": "1.11.1", - "@springio/asciidoctor-extensions": "1.0.0-alpha.10" + "@springio/asciidoctor-extensions": "1.0.0-alpha.13" } } From 9e76c933d6b45e8261ecbb50bcdec546febf0ebb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 16:07:02 -0400 Subject: [PATCH 27/27] Bump org.apache.commons:commons-lang3 from 3.16.0 to 3.17.0 (#1379) Bumps org.apache.commons:commons-lang3 from 3.16.0 to 3.17.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-lang3 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- spring-cloud-commons/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-commons/pom.xml b/spring-cloud-commons/pom.xml index b4a439fa..394b0046 100644 --- a/spring-cloud-commons/pom.xml +++ b/spring-cloud-commons/pom.xml @@ -228,7 +228,7 @@ org.apache.commons commons-lang3 - 3.16.0 + 3.17.0 test