Merge branch '1.4.x' into 1.5.x

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/MultipartProperties.java

@@ -39,7 +39,7 @@ import org.springframework.util.StringUtils;
  * <p>
  * These properties are ultimately passed through {@link MultipartConfigFactory} which
  * means you may specify the values using {@literal long} values or using more readable
- * {@literal String} variants that accept {@literal Kb} or {@literal Mb} suffixes.
+ * {@literal String} variants that accept {@literal KB} or {@literal MB} suffixes.
  *
  * @author Josh Long
  * @author Toshiaki Maki
@@ -62,13 +62,13 @@ public class MultipartProperties {
 	 * Max file size. Values can use the suffixed "MB" or "KB" to indicate a Megabyte or
 	 * Kilobyte size.
 	 */
-	private String maxFileSize = "1Mb";
+	private String maxFileSize = "1MB";
 
 	/**
 	 * Max request size. Values can use the suffixed "MB" or "KB" to indicate a Megabyte
 	 * or Kilobyte size.
 	 */
-	private String maxRequestSize = "10Mb";
+	private String maxRequestSize = "10MB";
 
 	/**
 	 * Threshold after which files will be written to disk. Values can use the suffixed

spring-boot/src/main/java/org/springframework/boot/web/servlet/MultipartConfigFactory.java

@@ -26,8 +26,8 @@ import org.springframework.util.Assert;
  * readable {@literal String} variants that accept KB or MB suffixes, for example:
  *
  * <pre class="code">
- * factory.setMaxFileSize(&quot;10Mb&quot;);
- * factory.setMaxRequestSize(&quot;100Kb&quot;);
+ * factory.setMaxFileSize(&quot;10MB&quot;);
+ * factory.setMaxRequestSize(&quot;100KB&quot;);
  * </pre>
  *
  * @author Phillip Webb