Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-07 15:46:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-4638 Upgrades TestNG and Surefire plugin

Browse Source
This commit is contained in:
Lukasz Lenart
2016-07-18 08:01:08 +02:00
parent 70fdc00f66 7f28bfd2d2
commit abf7bfa343
4 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java
+1 -1
View File
@@ -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();
plugins/embeddedjsp/pom.xml
+1 -1
View File
@@ -98,7 +98,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.4.2</version>
<version>2.19.1</version>
<configuration>
<additionalClasspathElements>
<element>target/test-classes/jsps.jar</element>
plugins/testng/pom.xml
+1 -2
View File
@@ -37,8 +37,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>5.1</version>
<classifier>jdk15</classifier>
<version>6.9.10</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
pom.xml
+1 -1
View File
@@ -189,7 +189,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.3.1</version>
<version>2.19.1</version>
<configuration>
<argLine>-Duser.language=en -Duser.region=US</argLine>
<includes>