From bbc38622193da5e06cda5497937786f628e584de Mon Sep 17 00:00:00 2001 From: victorsosa Date: Wed, 25 May 2016 10:42:14 -0400 Subject: [PATCH 01/10] WW-4638 TestNG 6.9.10 dependency error Fix dependency issue --- plugins/testng/pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml index 709e402eb..741d38de9 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 From 03a90b2308fa6e2c17ce81eaf7d0d9f16adfd64d Mon Sep 17 00:00:00 2001 From: victor sosa Date: Wed, 25 May 2016 10:48:46 -0400 Subject: [PATCH 02/10] Update controlheader.ftl --- core/src/main/resources/template/xhtml/controlheader.ftl | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/src/main/resources/template/xhtml/controlheader.ftl b/core/src/main/resources/template/xhtml/controlheader.ftl index 8b855b821..fb3960e25 100644 --- a/core/src/main/resources/template/xhtml/controlheader.ftl +++ b/core/src/main/resources/template/xhtml/controlheader.ftl @@ -22,7 +22,4 @@ --> <#include "/${parameters.templateDir}/${parameters.expandTheme}/controlheader-core.ftl" /> - class="tdAlign-${parameters.align?html}" - ><#t/> From 4138b2a6f021c8de750ec52cfe7b01fabc8abc6c Mon Sep 17 00:00:00 2001 From: victor sosa Date: Wed, 25 May 2016 10:49:11 -0400 Subject: [PATCH 03/10] Update styles.css --- core/src/main/resources/template/xhtml/styles.css | 5 ----- 1 file changed, 5 deletions(-) diff --git a/core/src/main/resources/template/xhtml/styles.css b/core/src/main/resources/template/xhtml/styles.css index fe205179e..91d5171ee 100644 --- a/core/src/main/resources/template/xhtml/styles.css +++ b/core/src/main/resources/template/xhtml/styles.css @@ -35,8 +35,3 @@ .tdCheckboxErrorMessage {text-align:left; vertical-align:top;} .tdErrorMessage {text-align:center; vertical-align:top;} .formButton {text-align:right;} - -.tdAlign-center{text-align:center;} -.tdAlign-right{text-align:right;} -.tdAlign-left{text-align:left;} -.tdAlign-justify{text-align:justify;} From 2a071cc3aacbde7f2d61516e1f23877401169829 Mon Sep 17 00:00:00 2001 From: victor sosa Date: Wed, 25 May 2016 10:49:56 -0400 Subject: [PATCH 04/10] Update controlheader.ftl --- core/src/main/resources/template/xhtml/controlheader.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/template/xhtml/controlheader.ftl b/core/src/main/resources/template/xhtml/controlheader.ftl index fb3960e25..e1209cd31 100644 --- a/core/src/main/resources/template/xhtml/controlheader.ftl +++ b/core/src/main/resources/template/xhtml/controlheader.ftl @@ -21,5 +21,5 @@ */ --> <#include "/${parameters.templateDir}/${parameters.expandTheme}/controlheader-core.ftl" /> - <#t/> From b59f17f467a5fa8870f8ce085419a1bfa31b1a28 Mon Sep 17 00:00:00 2001 From: victorsosa Date: Tue, 7 Jun 2016 08:42:07 -0400 Subject: [PATCH 05/10] maven-surefire-plugin update version --- .gitignore | 3 +++ core/pom.xml | 2 +- .../struts2/interceptor/ExecuteAndWaitInterceptorTest.java | 2 +- pom.xml | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0285aab24..8faa61895 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,9 @@ .metadata/ Servers/ +#VSCODE +.vscode + # OSX .DS_Store diff --git a/core/pom.xml b/core/pom.xml index 9ce0fcda1..e577c5100 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -50,7 +50,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.6 + 2.19.1 -Duser.language=en -Duser.region=US 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 5a01015bf..1be045f99 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java @@ -85,7 +85,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/pom.xml b/pom.xml index 323cf9e56..31b322c24 100644 --- a/pom.xml +++ b/pom.xml @@ -190,7 +190,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.3.1 + 2.19.1 -Duser.language=en -Duser.region=US From a4fc8ae42e482594837a03a11be02b5f30eaef2a Mon Sep 17 00:00:00 2001 From: victorsosa Date: Tue, 7 Jun 2016 09:25:39 -0400 Subject: [PATCH 06/10] update maven-surefire-plugin --- core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/pom.xml b/core/pom.xml index e577c5100..9ce0fcda1 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -50,7 +50,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19.1 + 2.6 -Duser.language=en -Duser.region=US From 7c308253ce87d947466d71bacd7a7d8d5acdbd96 Mon Sep 17 00:00:00 2001 From: victorsosa Date: Fri, 24 Jun 2016 09:35:05 -0400 Subject: [PATCH 07/10] change maven-surefire-plugin update version --- plugins/embeddedjsp/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml index e6d994257..d90d9af04 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 From abdb0a33515c0ea50a4a56f02d5bcc302feca703 Mon Sep 17 00:00:00 2001 From: victorsosa Date: Fri, 24 Jun 2016 09:48:51 -0400 Subject: [PATCH 08/10] rollback change --- core/src/main/resources/template/xhtml/styles.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/src/main/resources/template/xhtml/styles.css b/core/src/main/resources/template/xhtml/styles.css index 16631fe95..4cc1d35e0 100644 --- a/core/src/main/resources/template/xhtml/styles.css +++ b/core/src/main/resources/template/xhtml/styles.css @@ -36,3 +36,9 @@ .tdErrorMessage {text-align:center; vertical-align:top;} .formButton {text-align:right;} .tdInput {text-align:left;} + + +.align-center{text-align:center;} +.align-right{text-align:right;} +.align-left{text-align:left;} +.align-justify{text-align:justify;} From ad5cc586804ef08ed9de6985662dee020723d960 Mon Sep 17 00:00:00 2001 From: victorsosa Date: Fri, 24 Jun 2016 10:51:01 -0400 Subject: [PATCH 09/10] change version surefire-plugin --- plugins/embeddedjsp/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml index 68bc35aca..d52daccd3 100644 --- a/plugins/embeddedjsp/pom.xml +++ b/plugins/embeddedjsp/pom.xml @@ -98,7 +98,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19.1 + 2.4.2 target/test-classes/jsps.jar From 90ab489c409ba2f27fff9dabefd1b79f6ac1dbac Mon Sep 17 00:00:00 2001 From: victorsosa Date: Fri, 15 Jul 2016 08:19:12 -0400 Subject: [PATCH 10/10] update maven-surefire-plugin 2.19.1 --- plugins/embeddedjsp/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml index d52daccd3..68bc35aca 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