pom.xml: update Spring Boot to 1.4.1.RELEASE.

@see https://spring.io/blog/2016/02/26/spring-boot-1-3-3-and-1-4-0-m1-available-now
@see https://spring.io/blog/2016/04/13/spring-boot-1-4-0-m2-available-now
@see https://spring.io/blog/2016/05/17/spring-boot-1-4-0-m3-available-now
@see https://spring.io/blog/2016/07/05/spring-boot-1-4-0-rc1-available-now
@see https://spring.io/blog/2016/07/28/spring-boot-1-4-released
@see https://spring.io/blog/2016/09/21/spring-boot-1-4-1-and-1-3-8-available-now
@see https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-1.4-Release-Notes
@see https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-1.4-Configuration-Changelog

This also updates:

* Spring Framework to 4.3.3.RELEASE
  - https://spring.io/blog/2016/04/06/spring-framework-4-3-goes-rc1
  - https://spring.io/blog/2016/05/06/spring-framework-4-3-rc2-4-2-6-and-3-2-17-available-now
  - https://spring.io/blog/2016/06/10/spring-framework-4-3-goes-ga
  - https://spring.io/blog/2016/07/04/spring-framework-4-3-1-and-4-2-7-available-now
  - https://spring.io/blog/2016/09/19/spring-framework-4-3-3-and-4-2-8-available-now

* Spring Security to 4.1.3.RELEASE
  - https://spring.io/blog/2016/03/24/spring-security-4-1-0-rc1-released
  - https://spring.io/blog/2016/04/21/spring-security-4-1-0-rc2-released
  - https://spring.io/blog/2016/05/05/spring-security-4-1-0-released
  - https://spring.io/blog/2016/07/07/spring-security-4-1-1-released
  - https://spring.io/blog/2016/08/12/spring-security-4-1-2-released
  - https://spring.io/blog/2016/08/24/spring-security-4-1-3-released

No functional changes.

Author: php-coder

pom.xml

@@ -40,7 +40,7 @@
 			<version>${slf4j.version}</version>
 		</dependency>
 
-		<!-- https://github.com/spring-projects/spring-boot/blob/v1.3.7.RELEASE/spring-boot-starters/spring-boot-starter/pom.xml -->
+		<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-starters/spring-boot-starter/pom.xml -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
@@ -52,7 +52,7 @@
 			</exclusions>
 		</dependency>
 
-		<!-- https://github.com/spring-projects/spring-boot/blob/v1.3.7.RELEASE/spring-boot-starters/spring-boot-starter-jdbc/pom.xml -->
+		<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-starters/spring-boot-starter-jdbc/pom.xml -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-jdbc</artifactId>
@@ -64,7 +64,7 @@
 			</exclusions>
 		</dependency>
 
-		<!-- https://github.com/spring-projects/spring-boot/blob/v1.3.7.RELEASE/spring-boot-starters/spring-boot-starter-jetty/pom.xml -->
+		<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-starters/spring-boot-starter-jetty/pom.xml -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-jetty</artifactId>
@@ -80,25 +80,25 @@
 			</exclusions>
 		</dependency>
 
-		<!-- https://github.com/spring-projects/spring-boot/blob/v1.3.7.RELEASE/spring-boot-starters/spring-boot-starter-logging/pom.xml -->
+		<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/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/v1.3.7.RELEASE/spring-boot-starters/spring-boot-starter-mail/pom.xml -->
+		<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-starters/spring-boot-starter-mail/pom.xml -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-mail</artifactId>
 		</dependency>
 
-		<!-- https://github.com/spring-projects/spring-boot/blob/v1.3.7.RELEASE/spring-boot-starters/spring-boot-starter-security/pom.xml -->
+		<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/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/v1.3.7.RELEASE/spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml -->
+		<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-thymeleaf</artifactId>
@@ -110,13 +110,13 @@
 			</exclusions>
 		</dependency>
 
-		<!-- https://github.com/spring-projects/spring-boot/blob/v1.3.7.RELEASE/spring-boot-starters/spring-boot-starter-validation/pom.xml -->
+		<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-starters/spring-boot-starter-validation/pom.xml -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-validation</artifactId>
 		</dependency>
 
-		<!-- https://github.com/spring-projects/spring-boot/blob/v1.3.7.RELEASE/spring-boot-starters/spring-boot-starter-web/pom.xml -->
+		<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-starters/spring-boot-starter-web/pom.xml -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
@@ -308,6 +308,16 @@
 			<scope>test</scope>
 		</dependency>
 
+		<!--
+			For ConfigFileApplicationContextInitializer class.
+			https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-test/pom.xml
+		-->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		
 		<dependency>
 			<groupId>org.subethamail</groupId>
 			<artifactId>subethasmtp</artifactId>
