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

This commit is contained in:
wing328
2017-06-26 23:39:04 +08:00
60 changed files with 182 additions and 179 deletions

View File

@@ -213,10 +213,10 @@
</dependency>
</dependencies>
<properties>
<swagger-core-version>1.5.12</swagger-core-version>
<swagger-core-version>1.5.15</swagger-core-version>
<retrofit-version>1.9.0</retrofit-version>
<okhttp-version>2.7.5</okhttp-version>
<jodatime-version>2.9.3</jodatime-version>
<okhttp-version>2.8.9</okhttp-version>
<jodatime-version>2.9.9</jodatime-version>
<oltu-version>1.0.1</oltu-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>