Skip to content

Commit f2b4ed0

Browse files
php-coderphp-coder
committed
pom.xml: update Spring Boot to 1.4.6.RELEASE
This also updates Spring Framework to 4.3.8.RELEASE Changelog: - https://spring.io/blog/2017/04/20/spring-boot-1-4-6-available-now - https://spring.io/blog/2017/04/18/spring-framework-4-3-8-released No functional changes.
1 parent 5077ea9 commit f2b4ed0

File tree

4 files changed

+34
-32
lines changed

4 files changed

+34
-32
lines changed

‎pom.xml‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<version>${slf4j.version}</version>
4141
</dependency>
4242

43-
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-starters/spring-boot-starter/pom.xml -->
43+
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.6.RELEASE/spring-boot-starters/spring-boot-starter/pom.xml -->
4444
<dependency>
4545
<groupId>org.springframework.boot</groupId>
4646
<artifactId>spring-boot-starter</artifactId>
@@ -52,7 +52,7 @@
5252
</exclusions>
5353
</dependency>
5454

55-
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-starters/spring-boot-starter-jdbc/pom.xml -->
55+
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.6.RELEASE/spring-boot-starters/spring-boot-starter-jdbc/pom.xml -->
5656
<dependency>
5757
<groupId>org.springframework.boot</groupId>
5858
<artifactId>spring-boot-starter-jdbc</artifactId>
@@ -64,7 +64,7 @@
6464
</exclusions>
6565
</dependency>
6666

67-
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-starters/spring-boot-starter-jetty/pom.xml -->
67+
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.6.RELEASE/spring-boot-starters/spring-boot-starter-jetty/pom.xml -->
6868
<dependency>
6969
<groupId>org.springframework.boot</groupId>
7070
<artifactId>spring-boot-starter-jetty</artifactId>
@@ -84,25 +84,25 @@
8484
</exclusions>
8585
</dependency>
8686

87-
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-starters/spring-boot-starter-logging/pom.xml -->
87+
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.6.RELEASE/spring-boot-starters/spring-boot-starter-logging/pom.xml -->
8888
<dependency>
8989
<groupId>org.springframework.boot</groupId>
9090
<artifactId>spring-boot-starter-logging</artifactId>
9191
</dependency>
9292

93-
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-starters/spring-boot-starter-mail/pom.xml -->
93+
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.6.RELEASE/spring-boot-starters/spring-boot-starter-mail/pom.xml -->
9494
<dependency>
9595
<groupId>org.springframework.boot</groupId>
9696
<artifactId>spring-boot-starter-mail</artifactId>
9797
</dependency>
9898

99-
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-starters/spring-boot-starter-security/pom.xml -->
99+
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.6.RELEASE/spring-boot-starters/spring-boot-starter-security/pom.xml -->
100100
<dependency>
101101
<groupId>org.springframework.boot</groupId>
102102
<artifactId>spring-boot-starter-security</artifactId>
103103
</dependency>
104104

105-
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml -->
105+
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.6.RELEASE/spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml -->
106106
<dependency>
107107
<groupId>org.springframework.boot</groupId>
108108
<artifactId>spring-boot-starter-thymeleaf</artifactId>
@@ -114,7 +114,7 @@
114114
</exclusions>
115115
</dependency>
116116

117-
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-starters/spring-boot-starter-web/pom.xml -->
117+
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.6.RELEASE/spring-boot-starters/spring-boot-starter-web/pom.xml -->
118118
<dependency>
119119
<groupId>org.springframework.boot</groupId>
120120
<artifactId>spring-boot-starter-web</artifactId>
@@ -374,7 +374,7 @@
374374

375375
<!--
376376
For ConfigFileApplicationContextInitializer class.
377-
https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-test/pom.xml
377+
https://github.com/spring-projects/spring-boot/blob/v1.4.6.RELEASE/spring-boot-test/pom.xml
378378
-->
379379
<dependency>
380380
<groupId>org.springframework.boot</groupId>
@@ -406,10 +406,10 @@
406406
</dependencies>
407407

