struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [09/50] [abbrv] git commit: Merge branch 'hotfix/2.3.16.2'
Date Wed, 14 May 2014 06:27:20 GMT
Merge branch 'hotfix/2.3.16.2'

Conflicts:
	apps/blank/pom.xml
	apps/jboss-blank/pom.xml
	apps/mailreader/pom.xml
	apps/pom.xml
	apps/portlet/pom.xml
	apps/rest-showcase/pom.xml
	apps/showcase/pom.xml
	archetypes/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/pom.xml
	bundles/admin/pom.xml
	bundles/demo/pom.xml
	bundles/pom.xml
	core/pom.xml
	core/src/main/resources/struts-default.xml
	plugins/cdi/pom.xml
	plugins/codebehind/pom.xml
	plugins/config-browser/pom.xml
	plugins/convention/pom.xml
	plugins/dojo/pom.xml
	plugins/dwr/pom.xml
	plugins/embeddedjsp/pom.xml
	plugins/gxp/pom.xml
	plugins/jasperreports/pom.xml
	plugins/javatemplates/pom.xml
	plugins/jfreechart/pom.xml
	plugins/jsf/pom.xml
	plugins/json/pom.xml
	plugins/junit/pom.xml
	plugins/osgi/pom.xml
	plugins/oval/pom.xml
	plugins/pell-multipart/pom.xml
	plugins/plexus/pom.xml
	plugins/pom.xml
	plugins/portlet-tiles/pom.xml
	plugins/portlet/pom.xml
	plugins/rest/pom.xml
	plugins/sitegraph/pom.xml
	plugins/sitemesh/pom.xml
	plugins/spring/pom.xml
	plugins/struts1/pom.xml
	plugins/testng/pom.xml
	plugins/tiles/pom.xml
	plugins/tiles3/pom.xml
	pom.xml
	xwork-core/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/1be8ed61
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/1be8ed61
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/1be8ed61

Branch: refs/heads/feature/http-interceptor
Commit: 1be8ed61e499b58b3fb6a45253f47865f83f35fb
Parents: 6d55d01 fbd75a8
Author: Lukasz Lenart <lukaszlenart@apache.org>
Authored: Mon Apr 28 08:50:53 2014 +0200
Committer: Lukasz Lenart <lukaszlenart@apache.org>
Committed: Mon Apr 28 08:50:53 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  |  2 +-
 archetypes/struts2-archetype-blank/pom.xml      |  2 +-
 archetypes/struts2-archetype-convention/pom.xml |  2 +-
 archetypes/struts2-archetype-dbportlet/pom.xml  |  2 +-
 archetypes/struts2-archetype-plugin/pom.xml     |  2 +-
 archetypes/struts2-archetype-portlet/pom.xml    |  2 +-
 archetypes/struts2-archetype-starter/pom.xml    |  2 +-
 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  | 74 +++++++++++++++++++-
 core/src/main/resources/struts-default.xml      |  8 +--
 .../interceptor/CookieInterceptorTest.java      | 66 +++++++++++++++++
 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                                         |  5 +-
 src/site/resources/archetype-catalog.xml        | 12 ++--
 xwork-core/pom.xml                              |  2 +-
 .../opensymphony/xwork2/ExcludedPatterns.java   | 22 ++++++
 .../interceptor/ParametersInterceptor.java      | 19 +++--
 .../interceptor/ParametersInterceptorTest.java  | 64 +++++++++++++++++
 58 files changed, 302 insertions(+), 72 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/apps/blank/pom.xml
----------------------------------------------------------------------
diff --cc apps/blank/pom.xml
index 675de3f,81a88d5..190b21e
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-apps</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-blank</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/apps/jboss-blank/pom.xml
----------------------------------------------------------------------
diff --cc apps/jboss-blank/pom.xml
index 3335999,b77c977..e321ab8
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-apps</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-jboss-blank</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/apps/mailreader/pom.xml
----------------------------------------------------------------------
diff --cc apps/mailreader/pom.xml
index 7275fdf,bb7ae7c..6e4e5d5
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
      <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-apps</artifactId>
