build: update Spring Boot to 2.1.18

This also updates Spring Framework to 5.1.20 and Spring Security to 5.1.13

Notes:
- in order to use old Groovy version, I've introduced the "groovy-old.version" property. Redefining
  "groovy.version" doesn't work anymore, as Spring Boot has a dependency on
  org.codehaus.groovy:groovy-bom that doesn't exist for old versions
- Spring Framework version has been redefined and updated to the latest version available. This only
  needed because we use End-Of-Life version of Spring Boot. It won't be needed on newer versions.

Changelogs:
* Spring Boot
  - https://spring.io/blog/2018/07/30/spring-boot-2-1-m1
  - https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.1.0-M1-Release-Notes
  - https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.1.0-M1-Configuration-Changelog
  - https://spring.io/blog/2018/08/21/spring-boot-2-1-m2-available-now
  - https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.1.0-M2-Release-Notes
  - https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.1.0-M2-Configuration-Changelog
  - https://spring.io/blog/2018/09/13/spring-boot-2-1-m3-available-now
  - https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.1.0-M3-Release-Notes
  - https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.1.0-M3-Configuration-Changelog
  - https://spring.io/blog/2018/09/25/spring-boot-2-1-m4-available-now
  - https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.1.0-M4-Release-Notes
  - https://spring.io/blog/2018/10/17/spring-boot-2-1-0-rc1-available-now
  - https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.1.0-RC1-Release-Notes
  - https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.1.0-RC1-Configuration-Changelog
  - https://spring.io/blog/2018/10/30/spring-boot-2-1-0
  - https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.1-Release-Notes
  - https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.1.0-Configuration-Changelog
  - https://spring.io/blog/2018/11/30/spring-boot-2-1-1-available-now
  - https://spring.io/blog/2019/01/12/spring-boot-2-1-2-released
  - https://spring.io/blog/2019/02/15/spring-boot-2-1-3-available-now
  - https://spring.io/blog/2019/04/04/spring-boot-2-1-4-released
  - https://spring.io/blog/2019/05/15/spring-boot-2-1-5-released
  - https://spring.io/blog/2019/06/19/spring-boot-2-1-6-released
  - https://spring.io/blog/2019/08/06/spring-boot-2-1-7-available-now
  - https://spring.io/blog/2019/09/06/spring-boot-2-1-8-available-now
  - https://spring.io/blog/2019/10/02/spring-boot-2-1-9-available-now
  - https://spring.io/blog/2019/11/06/spring-boot-2-1-10-available-now
  - https://spring.io/blog/2019/12/06/spring-boot-2-1-11-is-now-available
  - https://spring.io/blog/2020/01/16/spring-boot-2-1-12-released
  - https://spring.io/blog/2020/02/27/spring-boot-2-1-13-released
  - https://spring.io/blog/2020/05/07/spring-boot-2-1-14-available-now
  - https://spring.io/blog/2020/06/11/spring-boot-2-1-15-available-now
  - https://spring.io/blog/2020/07/24/spring-boot-2-1-16-available-now
  - https://spring.io/blog/2020/09/17/spring-boot-2-1-17-available-now
  - https://spring.io/blog/2020/10/29/spring-boot-2-1-18-available-now
