Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
nkorange 2018-11-16 20:34:44 +08:00
commit b99833cb50

View File

@ -305,10 +305,11 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.21.0</version> <version>2.20</version>
<configuration> <configuration>
<forkCount>1</forkCount> <forkCount>1</forkCount>
<reuseForks>true</reuseForks> <reuseForks>true</reuseForks>
<testFailureIgnore>true</testFailureIgnore>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>