Skip to content

Commit 66b3ed1

Browse files
committed
build: update Spring Boot to 2.2.13
This also updates Spring Framework to 5.2.22 and Spring Security to 5.2.15 Notes: - Spring Security 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/2019/03/08/spring-boot-2-2-m1 - https://spring.io/blog/2019/04/16/spring-boot-2-2-m2 - https://spring.io/blog/2019/05/15/spring-boot-2-2-m3-available-now - https://spring.io/blog/2019/06/19/spring-boot-2-2-0-m4 - https://spring.io/blog/2019/08/06/spring-boot-2-2-0-m5-available-now - https://spring.io/blog/2019/09/10/spring-boot-2-2-0-m6 - https://spring.io/blog/2019/10/03/spring-boot-2-2-0-rc1-has-been-released - https://spring.io/blog/2019/10/16/spring-boot-2-2-0 - https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.2-Release-Notes - https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.2.0-Configuration-Changelog - https://spring.io/blog/2019/11/07/spring-boot-2-2-1-available-now - https://spring.io/blog/2019/12/06/spring-boot-2-2-2-is-now-available - https://spring.io/blog/2020/01/16/spring-boot-2-2-3-released - https://spring.io/blog/2020/01/20/spring-boot-2-2-4-released - https://spring.io/blog/2020/02/27/spring-boot-2-2-5-released - https://spring.io/blog/2020/03/26/spring-boot-2-2-6-available-now - https://spring.io/blog/2020/05/07/spring-boot-2-2-7-available-now - https://spring.io/blog/2020/06/11/spring-boot-2-2-8-available-now - https://spring.io/blog/2020/07/24/spring-boot-2-2-9-available-now - https://spring.io/blog/2020/09/17/spring-boot-2-2-10-available-now - https://spring.io/blog/2020/10/29/spring-boot-2-2-11-available-now - https://spring.io/blog/2020/12/10/spring-boot-2-2-12-available-now - https://spring.io/blog/2021/01/14/spring-boot-2-2-13-available-now * Spring Framework - https://spring.io/blog/2019/04/10/spring-framework-5-2-0-m1-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/05/spring-framework-5-2-goes-rc1 - https://spring.io/blog/2019/09/05/spring-framework-5-2-rc2-available-now - https://spring.io/blog/2019/09/30/spring-framework-5-2-goes-ga - https://github.com/spring-projects/spring-framework/wiki/What%27s-New-in-Spring-Framework-5.x#whats-new-in-version-52 - https://github.com/spring-projects/spring-framework/wiki/Upgrading-to-Spring-Framework-5.x#upgrading-to-version-52 - https://www.infoq.com/presentations/spring-framework-5-2/ - 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://tanzu.vmware.com/security/cve-2020-5398 - https://tanzu.vmware.com/security/cve-2020-5397 - https://spring.io/blog/2020/02/25/spring-framework-5-2-4-and-5-1-14-available-now - https://spring.io/blog/2020/03/24/spring-framework-5-2-5-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://tanzu.vmware.com/security/cve-2020-5421 - https://spring.io/blog/2020/10/27/spring-framework-5-2-10-and-5-1-19-available-now - https://spring.io/blog/2020/11/10/spring-framework-5-3-1-and-5-2-11-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 - https://spring.io/blog/2021/02/16/spring-framework-5-3-4-and-5-2-13-available-now - https://spring.io/blog/2021/04/13/spring-framework-5-3-6-and-5-2-14-available-now - https://spring.io/blog/2021/05/11/spring-framework-5-3-7-and-5-2-15-available-now - https://tanzu.vmware.com/security/cve-2021-22118 - https://spring.io/blog/2021/07/14/spring-framework-5-3-9-and-5-2-16-available-now - https://spring.io/blog/2021/09/15/spring-framework-5-3-10-and-5-2-17-available-now - https://spring.io/blog/2021/10/14/spring-framework-5-3-11-and-5-2-18-available-now - https://tanzu.vmware.com/security/cve-2021-22096 - https://spring.io/blog/2021/12/16/spring-framework-5-3-14-and-5-2-19-available-now - https://spring.io/blog/2022/01/05/spring-framework-cve-2021-22060-has-been-published - https://tanzu.vmware.com/security/cve-2021-22060 - https://tanzu.vmware.com/security/cve-2021-22096 - https://spring.io/blog/2022/03/28/cve-report-published-for-spring-framework - https://spring.io/blog/2022/03/31/spring-framework-rce-early-announcement - https://spring.io/blog/2022/04/01/spring-framework-rce-mitigation-alternative - https://tanzu.vmware.com/security/cve-2022-22950 - https://spring.io/blog/2022/04/13/spring-framework-5-3-19-and-5-2-21-available-now - https://spring.io/blog/2022/04/13/spring-framework-data-binding-rules-vulnerability-cve-2022-22968 - https://spring.io/blog/2022/05/11/spring-framework-5-3-20-and-5-2-22-available-now - https://tanzu.vmware.com/security/cve-2022-22970 - https://tanzu.vmware.com/security/cve-2022-22971 * Spring Security - https://github.com/spring-projects/spring-security/releases/tag/5.2.0.M1 - https://spring.io/blog/2019/04/16/spring-security-5-2-0-m2-released - https://spring.io/blog/2019/06/17/spring-security-5-2-0-m3-released - https://spring.io/blog/2019/08/05/spring-security-5-2-0-m4-released - https://spring.io/blog/2019/09/06/spring-security-5-2-0-rc1-released - https://spring.io/blog/2019/10/01/spring-security-5-2-goes-ga - https://docs.spring.io/spring-security/site/docs/5.2.0.RELEASE/reference/htmlsingle/#new - 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://tanzu.vmware.com/security/cve-2020-5407 - https://tanzu.vmware.com/security/cve-2020-5408 - 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 - https://spring.io/blog/2020/12/03/spring-security-5-4-2-5-3-6-and-5-2-8-released - https://spring.io/blog/2021/02/11/spring-security-5-4-4-5-3-8-and-5-2-9-released - https://spring.io/blog/2021/04/12/spring-security-5-2-10-5-3-9-and-5-4-6-released - https://spring.io/blog/2021/06/22/spring-security-5-5-1-5-4-7-5-3-10-and-5-2-11-released - https://spring.io/blog/2021/06/28/cve-report-published-for-spring-security - https://tanzu.vmware.com/security/cve-2021-22119 - https://github.com/spring-projects/spring-security/releases/tag/5.2.12.RELEASE - https://github.com/spring-projects/spring-security/releases/tag/5.2.13.RELEASE - https://github.com/spring-projects/spring-security/releases/tag/5.2.14.RELEASE - https://spring.io/blog/2021/12/20/spring-security-5-2-15-5-3-13-5-4-10-5-5-4-and-5-6-1-released Fix #1149
1 parent 4842d11 commit 66b3ed1