* Spring Framework
  - https://spring.io/blog/2018/07/26/spring-framework-5-1-goes-rc1
  - https://spring.io/blog/2018/08/17/spring-framework-5-1-rc2-available-now
  - https://spring.io/blog/2018/09/07/spring-framework-5-1-rc3-5-0-9-and-4-3-19-available-now
  - https://spring.io/blog/2018/09/21/spring-framework-5-1-goes-ga
  - https://github.com/spring-projects/spring-framework/wiki/What's-New-in-Spring-Framework-5.x#whats-new-in-version-51
  - https://github.com/spring-projects/spring-framework/wiki/Upgrading-to-Spring-Framework-5.x#upgrading-to-version-51
  - https://spring.io/blog/2018/10/15/spring-framework-5-1-1-5-0-10-and-4-3-20-available-now
  - https://spring.io/blog/2018/10/29/spring-framework-5-1-2-available-now
  - https://spring.io/blog/2018/11/27/spring-framework-5-1-3-5-0-11-and-4-3-21-available-now
  - https://spring.io/blog/2019/01/09/spring-framework-5-1-4-5-0-12-and-4-3-22-available-now
  - https://spring.io/blog/2019/02/13/spring-framework-5-1-5-available-now
  - https://spring.io/blog/2019/04/01/spring-framework-5-1-6-5-0-13-and-4-3-23-available-now
  - https://spring.io/blog/2019/05/10/spring-framework-5-2-0-m2-5-1-7-5-0-14-and-4-3-24-available-now
  - https://spring.io/blog/2019/06/13/spring-framework-5-2-0-m3-and-5-1-8-available-now
  - https://spring.io/blog/2019/08/02/spring-framework-5-1-9-5-0-15-and-4-3-25-available-now
  - https://spring.io/blog/2019/09/28/spring-framework-5-1-10-available-now
  - https://spring.io/blog/2019/11/04/spring-framework-5-2-1-and-5-1-11-available-now
  - https://spring.io/blog/2019/12/03/spring-framework-5-2-2-and-5-1-12-available-now
  - https://spring.io/blog/2020/01/16/spring-framework-5-2-3-5-1-13-5-0-16-and-4-3-26-releases
  - https://spring.io/blog/2020/02/25/spring-framework-5-2-4-and-5-1-14-available-now
  - https://spring.io/blog/2020/04/28/spring-framework-5-2-6-5-1-15-5-0-17-and-4-3-27-available-now
  - https://spring.io/blog/2020/06/09/spring-framework-5-2-7-and-5-1-16-available-now
  - https://spring.io/blog/2020/07/21/spring-framework-5-2-8-5-1-17-5-0-18-and-4-3-28-available-now
  - https://spring.io/blog/2020/09/15/spring-framework-5-2-9-5-1-18-5-0-19-and-4-3-29-available-now
  - https://spring.io/blog/2020/10/27/spring-framework-5-2-10-and-5-1-19-available-now
  - https://spring.io/blog/2020/12/09/spring-framework-5-3-2-5-2-12-5-1-20-5-0-20-and-4-3-30-available-now
* Spring Security
  - https://spring.io/blog/2018/05/15/spring-security-5-1-0-m1-released
  - https://spring.io/blog/2018/07/30/spring-security-5-1-0-m2-released
  - https://spring.io/blog/2018/08/21/spring-security-5-1-0-rc1-released
  - https://spring.io/blog/2018/09/10/spring-security-5-1-0-rc2-released
  - https://spring.io/blog/2018/09/27/spring-security-5-1-goes-ga
  - https://docs.spring.io/spring-security/site/docs/5.1.x/reference/htmlsingle/#new
  - https://spring.io/blog/2018/10/16/spring-security-5-1-1-5-0-9-and-4-2-9-released
  - https://spring.io/blog/2018/11/29/spring-security-5-1-2-5-0-10-4-2-10-released
  - https://spring.io/blog/2019/01/11/spring-security-5-1-3-5-0-11-4-2-11-released
  - https://spring.io/blog/2019/02/14/spring-security-5-1-4-released
  - https://spring.io/blog/2019/04/03/spring-security-5-1-5-5-0-12-4-2-12-released
  - https://spring.io/blog/2019/04/05/cve-2019-3795-spring-security-4-2-12-5-0-12-5-1-5-released
  - https://spring.io/blog/2019/08/05/spring-security-5-1-6-and-5-0-13-released
  - https://spring.io/blog/2019/11/04/spring-security-5-2-1-and-5-1-7-released
  - https://spring.io/blog/2020/02/05/spring-security-5-2-2-5-1-8-and-5-0-14-released
  - https://spring.io/blog/2020/04/02/spring-security-5-3-1-5-2-3-5-1-9-5-0-15-4-2-15-released
  - https://spring.io/blog/2020/05/07/spring-security-5-3-2-5-2-4-5-1-10-5-0-16-4-2-16-released
  - https://spring.io/blog/2020/05/13/cve-reports-published-for-spring-security
  - https://spring.io/blog/2020/06/03/spring-security-5-3-3-5-2-5-5-1-11-5-0-17-4-2-17-released
  - https://spring.io/blog/2020/08/12/spring-security-5-3-4-5-2-6-5-1-12-5-0-18-4-2-18-released
  - https://spring.io/blog/2020/10/08/spring-security-5-4-1-5-3-5-5-2-7-5-1-13-5-0-19-4-2-19-released

Fix #1161

Author: php-coder

infra/vagrant/provisioning/roles/mystamps-app/templates/application-prod.properties

@@ -43,7 +43,7 @@ app.use-cdn: true
 server.servlet.session.cookie.secure: true
 
 # Full list of autoconfiguration classes:
