Merge branch '2.1.x'

Closes gh-17223
2019-06-17 16:08:42 +01:00 · 2019-06-17 16:08:42 +01:00 · f07f030ba9
parent da897d691d fe9db792ee
commit f07f030ba9
1 changed files with 5 additions and 0 deletions
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@ -819,6 +819,11 @@
 				<artifactId>okhttp-urlconnection</artifactId>
 				<version>${okhttp3.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>com.sun.activation</groupId>
+				<artifactId>jakarta.activation</artifactId>
+				<version>${jakarta-activation.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>com.sun.mail</groupId>
 				<artifactId>jakarta.mail</artifactId>