408408
<parent>
409-
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-starters/spring-boot-starter-parent/pom.xml -->
409+
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.6.RELEASE/spring-boot-starters/spring-boot-starter-parent/pom.xml -->
410410
<groupId>org.springframework.boot</groupId>
411411
<artifactId>spring-boot-starter-parent</artifactId>
412-
<version>1.4.5.RELEASE</version>
412+
<version>1.4.6.RELEASE</version>
413413
</parent>
414414

415415
<properties>
@@ -425,10 +425,10 @@
425425
<codenarc.plugin.version>0.22-1</codenarc.plugin.version>
426426
<codenarc.version>0.25.2</codenarc.version>
427427

428-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
428+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.6.RELEASE/spring-boot-dependencies/pom.xml) -->
429429
<commons-dbcp.version>1.4</commons-dbcp.version>
430430

431-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
431+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.6.RELEASE/spring-boot-dependencies/pom.xml) -->
432432
<commons-pool.version>1.5.4</commons-pool.version>
433433

434434
<commons.lang.version>3.4</commons.lang.version>
@@ -445,48 +445,48 @@
445445
<findbugs.plugin.version>3.0.4</findbugs.plugin.version>
446446
<gmavenplus.plugin.version>1.5</gmavenplus.plugin.version>
447447

448-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
448+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.6.RELEASE/spring-boot-dependencies/pom.xml) -->
449449
<groovy.version>2.0.8</groovy.version>
450450

451-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
451+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.6.RELEASE/spring-boot-dependencies/pom.xml) -->
452452
<h2.version>1.4.194</h2.version>
453453

454-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
454+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.6.RELEASE/spring-boot-dependencies/pom.xml) -->
455455
<hibernate-validator.version>5.2.4.Final</hibernate-validator.version>
456456

457-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
457+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.6.RELEASE/spring-boot-dependencies/pom.xml) -->
458458
<htmlunit.version>2.21</htmlunit.version>
459459

460460
<jacoco.plugin.version>0.7.9</jacoco.plugin.version>
461461
<jasmine.plugin.version>2.2</jasmine.plugin.version>
462462

463-
<!-- Redefine default value from spring-boot-starter-parent (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-starters/spring-boot-starter-parent/pom.xml) -->
463+
<!-- Redefine default value from spring-boot-starter-parent (https://github.com/spring-projects/spring-boot/blob/v1.4.6.RELEASE/spring-boot-starters/spring-boot-starter-parent/pom.xml) -->
464464
<java.version>1.8</java.version>
465465

466466
<javadoc.plugin.version>2.10.4</javadoc.plugin.version>
467467

468-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
468+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.6.RELEASE/spring-boot-dependencies/pom.xml) -->
469469
<javax-mail.version>1.5.4</javax-mail.version>
470470

471471
<javax.validation.version>1.1.0.Final</javax.validation.version>
472472

473-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
473+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.6.RELEASE/spring-boot-dependencies/pom.xml) -->
474474
<jetty.version>9.2.18.v20160721</jetty.version>
475475

476476
<!-- Don't forget to update version in the Url class -->
477477
<jquery.version>1.9.1</jquery.version>
478478

479479
<license.plugin.version>3.0</license.plugin.version>
480480

481-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
481+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.6.RELEASE/spring-boot-dependencies/pom.xml) -->
482482
<liquibase.version>3.5.3</liquibase.version>
483483

484-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
484+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.6.RELEASE/spring-boot-dependencies/pom.xml) -->
485485
<lombok.version>1.16.16</lombok.version>
486486

487487
<minify.plugin.version>1.7.6</minify.plugin.version>
488488

489-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
489+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.6.RELEASE/spring-boot-dependencies/pom.xml) -->
490490
<mysql.version>5.1.41</mysql.version>
491491

492492
<native2ascii.plugin.version>1.0-beta-1</native2ascii.plugin.version>
@@ -502,35 +502,35 @@
502502
<!-- Don't forget to update version in the Url class -->
503503
<selectizejs.version>0.12.3</selectizejs.version>
504504