File tree

10 files changed

+39
-45
lines changed

10 files changed

+39
-45
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ mailgun.password: {{ mailgun_api_password }}
2626
spring.liquibase.contexts: scheme, init-data, prod-data
2727
spring.liquibase.change-log: classpath:/liquibase/changelog.xml
2828

29-
logging.file: /data/logs/mystamps.log
29+
logging.file.name: /data/logs/mystamps.log
3030
logging.level.root: INFO
3131
logging.level.ru.mystamps: DEBUG
3232
logging.level.ru.mystamps.web.feature.account.UsersActivationServiceImpl: INFO
@@ -43,7 +43,7 @@ app.use-cdn: true
4343
server.servlet.session.cookie.secure: true
4444

4545
# Full list of autoconfiguration classes:
46-
# https://docs.spring.io/spring-boot/docs/2.1.x/reference/html/auto-configuration-classes.html
46+
# https://docs.spring.io/spring-boot/docs/2.2.x/reference/html/appendix-auto-configuration-classes.html
4747
# The difference between test profile is that we don't need
4848
# SpringApplicationAdminJmxAutoConfiguration and H2ConsoleAutoConfiguration
4949
spring.autoconfigure.exclude: \

Diff for: pom.xml

+24-29
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<version>${slf4j.version}</version>
8080
</dependency>
8181

82-
<!-- https://github.com/spring-projects/spring-boot/blob/v2.1.18.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter/pom.xml -->
82+
<!-- https://github.com/spring-projects/spring-boot/blob/v2.2.13.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter/pom.xml -->
8383
<dependency>
8484
<groupId>org.springframework.boot</groupId>
8585
<artifactId>spring-boot-starter</artifactId>
@@ -91,13 +91,13 @@
9191
</exclusions>
9292
</dependency>
9393

94-
<!-- https://github.com/spring-projects/spring-boot/blob/v2.1.18.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-jdbc/pom.xml -->
94+
<!-- https://github.com/spring-projects/spring-boot/blob/v2.2.13.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-jdbc/pom.xml -->
9595
<dependency>
9696
<groupId>org.springframework.boot</groupId>
9797
<artifactId>spring-boot-starter-jdbc</artifactId>
9898
</dependency>
9999