@@ -332,10 +342,10 @@
 	</dependencies>
 
 	<parent>
-		<!-- https://github.com/spring-projects/spring-boot/blob/v1.3.7.RELEASE/spring-boot-starters/spring-boot-starter-parent/pom.xml -->
+		<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-starters/spring-boot-starter-parent/pom.xml -->
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.3.7.RELEASE</version>
+		<version>1.4.1.RELEASE</version>
 	</parent>
 
 	<properties>
@@ -346,10 +356,10 @@
 		<checkstyle.plugin.version>2.17</checkstyle.plugin.version>
 		<clean.plugin.version>3.0.0</clean.plugin.version>
 
-		<!-- Redefine default value from spring-boot-dependencies (https://git.io/vKAiK) -->
+		<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-dependencies/pom.xml) -->
 		<commons-dbcp.version>1.4</commons-dbcp.version>
 
-		<!-- Redefine default value from spring-boot-dependencies (https://git.io/vKAiK) -->
+		<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-dependencies/pom.xml) -->
 		<commons-pool.version>1.5.4</commons-pool.version>
 
 		<commons.lang.version>3.4</commons.lang.version>
@@ -361,43 +371,43 @@
 		<gmaven.plugin.version>1.4</gmaven.plugin.version>
 		<gmaven.runtime.plugin.version>1.5</gmaven.runtime.plugin.version>
 
-		<!-- Redefine default value from spring-boot-dependencies (https://git.io/vKAiK) -->
+		<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-dependencies/pom.xml) -->
 		<groovy.version>2.0.8</groovy.version>
 
-		<!-- Redefine default value from spring-boot-dependencies (https://git.io/vKAiK) -->
+		<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-dependencies/pom.xml) -->
 		<h2.version>1.4.192</h2.version>
 
-		<!-- Redefine default value from spring-boot-dependencies (https://git.io/vKAiK) -->
+		<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-dependencies/pom.xml) -->
 		<hibernate-validator.version>5.2.4.Final</hibernate-validator.version>
 
 		<jacoco.plugin.version>0.7.7.201606060606</jacoco.plugin.version>
 		<jasmine.plugin.version>2.2</jasmine.plugin.version>
 