-# https://docs.spring.io/spring-boot/docs/2.0.x/reference/html/auto-configuration-classes.html
+# https://docs.spring.io/spring-boot/docs/2.1.x/reference/html/auto-configuration-classes.html
 # The difference between test profile is that we don't need
 # SpringApplicationAdminJmxAutoConfiguration and H2ConsoleAutoConfiguration
 spring.autoconfigure.exclude: \

pom.xml

@@ -66,7 +66,7 @@
 			<version>${slf4j.version}</version>
 		</dependency>
 
-		<!-- https://github.com/spring-projects/spring-boot/blob/v2.0.9.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter/pom.xml -->
+		<!-- https://github.com/spring-projects/spring-boot/blob/v2.1.18.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter/pom.xml -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
@@ -78,13 +78,13 @@
 			</exclusions>
 		</dependency>
 
-		<!-- https://github.com/spring-projects/spring-boot/blob/v2.0.9.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-jdbc/pom.xml -->
+		<!-- https://github.com/spring-projects/spring-boot/blob/v2.1.18.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-jdbc/pom.xml -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-jdbc</artifactId>
 		</dependency>
 
-		<!-- https://github.com/spring-projects/spring-boot/blob/v2.0.9.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/pom.xml -->
+		<!-- https://github.com/spring-projects/spring-boot/blob/v2.1.18.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/pom.xml -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-jetty</artifactId>
@@ -104,19 +104,19 @@
 			</exclusions>
 		</dependency>
 
-		<!-- https://github.com/spring-projects/spring-boot/blob/v2.0.9.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-logging/pom.xml -->
+		<!-- https://github.com/spring-projects/spring-boot/blob/v2.1.18.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-logging/pom.xml -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-logging</artifactId>
 		</dependency>
 
-		<!-- https://github.com/spring-projects/spring-boot/blob/v2.0.9.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-security/pom.xml -->
+		<!-- https://github.com/spring-projects/spring-boot/blob/v2.1.18.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-security/pom.xml -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-security</artifactId>
 		</dependency>
 
-		<!-- https://github.com/spring-projects/spring-boot/blob/v2.0.9.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml -->
+		<!-- https://github.com/spring-projects/spring-boot/blob/v2.1.18.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-thymeleaf</artifactId>
@@ -128,7 +128,7 @@
 			</exclusions>
 		</dependency>
 
-		<!-- https://github.com/spring-projects/spring-boot/blob/v2.0.9.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-web/pom.xml -->
+		<!-- https://github.com/spring-projects/spring-boot/blob/v2.1.18.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-web/pom.xml -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
@@ -413,7 +413,7 @@
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy-all</artifactId>
-			<version>${groovy.version}</version>
+			<version>${groovy-old.version}</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -451,7 +451,7 @@
 			<scope>test</scope>
 		</dependency>
 
-		<!-- https://github.com/spring-projects/spring-boot/blob/v2.0.9.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-test/pom.xml -->
+		<!-- https://github.com/spring-projects/spring-boot/blob/v2.1.18.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-test/pom.xml -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
@@ -496,16 +496,16 @@
 
 	</dependencies>
 
-	<!-- https://github.com/spring-projects/spring-boot/blob/v2.0.9.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml -->
+	<!-- https://github.com/spring-projects/spring-boot/blob/v2.1.18.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml -->
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.9.RELEASE</version>
+		<version>2.1.18.RELEASE</version>
 	</parent>
 
 	<!--
 		All default versions from Spring Boot can be found there:
-		https://github.com/spring-projects/spring-boot/blob/v2.0.9.RELEASE/spring-boot-project/spring-boot-dependencies/pom.xml
+		https://github.com/spring-projects/spring-boot/blob/v2.1.18.RELEASE/spring-boot-project/spring-boot-dependencies/pom.xml
 	-->
 	<properties>
 		<!--
@@ -549,8 +549,7 @@
 		<frontend.plugin.version>1.7.6</frontend.plugin.version>
 		<gmavenplus.plugin.version>1.5</gmavenplus.plugin.version>
 
-		<!-- Redefine default value from spring-boot-dependencies -->
-		<groovy.version>2.0.8</groovy.version>
+		<groovy-old.version>2.0.8</groovy-old.version>
 
 		<!-- Redefine default value from spring-boot-dependencies -->
 		<h2.version>1.4.200</h2.version>
@@ -569,7 +568,7 @@
 
 		<!--
 			Redefine default value from spring-boot-starter-parent:
-			https://github.com/spring-projects/spring-boot/blob/v2.0.9.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml
+			https://github.com/spring-projects/spring-boot/blob/v2.1.18.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml
 		-->
 		<java.version>1.8</java.version>
 