-       <version>2.3.18-SNAPSHOT</version>
 -      <version>2.3.16.3-SNAPSHOT</version>
++      <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-mailreader</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/apps/pom.xml
----------------------------------------------------------------------
diff --cc apps/pom.xml
index 94771b4,3444414..ac06753
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@@ -26,11 -26,12 +26,11 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-parent</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
 -    <groupId>org.apache.struts</groupId>
      <artifactId>struts2-apps</artifactId>
      <packaging>pom</packaging>
 -    <name>Webapps</name>
 +    <name>Struts 2 Webapps</name>
      <modules>
          <module>blank</module>
          <module>jboss-blank</module>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/apps/portlet/pom.xml
----------------------------------------------------------------------
diff --cc apps/portlet/pom.xml
index 3a87ebb,e105aab..86d4958
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-apps</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-portlet</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/apps/rest-showcase/pom.xml
----------------------------------------------------------------------
diff --cc apps/rest-showcase/pom.xml
index 4d9507e,55d5d5f..270f5e6
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@@ -26,13 -26,13 +26,13 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-apps</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-rest-showcase</artifactId>
      <packaging>war</packaging>
-     <version>2.3.18-SNAPSHOT</version>
 -    <version>2.3.16.3-SNAPSHOT</version>
 -    <name>Struts 2 Rest Showcase Example</name>
++    <version>2.3.16.2</version>
 +    <name>Struts 2 Rest Showcase Webapp</name>
      <description>Struts 2 Rest Showcase Example</description>
  
      <dependencies>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/apps/showcase/pom.xml
----------------------------------------------------------------------
diff --cc apps/showcase/pom.xml
index ef10007,9d52e4b..7e6d28d
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-apps</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-showcase</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/archetypes/pom.xml
----------------------------------------------------------------------
diff --cc archetypes/pom.xml
index cad40b9,fcf351b..5ea2556
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@@ -26,9 -26,9 +26,9 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-parent</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
 -    <groupId>org.apache.struts</groupId>
 +
      <artifactId>struts2-archetypes</artifactId>
      <packaging>pom</packaging>
      <name>Struts 2 Maven Archetypes</name>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/archetypes/struts2-archetype-angularjs/pom.xml