-		<!-- Redefine default value from spring-boot-starter-parent (https://git.io/vKAiy) -->
+		<!-- Redefine default value from spring-boot-starter-parent (https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-starters/spring-boot-starter-parent/pom.xml) -->
 		<java.version>1.8</java.version>
 
 		<javadoc.plugin.version>2.10.4</javadoc.plugin.version>
 
-		<!-- Redefine default value from spring-boot-dependencies (https://git.io/vKAiK) -->
+		<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-dependencies/pom.xml) -->
 		<javax-mail.version>1.5.4</javax-mail.version>
 
 		<javax.validation.version>1.1.0.Final</javax.validation.version>
 
-		<!-- Redefine default value from spring-boot-dependencies (https://git.io/vKAiK) -->
+		<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-dependencies/pom.xml) -->
 		<jetty.version>9.2.18.v20160721</jetty.version>
 
 		<!-- Don't forget to update version in the Url class -->
 		<jquery.version>1.9.1</jquery.version>
 
 		<license.plugin.version>1.9.0</license.plugin.version>
 
-		<!-- Redefine default value from spring-boot-dependencies (https://git.io/vKAiK) -->
+		<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-dependencies/pom.xml) -->
 		<liquibase.version>3.5.1</liquibase.version>
 
 		<lombok.version>1.16.10</lombok.version>
 		<minify.plugin.version>1.7.4</minify.plugin.version>
 
-		<!-- Redefine default value from spring-boot-dependencies (https://git.io/vKAiK) -->
+		<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-dependencies/pom.xml) -->
 		<mysql.version>5.1.39</mysql.version>
 
 		<native2ascii.plugin.version>1.0-beta-1</native2ascii.plugin.version>
@@ -410,32 +420,32 @@
 		<selenium.htmlunit.version>2.21</selenium.htmlunit.version>
 		<selenium.version>2.53.1</selenium.version>
 
-		<!-- Redefine default value from spring-boot-dependencies (https://git.io/vKAiK) -->
+		<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-dependencies/pom.xml) -->
 		<servlet-api.version>3.1.0</servlet-api.version>
 
 		<skipUnitTests>false</skipUnitTests>
 
-		<!-- Redefine default value from spring-boot-dependencies (https://git.io/vKAiK) -->
+		<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-dependencies/pom.xml) -->
 		<slf4j.version>1.7.21</slf4j.version>
 
 		<sortpom.plugin.version>2.5.0</sortpom.plugin.version>
 
-		<!-- Redefine default value from spring-boot-dependencies (https://git.io/vKAiK) -->
+		<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-dependencies/pom.xml) -->
 		<spock.version>1.0-groovy-2.0</spock.version>
 
-		<!-- Define default value for spring-boot-starter-parent (https://git.io/vKAiy) -->
+		<!-- Define default value for spring-boot-starter-parent (https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-starters/spring-boot-starter-parent/pom.xml) -->
 		<start-class>ru.mystamps.web.support.spring.boot.ApplicationBootstrap</start-class>
 
 		<subethasmtp.version>3.1.7</subethasmtp.version>
 		<surefire.plugin.version>2.19.1</surefire.plugin.version>
 		<testng.version>6.8.8</testng.version>
 
-		<!-- Redefine default value from spring-boot-dependencies (https://git.io/vKAiK) -->
+		<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-dependencies/pom.xml) -->
 		<thymeleaf-extras-springsecurity4.version>2.1.2.RELEASE</thymeleaf-extras-springsecurity4.version>
 
 		<thymeleaf.togglz.version>1.1.0.RELEASE</thymeleaf.togglz.version>
 
-		<!-- Redefine default value from spring-boot-dependencies (https://git.io/vKAiK) -->
+		<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-dependencies/pom.xml) -->
 		<thymeleaf.version>2.1.5.RELEASE</thymeleaf.version>
 
 		<togglz.version>2.3.0.Final</togglz.version>

src/main/java/ru/mystamps/web/service/FilesystemImagePersistenceStrategy.java

@@ -99,7 +99,8 @@ protected Path createFile(ImageInfoDto image) {
 	// protected to allow spying
 	protected void writeToFile(MultipartFile file, Path dest) throws IOException {
 		// we can't use file.transferTo(dest) there because it creates file
-		// relatively to directory from multipart.location in application.properties
+		// relatively to directory from spring.http.multipart.location
+		// in application.properties
 		// See for details: https://jira.spring.io/browse/SPR-12650
 		Files.copy(file.getInputStream(), dest);
 	}

src/main/resources/application-travis.properties

@@ -5,8 +5,8 @@ spring.datasource.username: travis
 spring.datasource.password:
 spring.datasource.driver-class-name: com.mysql.jdbc.Driver
 spring.datasource.initialize: false
-spring.datasource.validation-query: SELECT 1
-spring.datasource.test-on-borrow: true
+spring.datasource.dbcp.validation-query: SELECT 1
+spring.datasource.dbcp.test-on-borrow: true
 
 spring.mail.host: 127.0.0.1
 spring.mail.port: 1025

src/main/resources/application.properties

@@ -12,11 +12,11 @@ spring.mvc.favicon.enabled: false
 
 spring.cache.type: none
 
-# See for details: http://docs.spring.io/autorepo/docs/spring-boot/current/api/org/springframework/boot/autoconfigure/web/MultipartProperties.html
-multipart.location: /tmp
-multipart.max-request-size: 10Mb
-multipart.max-file-size: 5Mb
-multipart.file-size-threshold: 1Mb
+# See for details: http://docs.spring.io/autorepo/docs/spring-boot/1.4.1.RELEASE/api/org/springframework/boot/autoconfigure/web/MultipartProperties.html
+spring.http.multipart.location: /tmp
+spring.http.multipart.max-request-size: 10Mb
+spring.http.multipart.max-file-size: 5Mb
+spring.http.multipart.file-size-threshold: 1Mb
 
 server.session.cookie.http-only: true
 

src/test/resources/logback-test.xml

@@ -3,7 +3,7 @@
 
 	<!--
 		See for details:
-		http://docs.spring.io/spring-boot/docs/1.3.7.RELEASE/reference/html/howto-logging.html#howto-configure-logback-for-logging
+		http://docs.spring.io/spring-boot/docs/1.4.x/reference/html/howto-logging.html#howto-configure-logback-for-logging
 	-->
 	<include resource="org/springframework/boot/logging/logback/base.xml"/>
 

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

@@ -5,8 +5,8 @@ spring.datasource.username: mystamps
 spring.datasource.password: {{ user_db_password }}
 spring.datasource.driver-class-name: com.mysql.jdbc.Driver
 spring.datasource.initialize: false
-spring.datasource.validation-query: SELECT 1
-spring.datasource.test-on-borrow: true
+spring.datasource.dbcp.validation-query: SELECT 1
+spring.datasource.dbcp.test-on-borrow: true
 
 spring.mail.host: smtp.mailgun.org
 spring.mail.port: 25