@@ -644,9 +643,13 @@
 		<spock.version>1.0-groovy-2.0</spock.version>
 		<spotbugs.plugin.version>3.1.11</spotbugs.plugin.version>
 
+		<!-- Redefine default value from spring-boot-dependencies in order to have the latest version -->
+		<!-- LATER: remove overriding once version from Spring Boot will match the used one  -->
+		<spring-framework.version>5.1.20.RELEASE</spring-framework.version>
+		
 		<!--
 			Define default value for spring-boot-starter-parent:
-			https://github.com/spring-projects/spring-boot/blob/v2.0.9.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml
+			https://github.com/spring-projects/spring-boot/blob/v2.1.18.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml
 		-->
 		<start-class>ru.mystamps.web.support.spring.boot.ApplicationBootstrap</start-class>
 

src/main/java/ru/mystamps/web/feature/site/SiteConfig.java

@@ -24,6 +24,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
+import org.springframework.core.env.Profiles;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import ru.mystamps.web.feature.account.UserService;
 import ru.mystamps.web.feature.account.UsersActivationService;
@@ -124,7 +125,8 @@ public CronService cronService(
 
 		@Bean
 		public MailService mailService() {
-			boolean isProductionEnvironment = env.acceptsProfiles("prod");
+			Profiles prod = Profiles.of("prod");
+			boolean isProductionEnvironment = env.acceptsProfiles(prod);
 			boolean enableTestMode = !isProductionEnvironment;
 
 			String user = "api";

src/main/java/ru/mystamps/web/support/mailgun/ApiMailgunEmailSendingStrategy.java

@@ -59,7 +59,7 @@ public ApiMailgunEmailSendingStrategy(
 		this.endpoint = endpoint;
 
 		this.restTemplate = restTemplateBuilder
-			.basicAuthorization(user, password)
+			.basicAuthentication(user, password)
 			.build();
 	}
 

src/main/java/ru/mystamps/web/support/spring/boot/ThymeleafViewResolverInitializingBean.java

@@ -26,6 +26,7 @@
 import org.springframework.context.EnvironmentAware;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
+import org.springframework.core.env.Profiles;
 import org.thymeleaf.spring5.view.ThymeleafViewResolver;
 import ru.mystamps.web.feature.account.AccountUrl;
 import ru.mystamps.web.feature.category.CategoryUrl;
@@ -72,7 +73,8 @@ public void afterPropertiesSet() throws Exception {
 			return;
 		}
 
-		boolean productionEnv = environment.acceptsProfiles("prod");
+		Profiles prod = Profiles.of("prod");
+		boolean productionEnv = environment.acceptsProfiles(prod);
 		boolean useCdn = environment.getProperty("app.use-cdn", Boolean.class, Boolean.TRUE);
 		viewResolver.setStaticVariables(resourcesAsMap(productionEnv, useCdn));
 	}

src/main/java/ru/mystamps/web/support/spring/security/SecurityConfig.java

@@ -28,6 +28,7 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.core.Ordered;
 import org.springframework.core.env.Environment;
+import org.springframework.core.env.Profiles;
 import org.springframework.http.HttpMethod;
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
@@ -85,11 +86,12 @@ public void configure(WebSecurity web) throws Exception {
 	@Override
 	@SuppressWarnings({ "PMD.SignatureDeclareThrowsException", "checkstyle:linelength" })
 	protected void configure(HttpSecurity http) throws Exception {
-		boolean useSingleHost = !environment.acceptsProfiles("prod");
+		Profiles prod = Profiles.of("prod");
+		boolean useSingleHost = !environment.acceptsProfiles(prod);
 		boolean useCdn = environment.getProperty("app.use-cdn", Boolean.class, Boolean.TRUE);
 
 		// @todo #226 Introduce app.use-public-hostname property
-		boolean usePublicHostname = environment.acceptsProfiles("prod");
+		boolean usePublicHostname = environment.acceptsProfiles(prod);
 		String hostname = usePublicHostname ? SiteUrl.PUBLIC_URL : SiteUrl.SITE;
 
 		String h2ConsolePath = h2ConsoleProperties == null ? null : h2ConsoleProperties.getPath();
@@ -160,6 +162,7 @@ protected void configure(HttpSecurity http) throws Exception {
 				.disable()
 			.headers()
 				.defaultsDisabled() // FIXME
+				// @todo #1161 Add Feature-Policy header
 				.addHeaderWriter(cspWriter);
 	}
 

src/main/resources/application-postgres.properties

@@ -41,7 +41,7 @@ app.use-cdn: false
 # @todo #1054 Extract list of exclusions to a common profile
 #
 # Full list of autoconfiguration classes:
-# https://docs.spring.io/spring-boot/docs/2.0.x/reference/html/auto-configuration-classes.html
+# https://docs.spring.io/spring-boot/docs/2.1.x/reference/html/auto-configuration-classes.html
 # The difference between test profile is that we don't need H2ConsoleAutoConfiguration
 spring.autoconfigure.exclude: \
 	  org.springframework.boot.autoconfigure.jms.activemq.ActiveMQAutoConfiguration \

src/main/resources/application-test.properties

@@ -47,7 +47,7 @@ logging.level.org.springframework.web.servlet.mvc.method.annotation.RequestMappi
 app.use-cdn: false
 
 # Full list of autoconfiguration classes:
-# https://docs.spring.io/spring-boot/docs/2.0.x/reference/html/auto-configuration-classes.html
+# https://docs.spring.io/spring-boot/docs/2.1.x/reference/html/auto-configuration-classes.html
 spring.autoconfigure.exclude: \
 	  org.springframework.boot.autoconfigure.jms.activemq.ActiveMQAutoConfiguration \
 	, org.springframework.boot.autoconfigure.aop.AopAutoConfiguration \

src/main/resources/application-travis.properties

@@ -37,7 +37,7 @@ app.preview.dir: /tmp/preview
 app.use-cdn: false
 
 # Full list of autoconfiguration classes:
-# https://docs.spring.io/spring-boot/docs/2.0.x/reference/html/auto-configuration-classes.html
+# https://docs.spring.io/spring-boot/docs/2.1.x/reference/html/auto-configuration-classes.html
 # The difference between test profile is that we don't need H2ConsoleAutoConfiguration
 spring.autoconfigure.exclude: \
 	  org.springframework.boot.autoconfigure.jms.activemq.ActiveMQAutoConfiguration \

src/main/resources/application.properties

@@ -8,6 +8,9 @@ trace: false
 
 spring.main.banner-mode: off
 
+# Required for overriding RequestContextFilter (see SecurityConfig.getOrderedRequestContextFilter())
+spring.main.allow-bean-definition-overriding: true
+
 # In favour of our own mappings, see ru.mystamps.web.config.MvcConfig.addResourceHandlers()
 spring.resources.add-mappings: false
 
@@ -16,11 +19,11 @@ spring.mvc.favicon.enabled: false
 spring.cache.type: none
 
 # See for details:
-# https://docs.spring.io/autorepo/docs/spring-boot/2.0.x/api/org/springframework/boot/autoconfigure/web/servlet/MultipartProperties.html
+# https://docs.spring.io/spring-boot/docs/2.1.x/api/org/springframework/boot/autoconfigure/web/servlet/MultipartProperties.html
 spring.servlet.multipart.location: /tmp
-spring.servlet.multipart.max-request-size: 10Mb
-spring.servlet.multipart.max-file-size: 5Mb
-spring.servlet.multipart.file-size-threshold: 1Mb
+spring.servlet.multipart.max-request-size: 10MB
+spring.servlet.multipart.max-file-size: 5MB
+spring.servlet.multipart.file-size-threshold: 1MB
 
 spring.jackson.default-property-inclusion: NON_NULL
 
@@ -36,7 +39,7 @@ server.compression.enabled: true
 server.compression.min-response-size: 512
 
 # See for details:
-# https://docs.spring.io/spring-boot/docs/2.0.x/reference/html/boot-features-logging.html#boot-features-custom-log-configuration
+# https://docs.spring.io/spring-boot/docs/2.1.x/reference/html/boot-features-logging.html#boot-features-custom-log-configuration
 # https://logback.qos.ch/manual/layouts.html
 logging.pattern.level: [user:%-2X{userId}] %5p
 

src/test/resources/logback-test.xml

@@ -3,8 +3,8 @@
 
 	<!--
 		See for details:
-		https://docs.spring.io/spring-boot/docs/2.0.x/reference/html/howto-logging.html#howto-configure-logback-for-logging
-		https://github.com/spring-projects/spring-boot/blob/v2.0.9.RELEASE/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/base.xml
+		https://docs.spring.io/spring-boot/docs/2.1.x/reference/html/howto-logging.html#howto-configure-logback-for-logging
+		https://github.com/spring-projects/spring-boot/blob/v2.1.18.RELEASE/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/base.xml
 	-->
 
 	<!--