----------------------------------------------------------------------
diff --cc archetypes/struts2-archetype-angularjs/pom.xml
index 5d6d4ab,3f40657..4adf8b4
--- a/archetypes/struts2-archetype-angularjs/pom.xml
+++ b/archetypes/struts2-archetype-angularjs/pom.xml
@@@ -2,7 -2,7 +2,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-archetypes</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/archetypes/struts2-archetype-blank/pom.xml
----------------------------------------------------------------------
diff --cc archetypes/struts2-archetype-blank/pom.xml
index a9e0d1a,00a6f4b..27f9351
--- a/archetypes/struts2-archetype-blank/pom.xml
+++ b/archetypes/struts2-archetype-blank/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-archetypes</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/archetypes/struts2-archetype-convention/pom.xml
----------------------------------------------------------------------
diff --cc archetypes/struts2-archetype-convention/pom.xml
index da7e8cb,fca83b0..17a912c
--- a/archetypes/struts2-archetype-convention/pom.xml
+++ b/archetypes/struts2-archetype-convention/pom.xml
@@@ -2,7 -2,7 +2,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-archetypes</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/archetypes/struts2-archetype-dbportlet/pom.xml
----------------------------------------------------------------------
diff --cc archetypes/struts2-archetype-dbportlet/pom.xml
index bd17444,15a48ed..da8f1b8
--- a/archetypes/struts2-archetype-dbportlet/pom.xml
+++ b/archetypes/struts2-archetype-dbportlet/pom.xml
@@@ -2,7 -2,7 +2,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-archetypes</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/archetypes/struts2-archetype-plugin/pom.xml
----------------------------------------------------------------------
diff --cc archetypes/struts2-archetype-plugin/pom.xml
index 05ee3de,bdb702f..24f1a3d
--- a/archetypes/struts2-archetype-plugin/pom.xml
+++ b/archetypes/struts2-archetype-plugin/pom.xml
@@@ -2,7 -2,7 +2,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-archetypes</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/archetypes/struts2-archetype-portlet/pom.xml
----------------------------------------------------------------------
diff --cc archetypes/struts2-archetype-portlet/pom.xml
index 5525568,1bc6d9f..c8a6f64
--- a/archetypes/struts2-archetype-portlet/pom.xml
+++ b/archetypes/struts2-archetype-portlet/pom.xml
@@@ -2,7 -2,7 +2,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-archetypes</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/archetypes/struts2-archetype-starter/pom.xml
----------------------------------------------------------------------
diff --cc archetypes/struts2-archetype-starter/pom.xml
index c642510,935b471..1e533a8
--- a/archetypes/struts2-archetype-starter/pom.xml
+++ b/archetypes/struts2-archetype-starter/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-archetypes</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/assembly/pom.xml
----------------------------------------------------------------------
diff --cc assembly/pom.xml
index 6028a14,97aef43..56a551b
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-parent</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-assembly</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/bundles/admin/pom.xml
----------------------------------------------------------------------
diff --cc bundles/admin/pom.xml
index ddc8cdf,5ea89c4..e9fdc78
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-osgi-bundles</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-osgi-admin-bundle</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/bundles/demo/pom.xml
----------------------------------------------------------------------
diff --cc bundles/demo/pom.xml
index f0bd5ad,0f67c7d..a8613a3
--- a/bundles/demo/pom.xml
+++ b/bundles/demo/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-osgi-bundles</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-osgi-demo-bundle</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/bundles/pom.xml
----------------------------------------------------------------------
diff --cc bundles/pom.xml
index e40fe1c,f896c0c..b86c91f
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-parent</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-osgi-bundles</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/core/pom.xml
----------------------------------------------------------------------
diff --cc core/pom.xml
index d9527f2,6404358..02aee40
--- a/core/pom.xml
+++ b/core/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-parent</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
      <artifactId>struts2-core</artifactId>
      <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/core/src/main/resources/struts-default.xml
----------------------------------------------------------------------
diff --cc core/src/main/resources/struts-default.xml
index 87f1ff5,398dd43..6e85801
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@@ -257,10 -251,9 +257,10 @@@
                  <interceptor-ref name="alias"/>
                  <interceptor-ref name="i18n"/>
                  <interceptor-ref name="checkbox"/>
 +                <interceptor-ref name="datetime"/>
                  <interceptor-ref name="multiselect"/>
                  <interceptor-ref name="params">
-                     <param name="excludeParams">(.*\.|^)class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*</param>
+                     <param name="excludeParams">^action:.*,^method:.*</param>
                  </interceptor-ref>
                  <interceptor-ref name="servletConfig"/>
                  <interceptor-ref name="prepare"/>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/cdi/pom.xml
----------------------------------------------------------------------
diff --cc plugins/cdi/pom.xml
index 9c7c503,ba6bbf2..8cd0325
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@@ -25,7 -25,7 +25,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-plugins</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-cdi-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/codebehind/pom.xml
----------------------------------------------------------------------
diff --cc plugins/codebehind/pom.xml
index 9cfbbd6,78701b2..e978b79
--- a/plugins/codebehind/pom.xml
+++ b/plugins/codebehind/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-plugins</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-codebehind-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/config-browser/pom.xml
----------------------------------------------------------------------
diff --cc plugins/config-browser/pom.xml
index f0d9ce2,7a9016b..284f1c7
--- a/plugins/config-browser/pom.xml
+++ b/plugins/config-browser/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-plugins</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-config-browser-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/convention/pom.xml
----------------------------------------------------------------------
diff --cc plugins/convention/pom.xml
index 7b19112,54346ba..a55a797
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-plugins</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-convention-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/dojo/pom.xml
----------------------------------------------------------------------
diff --cc plugins/dojo/pom.xml
index 39d1638,f0f950d..29846ea
--- a/plugins/dojo/pom.xml
+++ b/plugins/dojo/pom.xml
@@@ -25,7 -25,7 +25,7 @@@
      <parent>
          <artifactId>struts2-plugins</artifactId>
          <groupId>org.apache.struts</groupId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/dwr/pom.xml
