Merge branch 'master' into develop

This commit is contained in:
Binary Wang
2018-12-23 16:16:29 +08:00
6 changed files with 44 additions and 37 deletions

View File

@@ -114,7 +114,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<httpclient.version>4.5</httpclient.version>
<jetty.version>9.3.0.RC0</jetty.version>
<jetty.version>9.3.24.v20180605</jetty.version>
</properties>
<dependencyManagement>