Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id AED09200B51 for ; Mon, 18 Jul 2016 08:01:33 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id ADAAA160A7C; Mon, 18 Jul 2016 06:01:33 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 005F6160A86 for ; Mon, 18 Jul 2016 08:01:32 +0200 (CEST) Received: (qmail 5779 invoked by uid 500); 18 Jul 2016 06:01:31 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 3243 invoked by uid 99); 18 Jul 2016 06:01:29 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Jul 2016 06:01:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7A8C0E0B40; Mon, 18 Jul 2016 06:01:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lukaszlenart@apache.org To: commits@struts.apache.org Date: Mon, 18 Jul 2016 06:01:33 -0000 Message-Id: <7dbb539dfded4ed7a2f2d8bc2aecaa20@git.apache.org> In-Reply-To: <9b2447b8a4524a2eb00dfb698b817d4b@git.apache.org> References: <9b2447b8a4524a2eb00dfb698b817d4b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [05/15] struts git commit: maven-surefire-plugin update version archived-at: Mon, 18 Jul 2016 06:01:33 -0000 maven-surefire-plugin update version Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b59f17f4 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b59f17f4 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b59f17f4 Branch: refs/heads/master Commit: b59f17f467a5fa8870f8ce085419a1bfa31b1a28 Parents: 2a071cc Author: victorsosa Authored: Tue Jun 7 08:42:07 2016 -0400 Committer: victorsosa Committed: Tue Jun 7 08:42:07 2016 -0400 ---------------------------------------------------------------------- .gitignore | 3 +++ core/pom.xml | 2 +- .../apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java | 2 +- pom.xml | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/b59f17f4/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 0285aab..8faa618 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,9 @@ .metadata/ Servers/ +#VSCODE +.vscode + # OSX .DS_Store http://git-wip-us.apache.org/repos/asf/struts/blob/b59f17f4/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 9ce0fcd..e577c51 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 http://git-wip-us.apache.org/repos/asf/struts/blob/b59f17f4/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java ---------------------------------------------------------------------- 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 5a01015..1be045f 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(); http://git-wip-us.apache.org/repos/asf/struts/blob/b59f17f4/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 323cf9e..31b322c 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