Merge branch '2.0.x' into 2.1.x

This commit is contained in:
Andy Wilkinson
2019-03-20 16:53:48 +00:00
4570 changed files with 4573 additions and 4573 deletions

View File

@@ -24,7 +24,7 @@
</property>
</activation>
<properties>
<spring-javaformat.version>0.0.6</spring-javaformat.version>
<spring-javaformat.version>0.0.7</spring-javaformat.version>
</properties>
<build>
<plugins>
@@ -36,7 +36,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>8.12</version>
<version>8.18</version>
</dependency>
<dependency>
<groupId>io.spring.javaformat</groupId>