Merge branch '1.5.x' into 2.0.x

2018-06-20 13:56:55 +01:00
parent e730382718 e7b03f7ca3
commit e2d6280d83
4 changed files with 35 additions and 2 deletions
--- a/spring-boot-project/spring-boot-parent/pom.xml
+++ b/spring-boot-project/spring-boot-parent/pom.xml
@@ -54,6 +54,11 @@
 				<artifactId>log4j</artifactId>
 				<version>1.2.17</version>
 			</dependency>
+			<dependency>
+				<groupId>commons-fileupload</groupId>
+				<artifactId>commons-fileupload</artifactId>
+				<version>1.3.3</version>
+			</dependency>
 			<dependency>
 				<groupId>com.nhaarman</groupId>
 				<artifactId>mockito-kotlin</artifactId>