Merge branch '2.2.x' into 2.3.x

Closes gh-22964

Author: philwebb

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java

@@ -381,16 +381,6 @@ public SpringApplicationBuilder setAddConversionService(boolean addConversionSer
 		return this;
 	}
 
-	/**
-	 * Default properties for the environment in the form {@code key=value} or
-	 * {@code key:value}.
-	 * @param defaultProperties the properties to set.
-	 * @return the current builder
-	 */
-	public SpringApplicationBuilder properties(String... defaultProperties) {
-		return properties(getMapFromKeyValuePairs(defaultProperties));
-	}
-
 	/**
 	 * Flag to control whether the application should be initialized lazily.
 	 * @param lazyInitialization the flag to set. Defaults to false.
@@ -402,6 +392,19 @@ public SpringApplicationBuilder lazyInitialization(boolean lazyInitialization) {
 		return this;
 	}
 
+	/**
+	 * Default properties for the environment in the form {@code key=value} or
+	 * {@code key:value}. Multiple calls to this method are cumulative and will not clear
+	 * any previously set properties.
+	 * @param defaultProperties the properties to set.
+	 * @return the current builder
+	 * @see SpringApplicationBuilder#properties(Properties)
+	 * @see SpringApplicationBuilder#properties(Map)
+	 */
+	public SpringApplicationBuilder properties(String... defaultProperties) {
+		return properties(getMapFromKeyValuePairs(defaultProperties));
+	}
+
 	private Map<String, Object> getMapFromKeyValuePairs(String[] properties) {
 		Map<String, Object> map = new HashMap<>();
 		for (String property : properties) {
@@ -425,10 +428,12 @@ private int lowestIndexOf(String property, String... candidates) {
 	}
 
 	/**
-	 * Default properties for the environment in the form {@code key=value} or
-	 * {@code key:value}.
+	 * Default properties for the environment.Multiple calls to this method are cumulative
+	 * and will not clear any previously set properties.
 	 * @param defaultProperties the properties to set.
 	 * @return the current builder
+	 * @see SpringApplicationBuilder#properties(String...)
+	 * @see SpringApplicationBuilder#properties(Map)
 	 */
 	public SpringApplicationBuilder properties(Properties defaultProperties) {
 		return properties(getMapFromProperties(defaultProperties));
@@ -444,10 +449,11 @@ private Map<String, Object> getMapFromProperties(Properties properties) {
 
 	/**
 	 * Default properties for the environment. Multiple calls to this method are
-	 * cumulative.
+	 * cumulative and will not clear any previously set properties.
 	 * @param defaults the default properties
 	 * @return the current builder
 	 * @see SpringApplicationBuilder#properties(String...)
+	 * @see SpringApplicationBuilder#properties(Properties)
 	 */
 	public SpringApplicationBuilder properties(Map<String, Object> defaults) {
 		this.defaultProperties.putAll(defaults);