Merge branch '2.1.x'

Closes gh-17335
Closes gh-17292
This commit is contained in:
Andy Wilkinson
2019-06-27 11:46:52 +01:00
11 changed files with 74 additions and 60 deletions

View File

@@ -24,7 +24,7 @@
</property>
</activation>
<properties>
<spring-javaformat.version>0.0.12</spring-javaformat.version>
<spring-javaformat.version>0.0.14</spring-javaformat.version>
<nohttp-checkstyle.version>0.0.1.RELEASE</nohttp-checkstyle.version>
</properties>
<build>
@@ -37,7 +37,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>8.18</version>
<version>8.22</version>
</dependency>
<dependency>
<groupId>io.spring.javaformat</groupId>