Return-Path: X-Original-To: apmail-struts-commits-archive@minotaur.apache.org Delivered-To: apmail-struts-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9004C1123C for ; Thu, 15 May 2014 02:01:54 +0000 (UTC) Received: (qmail 67708 invoked by uid 500); 14 May 2014 06:27:17 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 66972 invoked by uid 500); 14 May 2014 06:27:15 -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 66361 invoked by uid 99); 14 May 2014 06:27:13 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 May 2014 06:27:13 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7A9998B946C; Wed, 14 May 2014 06:27:13 +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: Wed, 14 May 2014 06:27:42 -0000 Message-Id: <831d75bba1c643e8af32f2a79bee6dfc@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [31/50] [abbrv] git commit: Merge branch 'hotfix/2.3.16.3' Merge branch 'hotfix/2.3.16.3' Conflicts: apps/rest-showcase/pom.xml archetypes/struts2-archetype-angularjs/pom.xml archetypes/struts2-archetype-blank/pom.xml archetypes/struts2-archetype-convention/pom.xml archetypes/struts2-archetype-dbportlet/pom.xml archetypes/struts2-archetype-plugin/pom.xml archetypes/struts2-archetype-portlet/pom.xml archetypes/struts2-archetype-starter/pom.xml assembly/src/main/assembly/docs.xml Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/38a3f8bf Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/38a3f8bf Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/38a3f8bf Branch: refs/heads/feature/http-interceptor Commit: 38a3f8bfb6b226db3adb44a8fc4ad0850feee54f Parents: c9fd44f bcffc25 Author: Lukasz Lenart Authored: Thu May 8 21:55:35 2014 +0200 Committer: Lukasz Lenart Committed: Thu May 8 21:55:35 2014 +0200 ---------------------------------------------------------------------- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml | 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml | 2 +- apps/portlet/pom.xml | 2 +- apps/rest-showcase/pom.xml | 4 +- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 3 +- archetypes/struts2-archetype-blank/pom.xml | 3 +- archetypes/struts2-archetype-convention/pom.xml | 3 +- archetypes/struts2-archetype-dbportlet/pom.xml | 3 +- archetypes/struts2-archetype-plugin/pom.xml | 3 +- archetypes/struts2-archetype-portlet/pom.xml | 3 +- archetypes/struts2-archetype-starter/pom.xml | 3 +- assembly/pom.xml | 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml | 2 +- bundles/pom.xml | 2 +- core/pom.xml | 2 +- .../struts2/interceptor/CookieInterceptor.java | 45 +++++++++++------ .../interceptor/CookieInterceptorTest.java | 53 ++++++++++++++++++++ plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml | 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml | 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml | 2 +- plugins/oval/pom.xml | 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml | 4 +- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml | 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 2 +- xwork-core/pom.xml | 2 +- 53 files changed, 142 insertions(+), 69 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/38a3f8bf/apps/blank/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/38a3f8bf/apps/jboss-blank/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/38a3f8bf/apps/mailreader/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/38a3f8bf/apps/pom.xml ---------------------------------------------------------------------- diff --cc apps/pom.xml index ac06753,d0a24d0..5860c18 --- a/apps/pom.xml +++ b/apps/pom.xml @@@ -26,11 -26,12 +26,11 @@@ org.apache.struts struts2-parent - 2.3.16.2 + 2.3.16.4-SNAPSHOT - org.apache.struts struts2-apps pom - Webapps + Struts 2 Webapps blank jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/38a3f8bf/apps/portlet/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/38a3f8bf/apps/rest-showcase/pom.xml ---------------------------------------------------------------------- diff --cc apps/rest-showcase/pom.xml index 270f5e6,fe2d3be..feb3290 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@@ -31,8 -31,8 +31,8 @@@ struts2-rest-showcase war - 2.3.16.2 + 2.3.16.4-SNAPSHOT - Struts 2 Rest Showcase Example + Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example http://git-wip-us.apache.org/repos/asf/struts/blob/38a3f8bf/apps/showcase/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/38a3f8bf/archetypes/pom.xml ---------------------------------------------------------------------- diff --cc archetypes/pom.xml index 5ea2556,c7ca432..ac90bcb --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@@ -26,9 -26,9 +26,9 @@@ org.apache.struts struts2-parent - 2.3.16.2 + 2.3.16.4-SNAPSHOT - org.apache.struts + struts2-archetypes pom Struts 2 Maven Archetypes http://git-wip-us.apache.org/repos/asf/struts/blob/38a3f8bf/pom.xml ----------------------------------------------------------------------