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

2018-11-16 20:34:44 +08:00 · 2018-11-16 20:34:44 +08:00 · b99833cb50
commit b99833cb50
parent c7100e25f8 7b38731f54
1 changed files with 2 additions and 1 deletions
--- a/pom.xml
+++ b/pom.xml
@ -305,10 +305,11 @@
            </plugin>
            <plugin>
                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.21.0</version>
+                <version>2.20</version>
                <configuration>
                    <forkCount>1</forkCount>
                    <reuseForks>true</reuseForks>
+                    <testFailureIgnore>true</testFailureIgnore>
                </configuration>
            </plugin>
            <plugin>