100-
<!-- https://github.com/spring-projects/spring-boot/blob/v2.1.18.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/pom.xml -->
100+
<!-- https://github.com/spring-projects/spring-boot/blob/v2.2.13.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/pom.xml -->
101101
<dependency>
102102
<groupId>org.springframework.boot</groupId>
103103
<artifactId>spring-boot-starter-jetty</artifactId>
@@ -117,19 +117,19 @@
117117
</exclusions>
118118
</dependency>
119119

120-
<!-- https://github.com/spring-projects/spring-boot/blob/v2.1.18.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-logging/pom.xml -->
120+
<!-- https://github.com/spring-projects/spring-boot/blob/v2.2.13.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-logging/pom.xml -->
121121
<dependency>
122122
<groupId>org.springframework.boot</groupId>
123123
<artifactId>spring-boot-starter-logging</artifactId>
124124
</dependency>
125125

126-
<!-- https://github.com/spring-projects/spring-boot/blob/v2.1.18.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-security/pom.xml -->
126+
<!-- https://github.com/spring-projects/spring-boot/blob/v2.2.13.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-security/pom.xml -->
127127
<dependency>
128128
<groupId>org.springframework.boot</groupId>
129129
<artifactId>spring-boot-starter-security</artifactId>
130130
</dependency>
131131

132-
<!-- https://github.com/spring-projects/spring-boot/blob/v2.1.18.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml -->
132+
<!-- https://github.com/spring-projects/spring-boot/blob/v2.2.13.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml -->
133133
<dependency>
134134
<groupId>org.springframework.boot</groupId>
135135
<artifactId>spring-boot-starter-thymeleaf</artifactId>
@@ -141,7 +141,7 @@
141141
</exclusions>
142142
</dependency>
143143

144-
<!-- https://github.com/spring-projects/spring-boot/blob/v2.1.18.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-web/pom.xml -->
144+
<!-- https://github.com/spring-projects/spring-boot/blob/v2.2.13.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-web/pom.xml -->
145145
<dependency>
146146
<groupId>org.springframework.boot</groupId>
147147
<artifactId>spring-boot-starter-web</artifactId>
@@ -434,27 +434,14 @@
434434
<scope>test</scope>
435435
</dependency>
436436

437+
<!-- Other dependencies (junit-junit-engine and junit-vintage-engine) pull from spring-boot-starter-test -->
437438
<dependency>
438439
<groupId>org.junit.jupiter</groupId>
439440
<artifactId>junit-jupiter-api</artifactId>
440441
<version>${junit-jupiter.version}</version>
441442
<scope>test</scope>
442443
</dependency>
443444

444-
<dependency>
445-
<groupId>org.junit.jupiter</groupId>
446-
<artifactId>junit-jupiter-engine</artifactId>
447-
<version>${junit-jupiter.version}</version>
448-
<scope>test</scope>
449-
</dependency>
450-
451-
<dependency>
452-
<groupId>org.junit.vintage</groupId>
453-
<artifactId>junit-vintage-engine</artifactId>
454-
<version>${junit-jupiter.version}</version>
455-
<scope>test</scope>
456-
</dependency>
457-
458445
<dependency>
459446
<groupId>org.seleniumhq.selenium</groupId>
460447
<artifactId>htmlunit-driver</artifactId>
@@ -489,7 +476,7 @@
489476
<scope>test</scope>
490477
</dependency>
491478

492-
<!-- https://github.com/spring-projects/spring-boot/blob/v2.1.18.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-test/pom.xml -->
479+
<!-- https://github.com/spring-projects/spring-boot/blob/v2.2.13.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-test/pom.xml -->
493480
<dependency>
494481
<groupId>org.springframework.boot</groupId>
495482
<artifactId>spring-boot-starter-test</artifactId>
@@ -503,13 +490,17 @@
503490
<groupId>org.mockito</groupId>
504491
<artifactId>mockito-core</artifactId>
505492
</exclusion>
493+
<exclusion>
494+
<groupId>org.mockito</groupId>
495+
<artifactId>mockito-junit-jupiter</artifactId>
496+
</exclusion>
506497
<exclusion>
507498
<groupId>org.skyscreamer</groupId>
508499
<artifactId>jsonassert</artifactId>
509500
</exclusion>
510501
<exclusion>
511502
<groupId>org.hamcrest</groupId>
512-
<artifactId>hamcrest-library</artifactId>
503+
<artifactId>hamcrest</artifactId>
513504
</exclusion>
514505
<exclusion>
515506
<groupId>org.xmlunit</groupId>
@@ -534,16 +525,16 @@
534525

