Merge branch '2.1.x' into 2.2.x

Closes gh-21447

Author: philwebb

ci/images/releasescripts/pom.xml

@@ -16,7 +16,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-javaformat.version>0.0.15</spring-javaformat.version>
+		<spring-javaformat.version>0.0.22</spring-javaformat.version>
 	</properties>
 
 	<dependencies>

pom.xml

@@ -24,7 +24,7 @@
 				</property>
 			</activation>
 			<properties>
-				<spring-javaformat.version>0.0.20</spring-javaformat.version>
+				<spring-javaformat.version>0.0.22</spring-javaformat.version>
 				<nohttp-checkstyle.version>0.0.4.RELEASE</nohttp-checkstyle.version>
 			</properties>
 			<build>