Merge branch '2.1.x' into 2.2.x

Closes gh-19287
This commit is contained in:
Phillip Webb
2019-12-04 20:46:40 -08:00

View File

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