505-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
505+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.6.RELEASE/spring-boot-dependencies/pom.xml) -->
506506
<selenium.version>2.53.1</selenium.version>
507507

508-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
508+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.6.RELEASE/spring-boot-dependencies/pom.xml) -->
509509
<servlet-api.version>3.1.0</servlet-api.version>
510510

511511
<skipUnitTests>false</skipUnitTests>
512512

513-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
513+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.6.RELEASE/spring-boot-dependencies/pom.xml) -->
514514
<slf4j.version>1.7.25</slf4j.version>
515515

516516
<sortpom.plugin.version>2.5.0</sortpom.plugin.version>
517517

518-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
518+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.6.RELEASE/spring-boot-dependencies/pom.xml) -->
519519
<spock.version>1.0-groovy-2.0</spock.version>
520520

521-
<!-- Define default value for spring-boot-starter-parent (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-starters/spring-boot-starter-parent/pom.xml) -->
521+
<!-- Define default value for spring-boot-starter-parent (https://github.com/spring-projects/spring-boot/blob/v1.4.6.RELEASE/spring-boot-starters/spring-boot-starter-parent/pom.xml) -->
522522
<start-class>ru.mystamps.web.support.spring.boot.ApplicationBootstrap</start-class>
523523

524524
<subethasmtp.version>3.1.7</subethasmtp.version>
525525
<surefire.plugin.version>2.19.1</surefire.plugin.version>
526526
<testng.version>6.8.8</testng.version>
527527

528-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
528+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.6.RELEASE/spring-boot-dependencies/pom.xml) -->
529529
<thymeleaf-extras-springsecurity4.version>3.0.2.RELEASE</thymeleaf-extras-springsecurity4.version>
530530

531531
<thymeleaf.togglz.version>2.0.0.RELEASE</thymeleaf.togglz.version>
532532

533-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
533+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.6.RELEASE/spring-boot-dependencies/pom.xml) -->
534534
<thymeleaf.version>3.0.3.RELEASE</thymeleaf.version>
535535

536536
<togglz.version>2.3.0.Final</togglz.version>

‎src/main/java/ru/mystamps/web/support/spring/security/SessionLocaleResolverAwareFilter.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
6363
HttpServletRequest req = (HttpServletRequest)request;
6464
LOG.debug("Handling request {} {}", req.getMethod(), req.getRequestURI());
6565

66+
// NB: This won't work if the name of session attribute is
67+
// modified with SessionLocaleResolver.setLocaleAttributeName() method.
6668
Locale locale = (Locale)WebUtils.getSessionAttribute(
6769
req,
6870
SessionLocaleResolver.LOCALE_SESSION_ATTRIBUTE_NAME

‎src/main/resources/application.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spring.mvc.favicon.enabled: false
1515

1616
spring.cache.type: none
1717

18-
# See for details: http://docs.spring.io/autorepo/docs/spring-boot/1.4.5.RELEASE/api/org/springframework/boot/autoconfigure/web/MultipartProperties.html
18+
# See for details: http://docs.spring.io/autorepo/docs/spring-boot/1.4.6.RELEASE/api/org/springframework/boot/autoconfigure/web/MultipartProperties.html
1919
spring.http.multipart.location: /tmp
2020
spring.http.multipart.max-request-size: 10Mb
2121
spring.http.multipart.max-file-size: 5Mb

‎src/test/resources/logback-test.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<!--
55
See for details:
66
http://docs.spring.io/spring-boot/docs/1.4.x/reference/html/howto-logging.html#howto-configure-logback-for-logging
7-
https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot/src/main/resources/org/springframework/boot/logging/logback/base.xml
7+
https://github.com/spring-projects/spring-boot/blob/v1.4.6.RELEASE/spring-boot/src/main/resources/org/springframework/boot/logging/logback/base.xml
88
-->
99

1010
<!--

0 commit comments

Comments
 (0)