----------------------------------------------------------------------
diff --cc plugins/dwr/pom.xml
index 01ae734,76259d2..dba899b
--- a/plugins/dwr/pom.xml
+++ b/plugins/dwr/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-plugins</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-dwr-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/embeddedjsp/pom.xml
----------------------------------------------------------------------
diff --cc plugins/embeddedjsp/pom.xml
index 0445f79,19b85fc..51488be
--- a/plugins/embeddedjsp/pom.xml
+++ b/plugins/embeddedjsp/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-plugins</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-embeddedjsp-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/gxp/pom.xml
----------------------------------------------------------------------
diff --cc plugins/gxp/pom.xml
index d46ba4c,d984aca..5ef6f6b
--- a/plugins/gxp/pom.xml
+++ b/plugins/gxp/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-plugins</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-gxp-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/jasperreports/pom.xml
----------------------------------------------------------------------
diff --cc plugins/jasperreports/pom.xml
index 218ade5,45d22b2..3cf1c94
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-plugins</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-jasperreports-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/javatemplates/pom.xml
----------------------------------------------------------------------
diff --cc plugins/javatemplates/pom.xml
index fbe8776,6d3ff2d..e3a44c4
--- a/plugins/javatemplates/pom.xml
+++ b/plugins/javatemplates/pom.xml
@@@ -25,7 -25,7 +25,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-plugins</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-javatemplates-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/jfreechart/pom.xml
----------------------------------------------------------------------
diff --cc plugins/jfreechart/pom.xml
index d591c2d,bb888b9..849c815
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-plugins</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
     </parent>
  
      <artifactId>struts2-jfreechart-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/jsf/pom.xml
----------------------------------------------------------------------
diff --cc plugins/jsf/pom.xml
index 756635e,3f284ab..33d00ea
--- a/plugins/jsf/pom.xml
+++ b/plugins/jsf/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-plugins</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-jsf-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/json/pom.xml
----------------------------------------------------------------------
diff --cc plugins/json/pom.xml
index 7e99c65,f77b226..444d311
--- a/plugins/json/pom.xml
+++ b/plugins/json/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-plugins</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-json-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/junit/pom.xml
----------------------------------------------------------------------
diff --cc plugins/junit/pom.xml
index aaabc72,6d02695..2571fcb
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-plugins</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-junit-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/osgi/pom.xml
----------------------------------------------------------------------
diff --cc plugins/osgi/pom.xml
index 9c765dd,2762bfa..11e2c22
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-plugins</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-osgi-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/oval/pom.xml
----------------------------------------------------------------------
diff --cc plugins/oval/pom.xml
index b988bde,997b2a7..457383f
--- a/plugins/oval/pom.xml
+++ b/plugins/oval/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-plugins</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-oval-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/pell-multipart/pom.xml
----------------------------------------------------------------------
diff --cc plugins/pell-multipart/pom.xml
index c372a4b,307fc05..b2ab339
--- a/plugins/pell-multipart/pom.xml
+++ b/plugins/pell-multipart/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-plugins</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-pell-multipart-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/plexus/pom.xml
----------------------------------------------------------------------
diff --cc plugins/plexus/pom.xml
index d757334,79ce6af..8569137
--- a/plugins/plexus/pom.xml
+++ b/plugins/plexus/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-plugins</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-plexus-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/pom.xml
----------------------------------------------------------------------
diff --cc plugins/pom.xml
index c2fda24,0d764e6..d98fc9a
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-parent</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-plugins</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/portlet-tiles/pom.xml
----------------------------------------------------------------------
diff --cc plugins/portlet-tiles/pom.xml
index 0ce09ff,a937e7c..9d41d84
--- a/plugins/portlet-tiles/pom.xml
+++ b/plugins/portlet-tiles/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-plugins</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-portlet-tiles-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/portlet/pom.xml
----------------------------------------------------------------------
diff --cc plugins/portlet/pom.xml
index 7e7919d,4bea2e7..8134dad
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-plugins</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-portlet-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/rest/pom.xml
----------------------------------------------------------------------
diff --cc plugins/rest/pom.xml
index 66d566f,3c416a4..aec4075
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@@ -26,11 -26,11 +26,11 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-plugins</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-rest-plugin</artifactId>
-     <version>2.3.18-SNAPSHOT</version>
 -    <version>2.3.16.3-SNAPSHOT</version>
