diff --git a/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java index 8bebf05b4..0c2854c71 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java @@ -86,7 +86,7 @@ public class ExecuteAndWaitInterceptorTest extends StrutsInternalTestCase { String result2 = proxy2.execute(); assertEquals("wait", result2); - Thread.sleep(300); + Thread.sleep(500); ActionProxy proxy3 = buildProxy("action1"); String result3 = proxy3.execute(); diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml index 23d512cc8..bc5ea7c37 100644 --- a/plugins/embeddedjsp/pom.xml +++ b/plugins/embeddedjsp/pom.xml @@ -98,7 +98,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.4.2 + 2.19.1 target/test-classes/jsps.jar diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml index eb7e7c306..6826c775e 100644 --- a/plugins/testng/pom.xml +++ b/plugins/testng/pom.xml @@ -37,8 +37,7 @@ org.testng testng - 5.1 - jdk15 + 6.9.10 org.springframework diff --git a/pom.xml b/pom.xml index dbaaa662a..f20487164 100644 --- a/pom.xml +++ b/pom.xml @@ -189,7 +189,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.3.1 + 2.19.1 -Duser.language=en -Duser.region=US