From 57e2ff59183b54559cdbcedf91c79ba1c9b920dc Mon Sep 17 00:00:00 2001
From: buildmaster <builds@springframework.org>
Date: Sat, 17 Jun 2023 13:46:03 +0000
Subject: [PATCH] Bumping versions

---
 docs/src/main/asciidoc/_configprops.adoc                      | 2 +-
 .../cloud/config/client/ConfigServerConfigDataLoader.java     | 3 ++-
 .../cloud/config/server/support/HttpClient4SupportTest.java   | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc
index c19776c0..5d4e8059 100644
--- a/docs/src/main/asciidoc/_configprops.adoc
+++ b/docs/src/main/asciidoc/_configprops.adoc
@@ -8,7 +8,7 @@
 |spring.cloud.config.fail-fast | `+++false+++` | Flag to indicate that failure to connect to the server is fatal (default false).
 |spring.cloud.config.headers |  | Additional headers used to create the client request.
 |spring.cloud.config.initialize-on-context-refresh | `+++false+++` | Flag to initialize bootstrap configuration on context refresh event. Default false.
-|spring.cloud.config.label |  | The label name to use to pull remote configuration properties. The default is set on the server (generally "master" for a git based server).
+|spring.cloud.config.label |  | The label name to use to pull remote configuration properties. The default is set on the server (generally "main" for a git based server).
 |spring.cloud.config.media-type |  | The Accept header media type to send to config server.
 |spring.cloud.config.multiple-uri-strategy |  | The strategy to use when call to server fails and there are multiple URLs configured on the uri property (default {@link MultipleUriStrategy#ALWAYS}).
 |spring.cloud.config.name |  | Name of application used to fetch remote properties.
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoader.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoader.java
index c2703428..ced0f6ef 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoader.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoader.java
@@ -166,7 +166,8 @@ public class ConfigServerConfigDataLoader implements ConfigDataLoader<ConfigServ
 								// , is used as a profile-separator for property sources
 								// from vault
 								// - is the default profile-separator for property sources
-								// TODO This is error prone logic see https://github.com/spring-cloud/spring-cloud-config/issues/2291
+								// TODO This is error prone logic see
+								// https://github.com/spring-cloud/spring-cloud-config/issues/2291
 								if (propertySourceName.matches(".*[-,]" + profile + ".*")) {
 									// // TODO: switch to Options.with() when implemented
 									options.add(Option.PROFILE_SPECIFIC);
diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/support/HttpClient4SupportTest.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/support/HttpClient4SupportTest.java
index 64a3e2d7..6f0e6b06 100644
--- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/support/HttpClient4SupportTest.java
+++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/support/HttpClient4SupportTest.java
@@ -71,7 +71,7 @@ public class HttpClient4SupportTest {
 	@EnabledOnJre(JRE.JAVA_8)
 	public void httpsProxy() throws GeneralSecurityException, IOException {
 		WireMockServer wireMockProxyServer = new WireMockServer(
-			options().httpDisabled(true).dynamicHttpsPort().enableBrowserProxying(true).trustAllProxyTargets(true));
+				options().httpDisabled(true).dynamicHttpsPort().enableBrowserProxying(true).trustAllProxyTargets(true));
 		WireMockServer wireMockServer = new WireMockServer(options().httpDisabled(true).dynamicHttpsPort());
 		wireMockProxyServer.start();
 		wireMockServer.start();
@@ -91,7 +91,7 @@ public class HttpClient4SupportTest {
 		try {
 			httpClient = HttpClient4Support.builder(properties).build();
 			response = httpClient
-				.execute(new HttpGet("https://localhost:" + wireMockServer.httpsPort() + "/test/proxy"));
+					.execute(new HttpGet("https://localhost:" + wireMockServer.httpsPort() + "/test/proxy"));
 		}
 		finally {
 			if (response != null) {