535526
</dependencies>
536527

537-
<!-- https://github.com/spring-projects/spring-boot/blob/v2.1.18.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml -->
528+
<!-- https://github.com/spring-projects/spring-boot/blob/v2.2.13.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml -->
538529
<parent>
539530
<groupId>org.springframework.boot</groupId>
540531
<artifactId>spring-boot-starter-parent</artifactId>
541-
<version>2.1.18.RELEASE</version>
532+
<version>2.2.13.RELEASE</version>
542533
</parent>
543534

544535
<!--
545536
All default versions from Spring Boot can be found there:
546-
https://github.com/spring-projects/spring-boot/blob/v2.1.18.RELEASE/spring-boot-project/spring-boot-dependencies/pom.xml
537+
https://github.com/spring-projects/spring-boot/blob/v2.2.13.RELEASE/spring-boot-project/spring-boot-dependencies/pom.xml
547538
-->
548539
<properties>
549540
<!--
@@ -605,7 +596,7 @@
605596

606597
<!--
607598
Redefine default value from spring-boot-starter-parent:
608-
https://github.com/spring-projects/spring-boot/blob/v2.1.18.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml
599+
https://github.com/spring-projects/spring-boot/blob/v2.2.13.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml
609600
-->
610601
<java.version>1.8</java.version>
611602

@@ -688,13 +679,17 @@
688679

689680
<!-- Redefine default value from spring-boot-dependencies in order to have the latest version -->
690681
<!-- LATER: remove overriding once version from Spring Boot will match the used one -->
691-
<spring-framework.version>5.1.20.RELEASE</spring-framework.version>
682+
<spring-framework.version>5.2.22.RELEASE</spring-framework.version>
683+
684+
<!-- Redefine default value from spring-boot-dependencies in order to have the latest version -->
685+
<!-- LATER: remove overriding once version from Spring Boot will match the used one -->
686+
<spring-security.version>5.2.15.RELEASE</spring-security.version>
692687

693688
<spring-test-context-cache-limiter.version>boot2-v1.2</spring-test-context-cache-limiter.version>
694689

695690
<!--
696691
Define default value for spring-boot-starter-parent:
697-
https://github.com/spring-projects/spring-boot/blob/v2.1.18.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml
692+
https://github.com/spring-projects/spring-boot/blob/v2.2.13.RELEASE/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml
698693
-->
699694
<start-class>ru.mystamps.web.support.spring.boot.ApplicationBootstrap</start-class>
700695

Diff for: src/main/java/ru/mystamps/web/config/MvcConfig.java

+4
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,10 @@ public void addInterceptors(InterceptorRegistry registry) {
176176
}
177177

