1
0
mirror of synced 2026-02-17 02:37:50 +08:00

Merge branch 'master' into develop

# Conflicts:
#	.travis.yml
This commit is contained in:
Binary Wang
2019-07-29 10:26:30 +08:00
5 changed files with 54 additions and 35 deletions

View File

@@ -173,7 +173,7 @@
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.10</version>
<version>1.4.11</version>
</dependency>
<!-- 由于guava较新的21.0版本需要jdk8故而此处采用较低版本 -->
<dependency>