From commits-return-18524-archive-asf-public=cust-asf.ponee.io@struts.apache.org Sun Nov 3 09:02:21 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id F2098180621 for ; Sun, 3 Nov 2019 10:02:20 +0100 (CET) Received: (qmail 25209 invoked by uid 500); 3 Nov 2019 09:02:19 -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 25189 invoked by uid 99); 3 Nov 2019 09:02:19 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 Nov 2019 09:02:19 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 516A9805F6; Sun, 3 Nov 2019 09:02:19 +0000 (UTC) Date: Sun, 03 Nov 2019 09:02:20 +0000 To: "commits@struts.apache.org" Subject: [struts-archetypes] 01/01: Merge pull request #1 from apache/use-2-5-20 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: yasserzamani@apache.org In-Reply-To: <157277173921.1725.9526634127124685987@gitbox.apache.org> References: <157277173921.1725.9526634127124685987@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: struts-archetypes X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: b9cc14f27fba1ff52e2f1504d2b4bfe801822328 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20191103090219.516A9805F6@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. yasserzamani pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git commit b9cc14f27fba1ff52e2f1504d2b4bfe801822328 Merge: fcf359c c0f4c77 Author: Yasser Zamani AuthorDate: Sun Nov 3 12:32:09 2019 +0330 Merge pull request #1 from apache/use-2-5-20 Use Struts 2.5.20 .gitignore | 4 +- .mvn/wrapper/MavenWrapperDownloader.java | 117 ++++++++ .mvn/wrapper/maven-wrapper.properties | 2 + mvnw | 310 +++++++++++++++++++++ mvnw.cmd | 182 ++++++++++++ pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 10 +- .../src/main/resources/archetype-resources/pom.xml | 10 +- .../src/main/resources/archetype-resources/pom.xml | 14 +- 10 files changed, 622 insertions(+), 31 deletions(-)