178178
@Override
179+
// CheckStyle: ignore LineLength for next 2 lines
180+
// LATER: remove deprecation and usage of setUseSuffixPatternMatch() during upgrade to Spring Framework 5.3
181+
// See: https://docs.spring.io/spring-framework/docs/5.2.22.RELEASE/javadoc-api/org/springframework/web/servlet/config/annotation/PathMatchConfigurer.html#setUseSuffixPatternMatch-java.lang.Boolean-
182+
@SuppressWarnings("deprecation")
179183
public void configurePathMatch(PathMatchConfigurer configurer) {
180184
// If enabled a method mapped to "/users" also matches to "/users/"
181185
configurer.setUseTrailingSlashMatch(false);

Diff for: src/main/java/ru/mystamps/web/support/liquibase/LiquibaseSupport.java

-3
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,6 @@ public static SpringApplication createSpringApplication() {
5454
// See https://docs.liquibase.com/commands/config-ref/should-run-parameter.html
5555
System.setProperty("liquibase.shouldRun", "false");
5656

57-
// Explicitly disable JMX. It might be enabled when we run via maven
58-
System.setProperty("spring.jmx.enabled", "false");
59-
6057
// Override value (WARN) from application*.properties
6158
System.setProperty("logging.level.liquibase", "INFO");
6259

Diff for: src/main/java/ru/mystamps/web/support/mailgun/ApiMailgunEmailSendingStrategy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public void send(MailgunEmail email) {
120120

121121
HttpHeaders headers = new HttpHeaders();
122122
headers.set(HttpHeaders.CONTENT_TYPE, MediaType.MULTIPART_FORM_DATA_VALUE);
123-
headers.set(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_UTF8_VALUE);
123+
headers.set(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE);
124124

125125
HttpEntity<MultiValueMap<String, Object>> request = new HttpEntity<>(parts, headers);
126126

Diff for: src/main/resources/application-postgres.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ app.use-cdn: false
4141
# @todo #1054 Extract list of exclusions to a common profile
4242
#
4343
# Full list of autoconfiguration classes:
44-
# https://docs.spring.io/spring-boot/docs/2.1.x/reference/html/auto-configuration-classes.html
44+
# https://docs.spring.io/spring-boot/docs/2.2.x/reference/html/appendix-auto-configuration-classes.html
4545
# The difference between test profile is that we don't need H2ConsoleAutoConfiguration
4646
spring.autoconfigure.exclude: \
4747
org.springframework.boot.autoconfigure.jms.activemq.ActiveMQAutoConfiguration \

Diff for: src/main/resources/application-test.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ logging.level.org.springframework.web.servlet.mvc.method.annotation.RequestMappi
4747
app.use-cdn: false
4848

4949
# Full list of autoconfiguration classes:
50-
# https://docs.spring.io/spring-boot/docs/2.1.x/reference/html/auto-configuration-classes.html
50+
# https://docs.spring.io/spring-boot/docs/2.2.x/reference/html/appendix-auto-configuration-classes.html
5151
spring.autoconfigure.exclude: \
5252
org.springframework.boot.autoconfigure.jms.activemq.ActiveMQAutoConfiguration \
5353
, org.springframework.boot.autoconfigure.aop.AopAutoConfiguration \

Diff for: src/main/resources/application-travis.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ app.preview.dir: /tmp/preview
3737
app.use-cdn: false
3838

3939
# Full list of autoconfiguration classes:
40-
# https://docs.spring.io/spring-boot/docs/2.1.x/reference/html/auto-configuration-classes.html
40+
# https://docs.spring.io/spring-boot/docs/2.2.x/reference/html/appendix-auto-configuration-classes.html
4141
# The difference between test profile is that we don't need H2ConsoleAutoConfiguration
4242
spring.autoconfigure.exclude: \
4343
org.springframework.boot.autoconfigure.jms.activemq.ActiveMQAutoConfiguration \

Diff for: src/main/resources/application.properties

+3-5
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@ spring.main.allow-bean-definition-overriding: true
1818
# In favour of our own mappings, see ru.mystamps.web.config.MvcConfig.addResourceHandlers()
1919
spring.resources.add-mappings: false
2020

21-
spring.mvc.favicon.enabled: false
22-
2321
spring.cache.type: none
2422

2523
# See for details:
26-
# https://docs.spring.io/spring-boot/docs/2.1.x/api/org/springframework/boot/autoconfigure/web/servlet/MultipartProperties.html
24+
# https://docs.spring.io/spring-boot/docs/2.2.x/api/org/springframework/boot/autoconfigure/web/servlet/MultipartProperties.html
2725
spring.servlet.multipart.location: /tmp
2826
spring.servlet.multipart.max-request-size: 10MB
2927
spring.servlet.multipart.max-file-size: 5MB
@@ -37,13 +35,13 @@ server.jetty.max-http-post-size: 1024
3735

3836
server.servlet.session.cookie.http-only: true
3937

40-
server.use-forward-headers: true
38+
server.forward-headers-strategy: native
4139

4240
server.compression.enabled: true
4341
server.compression.min-response-size: 512
4442

4543
# See for details:
46-
# https://docs.spring.io/spring-boot/docs/2.1.x/reference/html/boot-features-logging.html#boot-features-custom-log-configuration
44+
# https://docs.spring.io/spring-boot/docs/2.2.x/reference/html/spring-boot-features.html#boot-features-custom-log-configuration
4745
# https://logback.qos.ch/manual/layouts.html
4846
logging.pattern.level: [user:%-2X{userId}] %5p
4947

Diff for: src/test/resources/logback-test.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
<!--
55
See for details:
6-
https://docs.spring.io/spring-boot/docs/2.1.x/reference/html/howto-logging.html#howto-configure-logback-for-logging
7-
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
6+
https://docs.spring.io/spring-boot/docs/2.2.x/reference/html/howto.html#howto-configure-logback-for-logging
7+
https://github.com/spring-projects/spring-boot/blob/v2.2.13.RELEASE/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/base.xml
88
-->
99

1010
<!--

0 commit comments

Comments
 (0)