Merge remote-tracking branch 'origin/master' into 2.3.0

This commit is contained in:
wing328
2017-06-11 21:43:34 +08:00
59 changed files with 478 additions and 346 deletions

View File

@@ -203,6 +203,7 @@
<version>${jodatime-version}</version>
</dependency>
<!-- test dependencies -->
<dependency>
<groupId>junit</groupId>