Merge branch '2.1.x' into 2.2.x

Closes gh-19799

Author: wilkinsona

pom.xml

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