++    <version>2.3.16.2</version>
      <name>Struts 2 REST Plugin</name>
  
      <properties>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/sitegraph/pom.xml
----------------------------------------------------------------------
diff --cc plugins/sitegraph/pom.xml
index c1e6c1b,829f883..243b1d2
--- a/plugins/sitegraph/pom.xml
+++ b/plugins/sitegraph/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-plugins</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-sitegraph-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/sitemesh/pom.xml
----------------------------------------------------------------------
diff --cc plugins/sitemesh/pom.xml
index 6d20390,717c2bf..3c7b1b8
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-plugins</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-sitemesh-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/spring/pom.xml
----------------------------------------------------------------------
diff --cc plugins/spring/pom.xml
index cb0d6a1,c5bf45b..6bcf252
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-plugins</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-spring-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/struts1/pom.xml
----------------------------------------------------------------------
diff --cc plugins/struts1/pom.xml
index 4ae4a23,fbbd4f1..fb84799
--- a/plugins/struts1/pom.xml
+++ b/plugins/struts1/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-plugins</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-struts1-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/testng/pom.xml
----------------------------------------------------------------------
diff --cc plugins/testng/pom.xml
index b813949,6879f54..eec0caf
--- a/plugins/testng/pom.xml
+++ b/plugins/testng/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-plugins</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-testng-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/tiles/pom.xml
----------------------------------------------------------------------
diff --cc plugins/tiles/pom.xml
index a7a188d,f3fa2b6..47b3980
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-plugins</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-tiles-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/tiles3/pom.xml
----------------------------------------------------------------------
diff --cc plugins/tiles3/pom.xml
index ddb92d0,2204fcf..77fb083
--- a/plugins/tiles3/pom.xml
+++ b/plugins/tiles3/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-plugins</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <artifactId>struts2-tiles3-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 231a4ed,aaa30eb..9db8cdb
--- a/pom.xml
+++ b/pom.xml
@@@ -9,7 -9,7 +9,7 @@@
  
      <modelVersion>4.0.0</modelVersion>
      <artifactId>struts2-parent</artifactId>
-     <version>2.3.18-SNAPSHOT</version>
 -    <version>2.3.16.3-SNAPSHOT</version>
++    <version>2.3.16.2</version>
      <packaging>pom</packaging>
      <name>Struts 2</name>
      <url>http://struts.apache.org/</url>
@@@ -31,8 -31,8 +31,7 @@@
          <connection>scm:git:git://git.apache.org/struts.git</connection>
          <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/struts.git</developerConnection>
          <url>http://git.apache.org/struts.git</url>
--      <tag>HEAD</tag>
--  </scm>
++    </scm>
  
      <issueManagement>
          <system>JIRA</system>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/xwork-core/pom.xml
----------------------------------------------------------------------
diff --cc xwork-core/pom.xml
index a35ead4,9d1c34c..34fe8e2
--- a/xwork-core/pom.xml
+++ b/xwork-core/pom.xml
@@@ -5,7 -5,7 +5,7 @@@
      <parent>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts2-parent</artifactId>
-         <version>2.3.18-SNAPSHOT</version>
 -        <version>2.3.16.3-SNAPSHOT</version>
++        <version>2.3.16.2</version>
      </parent>
  
      <groupId>org.apache.struts.xwork</groupId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
----------------------------------------------------------------------


Mime
View raw message