Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WW-4638 - TestNG 6.9.10 dependency error #98

Merged
merged 14 commits into from
Jul 18, 2016
Merged

WW-4638 - TestNG 6.9.10 dependency error #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
bbc3862
WW-4638
victorsosa May 25, 2016
03a90b2
Update controlheader.ftl
victorsosa May 25, 2016
4138b2a
Update styles.css
victorsosa May 25, 2016
2a071cc
Update controlheader.ftl
victorsosa May 25, 2016
b59f17f
maven-surefire-plugin update version
victorsosa Jun 7, 2016
a4fc8ae
update maven-surefire-plugin
victorsosa Jun 7, 2016
7c30825
change maven-surefire-plugin update version
victorsosa Jun 24, 2016
0cd7b83
Merge branch 'master' of https://github.com/apache/struts into WW-4638
victorsosa Jun 24, 2016
abdb0a3
rollback change
victorsosa Jun 24, 2016
e170ae1
Merge branch 'master' into WW-4638
victorsosa Jun 24, 2016
ad5cc58
change version surefire-plugin
victorsosa Jun 24, 2016
59b0e40
merge
victorsosa Jun 27, 2016
90ab489
update maven-surefire-plugin 2.19.1
victorsosa Jul 15, 2016
7f28bfd
Merge remote-tracking branch 'origin/master' into WW-4638
victorsosa Jul 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public void testTwoWait() throws Exception {
String result2 = proxy2.execute();
assertEquals("wait", result2);

Thread.sleep(300);
Thread.sleep(500);

ActionProxy proxy3 = buildProxy("action1");
String result3 = proxy3.execute();
Expand Down
2 changes: 1 addition & 1 deletion plugins/embeddedjsp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions plugins/testng/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,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>
Expand Down