Merge branch '2.1.x'

Closes gh-17223

Author: wilkinsona

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>