From a2d0ecdcd3594c87265f483ecb3c202fec18937c Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Tue, 22 Apr 2014 11:54:59 +0200 Subject: [PATCH 1/9] Sets -SNAPSHOT version --- 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 | 4 ++-- archetypes/struts2-archetype-blank/pom.xml | 4 ++-- archetypes/struts2-archetype-convention/pom.xml | 4 ++-- archetypes/struts2-archetype-dbportlet/pom.xml | 4 ++-- archetypes/struts2-archetype-plugin/pom.xml | 4 ++-- archetypes/struts2-archetype-portlet/pom.xml | 4 ++-- archetypes/struts2-archetype-starter/pom.xml | 4 ++-- assembly/pom.xml | 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml | 2 +- bundles/pom.xml | 2 +- core/pom.xml | 2 +- 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 +- 51 files changed, 60 insertions(+), 60 deletions(-) diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 2b2cf63ac..dce8aa042 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-blank diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index e16d5ffdb..9a6abee64 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-jboss-blank diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 1992cdebb..de7cfb2c7 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-mailreader diff --git a/apps/pom.xml b/apps/pom.xml index 921abef2a..762ff8f84 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.1 + 2.3.16.2-SNAPSHOT org.apache.struts struts2-apps diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml index 73162cc61..e7db34c30 100644 --- a/apps/portlet/pom.xml +++ b/apps/portlet/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-portlet diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index b4eb6bac0..a37db7a53 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -26,12 +26,12 @@ org.apache.struts struts2-apps - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-rest-showcase war - 2.3.16.1 + 2.3.16.2-SNAPSHOT Struts 2 Rest Showcase Example Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 927f88245..cfc3aa7a8 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-showcase diff --git a/archetypes/pom.xml b/archetypes/pom.xml index da001b501..efd5d19cd 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.1 + 2.3.16.2-SNAPSHOT org.apache.struts struts2-archetypes diff --git a/archetypes/struts2-archetype-angularjs/pom.xml b/archetypes/struts2-archetype-angularjs/pom.xml index 2a4044fdf..ddd6d18b3 100644 --- a/archetypes/struts2-archetype-angularjs/pom.xml +++ b/archetypes/struts2-archetype-angularjs/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.1 + 2.3.16.2-SNAPSHOT 4.0.0 struts2-archetype-angularjs - 2.3.16.1 + 2.3.16.2-SNAPSHOT jar Struts 2 Archetypes - Angular JS diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml index 778f2045f..47a2cd6c0 100644 --- a/archetypes/struts2-archetype-blank/pom.xml +++ b/archetypes/struts2-archetype-blank/pom.xml @@ -3,12 +3,12 @@ org.apache.struts struts2-archetypes - 2.3.16.1 + 2.3.16.2-SNAPSHOT 4.0.0 struts2-archetype-blank - 2.3.16.1 + 2.3.16.2-SNAPSHOT jar Struts 2 Archetypes - Blank diff --git a/archetypes/struts2-archetype-convention/pom.xml b/archetypes/struts2-archetype-convention/pom.xml index cf4095428..ebf65cd6e 100644 --- a/archetypes/struts2-archetype-convention/pom.xml +++ b/archetypes/struts2-archetype-convention/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.1 + 2.3.16.2-SNAPSHOT 4.0.0 struts2-archetype-convention - 2.3.16.1 + 2.3.16.2-SNAPSHOT jar Struts 2 Archetypes - Blank Convention diff --git a/archetypes/struts2-archetype-dbportlet/pom.xml b/archetypes/struts2-archetype-dbportlet/pom.xml index 38dc66f6b..7d7324cef 100644 --- a/archetypes/struts2-archetype-dbportlet/pom.xml +++ b/archetypes/struts2-archetype-dbportlet/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.1 + 2.3.16.2-SNAPSHOT 4.0.0 struts2-archetype-dbportlet - 2.3.16.1 + 2.3.16.2-SNAPSHOT jar Struts 2 Archetypes - Database Portlet diff --git a/archetypes/struts2-archetype-plugin/pom.xml b/archetypes/struts2-archetype-plugin/pom.xml index 2d102e27b..4c8a91db5 100644 --- a/archetypes/struts2-archetype-plugin/pom.xml +++ b/archetypes/struts2-archetype-plugin/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.1 + 2.3.16.2-SNAPSHOT 4.0.0 struts2-archetype-plugin - 2.3.16.1 + 2.3.16.2-SNAPSHOT jar Struts 2 Archetypes - Plugin diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml index cb7c7b2f4..4456c50c7 100644 --- a/archetypes/struts2-archetype-portlet/pom.xml +++ b/archetypes/struts2-archetype-portlet/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.1 + 2.3.16.2-SNAPSHOT 4.0.0 struts2-archetype-portlet - 2.3.16.1 + 2.3.16.2-SNAPSHOT jar Struts 2 Archetypes - Portlet diff --git a/archetypes/struts2-archetype-starter/pom.xml b/archetypes/struts2-archetype-starter/pom.xml index c5dd6ba6c..5272e3e24 100644 --- a/archetypes/struts2-archetype-starter/pom.xml +++ b/archetypes/struts2-archetype-starter/pom.xml @@ -4,12 +4,12 @@ org.apache.struts struts2-archetypes - 2.3.16.1 + 2.3.16.2-SNAPSHOT 4.0.0 struts2-archetype-starter - 2.3.16.1 + 2.3.16.2-SNAPSHOT jar Struts 2 Archetypes - Starter diff --git a/assembly/pom.xml b/assembly/pom.xml index 0f3d4577c..d5bd71bc9 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-parent - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-assembly diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index 25f1089a7..9c93e5ba6 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-osgi-bundles - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index 933394c5f..b6436383d 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-osgi-bundles - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index 0537b1ecb..41523e506 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-osgi-bundles diff --git a/core/pom.xml b/core/pom.xml index 225113efc..c875c6d9c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-core jar diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml index a5b242958..6ce324e68 100644 --- a/plugins/cdi/pom.xml +++ b/plugins/cdi/pom.xml @@ -25,7 +25,7 @@ org.apache.struts struts2-plugins - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-cdi-plugin diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml index ed8e16b7f..d9cd9d0a5 100644 --- a/plugins/codebehind/pom.xml +++ b/plugins/codebehind/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-codebehind-plugin diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml index c8d7cc11b..aefa34730 100644 --- a/plugins/config-browser/pom.xml +++ b/plugins/config-browser/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-config-browser-plugin diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml index 5fb717027..6ef817fc9 100644 --- a/plugins/convention/pom.xml +++ b/plugins/convention/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-convention-plugin diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml index 4cf7aeae8..dbda4fbe0 100644 --- a/plugins/dojo/pom.xml +++ b/plugins/dojo/pom.xml @@ -25,7 +25,7 @@ struts2-plugins org.apache.struts - 2.3.16.1 + 2.3.16.2-SNAPSHOT 4.0.0 diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml index e38598a94..c3de1b054 100644 --- a/plugins/dwr/pom.xml +++ b/plugins/dwr/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-dwr-plugin diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml index 2eb6bc047..5f48827d9 100644 --- a/plugins/embeddedjsp/pom.xml +++ b/plugins/embeddedjsp/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-embeddedjsp-plugin diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml index 52c0cec14..f8fdd213c 100644 --- a/plugins/gxp/pom.xml +++ b/plugins/gxp/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-gxp-plugin diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml index 4dd58e81b..ed5441b1d 100644 --- a/plugins/jasperreports/pom.xml +++ b/plugins/jasperreports/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-jasperreports-plugin diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml index 0b58b8a6f..60f3fc999 100644 --- a/plugins/javatemplates/pom.xml +++ b/plugins/javatemplates/pom.xml @@ -25,7 +25,7 @@ org.apache.struts struts2-plugins - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-javatemplates-plugin diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml index b56396b03..2b718fbff 100644 --- a/plugins/jfreechart/pom.xml +++ b/plugins/jfreechart/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-jfreechart-plugin diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml index afd61581a..f9b48f39e 100644 --- a/plugins/jsf/pom.xml +++ b/plugins/jsf/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-jsf-plugin diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml index f094c0ba2..df285ba2e 100644 --- a/plugins/json/pom.xml +++ b/plugins/json/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-json-plugin diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml index 8aa034c38..8a33c3ea6 100644 --- a/plugins/junit/pom.xml +++ b/plugins/junit/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-junit-plugin diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml index d0fe79d8e..8fa9d3c69 100644 --- a/plugins/osgi/pom.xml +++ b/plugins/osgi/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-plugins - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-osgi-plugin diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml index 978944890..79687b897 100644 --- a/plugins/oval/pom.xml +++ b/plugins/oval/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-oval-plugin diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml index 216e27e24..c109cc995 100644 --- a/plugins/pell-multipart/pom.xml +++ b/plugins/pell-multipart/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-pell-multipart-plugin diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml index 61d172969..698e09359 100644 --- a/plugins/plexus/pom.xml +++ b/plugins/plexus/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-plexus-plugin diff --git a/plugins/pom.xml b/plugins/pom.xml index e283683a2..7529c5299 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-plugins diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml index d1d243e98..8a70349c9 100644 --- a/plugins/portlet-tiles/pom.xml +++ b/plugins/portlet-tiles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-portlet-tiles-plugin diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml index 52823bc49..2ae775874 100644 --- a/plugins/portlet/pom.xml +++ b/plugins/portlet/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-portlet-plugin diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml index 7c7151567..41e6ff06c 100644 --- a/plugins/rest/pom.xml +++ b/plugins/rest/pom.xml @@ -26,11 +26,11 @@ org.apache.struts struts2-plugins - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-rest-plugin - 2.3.16.1 + 2.3.16.2-SNAPSHOT Struts 2 REST Plugin diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml index 7d4d43758..4cba507c1 100644 --- a/plugins/sitegraph/pom.xml +++ b/plugins/sitegraph/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-sitegraph-plugin diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml index bb2bf7931..d244c4a65 100644 --- a/plugins/sitemesh/pom.xml +++ b/plugins/sitemesh/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-sitemesh-plugin diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml index efe4bbb16..3805202e6 100644 --- a/plugins/spring/pom.xml +++ b/plugins/spring/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-spring-plugin diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml index 1c393ffdc..c683cf197 100644 --- a/plugins/struts1/pom.xml +++ b/plugins/struts1/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-struts1-plugin diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml index 87c25bb86..5433f06f5 100644 --- a/plugins/testng/pom.xml +++ b/plugins/testng/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-testng-plugin diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml index 8047d267c..235d83c3b 100644 --- a/plugins/tiles/pom.xml +++ b/plugins/tiles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-tiles-plugin diff --git a/plugins/tiles3/pom.xml b/plugins/tiles3/pom.xml index cf976e499..81683466b 100644 --- a/plugins/tiles3/pom.xml +++ b/plugins/tiles3/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.1 + 2.3.16.2-SNAPSHOT struts2-tiles3-plugin diff --git a/pom.xml b/pom.xml index 004a69792..1e89047ba 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 struts2-parent - 2.3.16.1 + 2.3.16.2-SNAPSHOT pom Struts 2 http://struts.apache.org/2.x/ diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml index e16c324ae..e9b35af8d 100644 --- a/xwork-core/pom.xml +++ b/xwork-core/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-parent - 2.3.16.1 + 2.3.16.2-SNAPSHOT org.apache.struts.xwork From 2e2da292166adbc78c4cb1e308b30ddb4fba6d3f Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Thu, 24 Apr 2014 19:51:02 +0200 Subject: [PATCH 2/9] Moves global exclude patterns into dedicated class --- core/src/main/resources/struts-default.xml | 8 +++---- .../opensymphony/xwork2/ExcludedPatterns.java | 22 +++++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatterns.java diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml index 2f5b259d9..398dd439c 100644 --- a/core/src/main/resources/struts-default.xml +++ b/core/src/main/resources/struts-default.xml @@ -197,7 +197,7 @@ - ^class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.* + ^action:.*,^method:.* @@ -253,7 +253,7 @@ - ^class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.* + ^action:.*,^method:.* @@ -263,7 +263,7 @@ - ^class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.* + ^action:.*,^method:.* @@ -300,7 +300,7 @@ - ^class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.* + ^action:.*,^method:.* diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatterns.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatterns.java new file mode 100644 index 000000000..b618a52a0 --- /dev/null +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatterns.java @@ -0,0 +1,22 @@ +package com.opensymphony.xwork2; + +/** + * ExcludedPatterns contains hard-coded patterns that must be rejected by {@link com.opensymphony.xwork2.interceptor.ParametersInterceptor} + * and partially in CookInterceptor + */ +public class ExcludedPatterns { + + public static final String CLASS_ACCESS_PATTERN = "(.*\\.|^|.*|\\[('|\"))class(\\.|('|\")]|\\[).*"; + + public static final String[] EXCLUDED_PATTERNS = { + CLASS_ACCESS_PATTERN, + "^dojo\\..*", + "^struts\\..*", + "^session\\..*", + "^request\\..*", + "^application\\..*", + "^servlet(Request|Response)\\..*", + "^parameters\\..*" + }; + +} From 6315241719be167542962da436b38782ed730c62 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Thu, 24 Apr 2014 19:51:40 +0200 Subject: [PATCH 3/9] Uses global exclude patterns to initialise excludeParams --- .../interceptor/CookieInterceptor.java | 74 ++++++++++++++++++- .../interceptor/ParametersInterceptor.java | 19 ++++- 2 files changed, 86 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java index 939956c00..3e2e81d32 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java @@ -24,6 +24,7 @@ package org.apache.struts2.interceptor; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.interceptor.AbstractInterceptor; +import com.opensymphony.xwork2.ExcludedPatterns; import com.opensymphony.xwork2.util.TextParseUtil; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.logging.Logger; @@ -173,7 +174,8 @@ public class CookieInterceptor extends AbstractInterceptor { private Set cookiesValueSet = Collections.emptySet(); // Allowed names of cookies - private Pattern acceptedPattern = Pattern.compile(ACCEPTED_PATTERN); + private Pattern acceptedPattern = Pattern.compile(ACCEPTED_PATTERN, Pattern.CASE_INSENSITIVE); + private Pattern excludedPattern = Pattern.compile(ExcludedPatterns.CLASS_ACCESS_PATTERN, Pattern.CASE_INSENSITIVE); /** * Set the cookiesName which if matched will allow the cookie @@ -223,7 +225,7 @@ public class CookieInterceptor extends AbstractInterceptor { String name = cookie.getName(); String value = cookie.getValue(); - if (acceptedPattern.matcher(name).matches()) { + if (isAcceptableName(name) && isAcceptableValue(value)) { if (cookiesNameSet.contains("*")) { if (LOG.isDebugEnabled()) { LOG.debug("contains cookie name [*] in configured cookies name set, cookie with name [" + name + "] with value [" + value + "] will be injected"); @@ -233,7 +235,7 @@ public class CookieInterceptor extends AbstractInterceptor { populateCookieValueIntoStack(name, value, cookiesMap, stack); } } else { - LOG.warn("Cookie name [" + name + "] does not match accepted cookie names pattern [" + acceptedPattern + "]"); + LOG.warn("Cookie name [#0] with value [#1] was rejected!", name, value); } } } @@ -244,6 +246,72 @@ public class CookieInterceptor extends AbstractInterceptor { return invocation.invoke(); } + /** + * Checks if value of Cookie doesn't contain vulnerable code + * + * @param value of Cookie + * @return true|false + */ + protected boolean isAcceptableValue(String value) { + boolean matches = !excludedPattern.matcher(value).matches(); + if (!matches) { + if (LOG.isTraceEnabled()) { + LOG.trace("Cookie value [#0] matches excludedPattern [#1]", value, ExcludedPatterns.CLASS_ACCESS_PATTERN); + } + } + return matches; + } + + /** + * Checks if name of Cookie doesn't contain vulnerable code + * + * @param name of Cookie + * @return true|false + */ + protected boolean isAcceptableName(String name) { + return !isExcluded(name) && isAccepted(name); + } + + /** + * Checks if name of Cookie match {@link #acceptedPattern} + * + * @param name of Cookie + * @return true|false + */ + protected boolean isAccepted(String name) { + boolean matches = acceptedPattern.matcher(name).matches(); + if (matches) { + if (LOG.isTraceEnabled()) { + LOG.trace("Cookie [#0] matches acceptedPattern [#1]", name, ACCEPTED_PATTERN); + } + } else { + if (LOG.isTraceEnabled()) { + LOG.trace("Cookie [#0] doesn't match acceptedPattern [#1]", name, ACCEPTED_PATTERN); + } + } + return matches; + } + + /** + * Checks if name of Cookie match {@link #excludedPattern} + * + * @param name of Cookie + * @return true|false + */ + protected boolean isExcluded(String name) { + boolean matches = excludedPattern.matcher(name).matches(); + if (matches) { + if (LOG.isTraceEnabled()) { + LOG.trace("Cookie [#0] matches excludedPattern [#1]", name, ExcludedPatterns.CLASS_ACCESS_PATTERN); + } + } else { + if (LOG.isTraceEnabled()) { + LOG.trace("Cookie [#0] doesn't match excludedPattern [#1]", name, ExcludedPatterns.CLASS_ACCESS_PATTERN); + } + } + return matches; + } + /** * Hook that populate cookie value into value stack (hence the action) * if the criteria is satisfied (if the cookie value matches with those configured). diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java index af6e0b7ce..d6adf9918 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java @@ -17,6 +17,7 @@ package com.opensymphony.xwork2.interceptor; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.ExcludedPatterns; import com.opensymphony.xwork2.ValidationAware; import com.opensymphony.xwork2.XWorkConstants; import com.opensymphony.xwork2.conversion.impl.InstantiatingNullHandler; @@ -149,16 +150,20 @@ public class ParametersInterceptor extends MethodFilterInterceptor { private int paramNameMaxLength = PARAM_NAME_MAX_LENGTH; protected boolean ordered = false; - protected Set excludeParams = Collections.emptySet(); + protected Set excludeParams; protected Set acceptParams = Collections.emptySet(); private boolean devMode = false; // Allowed names of parameters - private Pattern acceptedPattern = Pattern.compile(ACCEPTED_PARAM_NAMES); + private Pattern acceptedPattern = Pattern.compile(ACCEPTED_PARAM_NAMES, Pattern.CASE_INSENSITIVE); private ValueStackFactory valueStackFactory; + public ParametersInterceptor() { + initializeHardCodedExcludePatterns(); + } + @Inject public void setValueStackFactory(ValueStackFactory valueStackFactory) { this.valueStackFactory = valueStackFactory; @@ -494,6 +499,13 @@ public class ParametersInterceptor extends MethodFilterInterceptor { return excludeParams; } + protected void initializeHardCodedExcludePatterns() { + excludeParams = new HashSet(); + for (String pattern : ExcludedPatterns.EXCLUDED_PATTERNS) { + excludeParams.add(Pattern.compile(pattern, Pattern.CASE_INSENSITIVE)); + } + } + /** * Sets a comma-delimited list of regular expressions to match * parameters that should be removed from the parameter map. @@ -503,9 +515,8 @@ public class ParametersInterceptor extends MethodFilterInterceptor { public void setExcludeParams(String commaDelim) { Collection excludePatterns = ArrayUtils.asCollection(commaDelim); if (excludePatterns != null) { - excludeParams = new HashSet(); for (String pattern : excludePatterns) { - excludeParams.add(Pattern.compile(pattern)); + excludeParams.add(Pattern.compile(pattern, Pattern.CASE_INSENSITIVE)); } } } From 149181a776afc94a39676a570bda72e14826476e Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Thu, 24 Apr 2014 19:52:03 +0200 Subject: [PATCH 4/9] Adds test cases to test ClassLoader pollution --- .../interceptor/CookieInterceptorTest.java | 66 +++++++++++++++++++ .../ParametersInterceptorTest.java | 64 ++++++++++++++++++ 2 files changed, 130 insertions(+) diff --git a/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java index 2d22facf6..d1014a8de 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java @@ -22,10 +22,12 @@ package org.apache.struts2.interceptor; import java.util.Collections; +import java.util.HashMap; import java.util.Map; import javax.servlet.http.Cookie; +import com.opensymphony.xwork2.mock.MockActionInvocation; import org.easymock.MockControl; import org.springframework.mock.web.MockHttpServletRequest; @@ -316,6 +318,70 @@ public class CookieInterceptorTest extends StrutsInternalTestCase { assertEquals(ActionContext.getContext().getValueStack().findValue("cookie3"), null); } + public void testCookiesWithClassPollution() throws Exception { + MockHttpServletRequest request = new MockHttpServletRequest(); + String pollution1 = "model['class']['classLoader']['jarPath']"; + String pollution2 = "model.class.classLoader.jarPath"; + String pollution3 = "class.classLoader.jarPath"; + String pollution4 = "class['classLoader']['jarPath']"; + String pollution5 = "model[\"class\"]['classLoader']['jarPath']"; + String pollution6 = "class[\"classLoader\"]['jarPath']"; + + request.setCookies( + new Cookie(pollution1, "pollution1"), + new Cookie("pollution1", pollution1), + new Cookie(pollution2, "pollution2"), + new Cookie("pollution2", pollution2), + new Cookie(pollution3, "pollution3"), + new Cookie("pollution3", pollution3), + new Cookie(pollution4, "pollution4"), + new Cookie("pollution4", pollution4), + new Cookie(pollution5, "pollution5"), + new Cookie("pollution5", pollution5), + new Cookie(pollution6, "pollution6"), + new Cookie("pollution6", pollution6) + ); + ServletActionContext.setRequest(request); + + final Map excludedName = new HashMap(); + final Map excludedValue = new HashMap(); + + CookieInterceptor interceptor = new CookieInterceptor() { + @Override + protected boolean isAcceptableName(String name) { + boolean accepted = super.isAcceptableName(name); + excludedName.put(name, accepted); + return accepted; + } + + @Override + protected boolean isAcceptableValue(String value) { + boolean accepted = super.isAcceptableValue(value); + excludedValue.put(value, accepted); + return accepted; + } + }; + interceptor.setCookiesName("*"); + + MockActionInvocation invocation = new MockActionInvocation(); + invocation.setAction(new MockActionWithCookieAware()); + + interceptor.intercept(invocation); + + assertFalse(excludedName.get(pollution1)); + assertFalse(excludedName.get(pollution2)); + assertFalse(excludedName.get(pollution3)); + assertFalse(excludedName.get(pollution4)); + assertFalse(excludedName.get(pollution5)); + assertFalse(excludedName.get(pollution6)); + + assertFalse(excludedValue.get(pollution1)); + assertFalse(excludedValue.get(pollution2)); + assertFalse(excludedValue.get(pollution3)); + assertFalse(excludedValue.get(pollution4)); + assertFalse(excludedValue.get(pollution5)); + assertFalse(excludedValue.get(pollution6)); + } public static class MockActionWithCookieAware extends ActionSupport implements CookiesAware { diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java index e616fb832..21c7da90e 100644 --- a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java +++ b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java @@ -18,6 +18,7 @@ package com.opensymphony.xwork2.interceptor; import com.opensymphony.xwork2.Action; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionProxy; +import com.opensymphony.xwork2.ExcludedPatterns; import com.opensymphony.xwork2.ModelDrivenAction; import com.opensymphony.xwork2.SimpleAction; import com.opensymphony.xwork2.TestBean; @@ -44,10 +45,12 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.regex.Pattern; /** @@ -184,6 +187,62 @@ public class ParametersInterceptorTest extends XWorkTestCase { assertNull(session.get("user5")); } + public void testArrayClassPollutionBlockedByPattern() throws Exception { + // given + final String pollution1 = "model.class.classLoader.jarPath"; + final String pollution2 = "model['class']['classLoader']['jarPath']"; + final String pollution3 = "model[\"class\"]['classLoader']['jarPath']"; + final String pollution4 = "class.classLoader.jarPath"; + final String pollution5 = "class['classLoader']['jarPath']"; + final String pollution6 = "class[\"classLoader\"]['jarPath']"; + + loadConfigurationProviders(new XWorkConfigurationProvider(), new XmlConfigurationProvider("xwork-param-test.xml")); + final Map params = new HashMap() { + { + put(pollution1, "bad"); + put(pollution2, "bad"); + put(pollution3, "bad"); + put(pollution4, "bad"); + put(pollution5, "bad"); + put(pollution6, "bad"); + } + }; + + final Map excluded = new HashMap(); + ParametersInterceptor pi = new ParametersInterceptor() { + + @Override + protected void initializeHardCodedExcludePatterns() { + this.excludeParams = new HashSet(); + } + + @Override + protected boolean isExcluded(String paramName) { + boolean result = super.isExcluded(paramName); + excluded.put(paramName, result); + return result; + } + + }; + + pi.setExcludeParams("(.*\\.|^|.*|\\[('|\"))class(\\.|('|\")]|\\[).*"); + container.inject(pi); + ValueStack vs = ActionContext.getContext().getValueStack(); + + // when + ValidateAction action = new ValidateAction(); + pi.setParameters(action, vs, params); + + // then + assertEquals(0, action.getActionMessages().size()); + assertTrue(excluded.get(pollution1)); + assertTrue(excluded.get(pollution2)); + assertTrue(excluded.get(pollution3)); + assertTrue(excluded.get(pollution4)); + assertTrue(excluded.get(pollution5)); + assertTrue(excluded.get(pollution6)); + } + public void testAccessToOgnlInternals() throws Exception { // given Map params = new HashMap(); @@ -571,6 +630,11 @@ public class ParametersInterceptorTest extends XWorkTestCase { assertEquals(expected, actual); } + public void testExcludedPatternsGetInitialized() throws Exception { + ParametersInterceptor parametersInterceptor = new ParametersInterceptor(); + assertEquals(ExcludedPatterns.EXCLUDED_PATTERNS.length, parametersInterceptor.excludeParams.size()); + } + private ValueStack injectValueStack(Map actual) { ValueStack stack = createStubValueStack(actual); container.inject(stack); From 986215740a0c51c4a2a2eb3e2b22c66ebeb279ed Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Thu, 24 Apr 2014 20:19:02 +0200 Subject: [PATCH 5/9] Updates archetypes' version --- src/site/resources/archetype-catalog.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/site/resources/archetype-catalog.xml b/src/site/resources/archetype-catalog.xml index d1989bba4..fab8fde9a 100644 --- a/src/site/resources/archetype-catalog.xml +++ b/src/site/resources/archetype-catalog.xml @@ -7,42 +7,42 @@ org.apache.struts struts2-archetype-blank - 2.3.16.1 + 2.3.16.2 http://repo1.maven.org/maven2/ Struts 2 Archetypes - Blank org.apache.struts struts2-archetype-convention - 2.3.16.1 + 2.3.16.2 http://repo1.maven.org/maven2/ Struts 2 Archetypes - Blank Convention org.apache.struts struts2-archetype-dbportlet - 2.3.16.1 + 2.3.16.2 http://repo1.maven.org/maven2/ Struts 2 Archetypes - Database Portlet org.apache.struts struts2-archetype-plugin - 2.3.16.1 + 2.3.16.2 http://repo1.maven.org/maven2/ Struts 2 Archetypes - Plugin org.apache.struts struts2-archetype-portlet - 2.3.16.1 + 2.3.16.2 http://repo1.maven.org/maven2/ Struts 2 Archetypes - Portlet org.apache.struts struts2-archetype-starter - 2.3.16.1 + 2.3.16.2 http://repo1.maven.org/maven2/ Struts 2 Archetypes - Starter From 1540ab3c74b323890caa82046e69d507c936e361 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Thu, 24 Apr 2014 20:46:43 +0200 Subject: [PATCH 6/9] Updates maven-release-plugin to solve problem with tagging --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 1e89047ba..0d7f275ec 100644 --- a/pom.xml +++ b/pom.xml @@ -120,6 +120,11 @@ + + org.apache.maven.plugins + maven-release-plugin + 2.5 + org.apache.maven.plugins maven-site-plugin From 78096665fea8f4265df172b1bc6f74facedfcd99 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Thu, 24 Apr 2014 21:13:06 +0200 Subject: [PATCH 7/9] Updates maven-release-plugin to solve problem with tagging --- pom.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0d7f275ec..9d2ef8bd7 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ 2.3.16.2-SNAPSHOT pom Struts 2 - http://struts.apache.org/2.x/ + http://struts.apache.org/ Apache Struts 2 2000 @@ -123,7 +123,7 @@ org.apache.maven.plugins maven-release-plugin - 2.5 + 2.52 org.apache.maven.plugins @@ -174,6 +174,11 @@ + + org.apache.maven.plugins + maven-release-plugin + 2.5 + maven-jar-plugin From 7dd83dff485d324980f3d22c726cfd969ecf41f8 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Thu, 24 Apr 2014 21:32:35 +0200 Subject: [PATCH 8/9] [maven-release-plugin] prepare release STRUTS_2_3_16_2 --- 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 | 4 ++-- archetypes/struts2-archetype-blank/pom.xml | 4 ++-- archetypes/struts2-archetype-convention/pom.xml | 4 ++-- archetypes/struts2-archetype-dbportlet/pom.xml | 4 ++-- archetypes/struts2-archetype-plugin/pom.xml | 4 ++-- archetypes/struts2-archetype-portlet/pom.xml | 4 ++-- archetypes/struts2-archetype-starter/pom.xml | 4 ++-- assembly/pom.xml | 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml | 2 +- bundles/pom.xml | 2 +- core/pom.xml | 2 +- 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 +++-- xwork-core/pom.xml | 2 +- 51 files changed, 62 insertions(+), 61 deletions(-) diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index dce8aa042..6054fc429 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-blank diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 9a6abee64..0aebae084 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-jboss-blank diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index de7cfb2c7..f2fc344ce 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-mailreader diff --git a/apps/pom.xml b/apps/pom.xml index 762ff8f84..a16b4d748 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.2-SNAPSHOT + 2.3.16.2 org.apache.struts struts2-apps diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml index e7db34c30..f98d72ba6 100644 --- a/apps/portlet/pom.xml +++ b/apps/portlet/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-portlet diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index a37db7a53..b0c658925 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -26,12 +26,12 @@ org.apache.struts struts2-apps - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-rest-showcase war - 2.3.16.2-SNAPSHOT + 2.3.16.2 Struts 2 Rest Showcase Example Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index cfc3aa7a8..6cf2aefd7 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-showcase diff --git a/archetypes/pom.xml b/archetypes/pom.xml index efd5d19cd..bf9b7f808 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.2-SNAPSHOT + 2.3.16.2 org.apache.struts struts2-archetypes diff --git a/archetypes/struts2-archetype-angularjs/pom.xml b/archetypes/struts2-archetype-angularjs/pom.xml index ddd6d18b3..a15b95721 100644 --- a/archetypes/struts2-archetype-angularjs/pom.xml +++ b/archetypes/struts2-archetype-angularjs/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.2-SNAPSHOT + 2.3.16.2 4.0.0 struts2-archetype-angularjs - 2.3.16.2-SNAPSHOT + 2.3.16.2 jar Struts 2 Archetypes - Angular JS diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml index 47a2cd6c0..237b35a1f 100644 --- a/archetypes/struts2-archetype-blank/pom.xml +++ b/archetypes/struts2-archetype-blank/pom.xml @@ -3,12 +3,12 @@ org.apache.struts struts2-archetypes - 2.3.16.2-SNAPSHOT + 2.3.16.2 4.0.0 struts2-archetype-blank - 2.3.16.2-SNAPSHOT + 2.3.16.2 jar Struts 2 Archetypes - Blank diff --git a/archetypes/struts2-archetype-convention/pom.xml b/archetypes/struts2-archetype-convention/pom.xml index ebf65cd6e..aa3e82016 100644 --- a/archetypes/struts2-archetype-convention/pom.xml +++ b/archetypes/struts2-archetype-convention/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.2-SNAPSHOT + 2.3.16.2 4.0.0 struts2-archetype-convention - 2.3.16.2-SNAPSHOT + 2.3.16.2 jar Struts 2 Archetypes - Blank Convention diff --git a/archetypes/struts2-archetype-dbportlet/pom.xml b/archetypes/struts2-archetype-dbportlet/pom.xml index 7d7324cef..c1e77493b 100644 --- a/archetypes/struts2-archetype-dbportlet/pom.xml +++ b/archetypes/struts2-archetype-dbportlet/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.2-SNAPSHOT + 2.3.16.2 4.0.0 struts2-archetype-dbportlet - 2.3.16.2-SNAPSHOT + 2.3.16.2 jar Struts 2 Archetypes - Database Portlet diff --git a/archetypes/struts2-archetype-plugin/pom.xml b/archetypes/struts2-archetype-plugin/pom.xml index 4c8a91db5..8535f80a5 100644 --- a/archetypes/struts2-archetype-plugin/pom.xml +++ b/archetypes/struts2-archetype-plugin/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.2-SNAPSHOT + 2.3.16.2 4.0.0 struts2-archetype-plugin - 2.3.16.2-SNAPSHOT + 2.3.16.2 jar Struts 2 Archetypes - Plugin diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml index 4456c50c7..a3baed835 100644 --- a/archetypes/struts2-archetype-portlet/pom.xml +++ b/archetypes/struts2-archetype-portlet/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.2-SNAPSHOT + 2.3.16.2 4.0.0 struts2-archetype-portlet - 2.3.16.2-SNAPSHOT + 2.3.16.2 jar Struts 2 Archetypes - Portlet diff --git a/archetypes/struts2-archetype-starter/pom.xml b/archetypes/struts2-archetype-starter/pom.xml index 5272e3e24..229a59161 100644 --- a/archetypes/struts2-archetype-starter/pom.xml +++ b/archetypes/struts2-archetype-starter/pom.xml @@ -4,12 +4,12 @@ org.apache.struts struts2-archetypes - 2.3.16.2-SNAPSHOT + 2.3.16.2 4.0.0 struts2-archetype-starter - 2.3.16.2-SNAPSHOT + 2.3.16.2 jar Struts 2 Archetypes - Starter diff --git a/assembly/pom.xml b/assembly/pom.xml index d5bd71bc9..7984c29ba 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-parent - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-assembly diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index 9c93e5ba6..e9fdc7808 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-osgi-bundles - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index b6436383d..a8613a3ea 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-osgi-bundles - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index 41523e506..b86c91fc1 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-osgi-bundles diff --git a/core/pom.xml b/core/pom.xml index c875c6d9c..02aee40f1 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-core jar diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml index 6ce324e68..8cd0325f9 100644 --- a/plugins/cdi/pom.xml +++ b/plugins/cdi/pom.xml @@ -25,7 +25,7 @@ org.apache.struts struts2-plugins - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-cdi-plugin diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml index d9cd9d0a5..e978b792a 100644 --- a/plugins/codebehind/pom.xml +++ b/plugins/codebehind/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-codebehind-plugin diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml index aefa34730..284f1c707 100644 --- a/plugins/config-browser/pom.xml +++ b/plugins/config-browser/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-config-browser-plugin diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml index 6ef817fc9..a55a79779 100644 --- a/plugins/convention/pom.xml +++ b/plugins/convention/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-convention-plugin diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml index dbda4fbe0..29846eafc 100644 --- a/plugins/dojo/pom.xml +++ b/plugins/dojo/pom.xml @@ -25,7 +25,7 @@ struts2-plugins org.apache.struts - 2.3.16.2-SNAPSHOT + 2.3.16.2 4.0.0 diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml index c3de1b054..dba899b0a 100644 --- a/plugins/dwr/pom.xml +++ b/plugins/dwr/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-dwr-plugin diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml index 5f48827d9..51488bef5 100644 --- a/plugins/embeddedjsp/pom.xml +++ b/plugins/embeddedjsp/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-embeddedjsp-plugin diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml index f8fdd213c..5ef6f6b3e 100644 --- a/plugins/gxp/pom.xml +++ b/plugins/gxp/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-gxp-plugin diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml index ed5441b1d..3cf1c9434 100644 --- a/plugins/jasperreports/pom.xml +++ b/plugins/jasperreports/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-jasperreports-plugin diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml index 60f3fc999..e3a44c4fd 100644 --- a/plugins/javatemplates/pom.xml +++ b/plugins/javatemplates/pom.xml @@ -25,7 +25,7 @@ org.apache.struts struts2-plugins - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-javatemplates-plugin diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml index 2b718fbff..849c815fe 100644 --- a/plugins/jfreechart/pom.xml +++ b/plugins/jfreechart/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-jfreechart-plugin diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml index f9b48f39e..33d00ea09 100644 --- a/plugins/jsf/pom.xml +++ b/plugins/jsf/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-jsf-plugin diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml index df285ba2e..444d311bb 100644 --- a/plugins/json/pom.xml +++ b/plugins/json/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-json-plugin diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml index 8a33c3ea6..2571fcb2c 100644 --- a/plugins/junit/pom.xml +++ b/plugins/junit/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-junit-plugin diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml index 8fa9d3c69..11e2c22d3 100644 --- a/plugins/osgi/pom.xml +++ b/plugins/osgi/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-plugins - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-osgi-plugin diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml index 79687b897..457383fa9 100644 --- a/plugins/oval/pom.xml +++ b/plugins/oval/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-oval-plugin diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml index c109cc995..b2ab339f1 100644 --- a/plugins/pell-multipart/pom.xml +++ b/plugins/pell-multipart/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-pell-multipart-plugin diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml index 698e09359..8569137e7 100644 --- a/plugins/plexus/pom.xml +++ b/plugins/plexus/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-plexus-plugin diff --git a/plugins/pom.xml b/plugins/pom.xml index 7529c5299..d98fc9a19 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-plugins diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml index 8a70349c9..9d41d84fd 100644 --- a/plugins/portlet-tiles/pom.xml +++ b/plugins/portlet-tiles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-portlet-tiles-plugin diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml index 2ae775874..8134dad7d 100644 --- a/plugins/portlet/pom.xml +++ b/plugins/portlet/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-portlet-plugin diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml index 41e6ff06c..aec40754d 100644 --- a/plugins/rest/pom.xml +++ b/plugins/rest/pom.xml @@ -26,11 +26,11 @@ org.apache.struts struts2-plugins - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-rest-plugin - 2.3.16.2-SNAPSHOT + 2.3.16.2 Struts 2 REST Plugin diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml index 4cba507c1..243b1d261 100644 --- a/plugins/sitegraph/pom.xml +++ b/plugins/sitegraph/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-sitegraph-plugin diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml index d244c4a65..3c7b1b831 100644 --- a/plugins/sitemesh/pom.xml +++ b/plugins/sitemesh/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-sitemesh-plugin diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml index 3805202e6..6bcf25262 100644 --- a/plugins/spring/pom.xml +++ b/plugins/spring/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-spring-plugin diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml index c683cf197..fb847998c 100644 --- a/plugins/struts1/pom.xml +++ b/plugins/struts1/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-struts1-plugin diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml index 5433f06f5..eec0caf71 100644 --- a/plugins/testng/pom.xml +++ b/plugins/testng/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-testng-plugin diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml index 235d83c3b..47b3980e8 100644 --- a/plugins/tiles/pom.xml +++ b/plugins/tiles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-tiles-plugin diff --git a/plugins/tiles3/pom.xml b/plugins/tiles3/pom.xml index 81683466b..77fb083f6 100644 --- a/plugins/tiles3/pom.xml +++ b/plugins/tiles3/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-tiles3-plugin diff --git a/pom.xml b/pom.xml index 9d2ef8bd7..dc336c1c3 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 struts2-parent - 2.3.16.2-SNAPSHOT + 2.3.16.2 pom Struts 2 http://struts.apache.org/ @@ -31,7 +31,8 @@ scm:git:git://git.apache.org/struts.git scm:git:https://git-wip-us.apache.org/repos/asf/struts.git http://git.apache.org/struts.git - + STRUTS_2_3_16_2 + JIRA diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml index e9b35af8d..34fe8e2d9 100644 --- a/xwork-core/pom.xml +++ b/xwork-core/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-parent - 2.3.16.2-SNAPSHOT + 2.3.16.2 org.apache.struts.xwork From fbd75a892bdad741f8a4247e3b8e5c2727651816 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Thu, 24 Apr 2014 21:32:49 +0200 Subject: [PATCH 9/9] [maven-release-plugin] prepare for next development iteration --- 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 | 4 ++-- archetypes/struts2-archetype-blank/pom.xml | 4 ++-- archetypes/struts2-archetype-convention/pom.xml | 4 ++-- archetypes/struts2-archetype-dbportlet/pom.xml | 4 ++-- archetypes/struts2-archetype-plugin/pom.xml | 4 ++-- archetypes/struts2-archetype-portlet/pom.xml | 4 ++-- archetypes/struts2-archetype-starter/pom.xml | 4 ++-- assembly/pom.xml | 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml | 2 +- bundles/pom.xml | 2 +- core/pom.xml | 2 +- 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 | 4 ++-- xwork-core/pom.xml | 2 +- 51 files changed, 61 insertions(+), 61 deletions(-) diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 6054fc429..81a88d575 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-blank diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 0aebae084..b77c9779f 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-jboss-blank diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index f2fc344ce..bb7ae7c67 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-mailreader diff --git a/apps/pom.xml b/apps/pom.xml index a16b4d748..3444414bc 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.2 + 2.3.16.3-SNAPSHOT org.apache.struts struts2-apps diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml index f98d72ba6..e105aab54 100644 --- a/apps/portlet/pom.xml +++ b/apps/portlet/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-portlet diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index b0c658925..55d5d5f19 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -26,12 +26,12 @@ org.apache.struts struts2-apps - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-rest-showcase war - 2.3.16.2 + 2.3.16.3-SNAPSHOT Struts 2 Rest Showcase Example Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 6cf2aefd7..9d52e4b6e 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-showcase diff --git a/archetypes/pom.xml b/archetypes/pom.xml index bf9b7f808..fcf351ba8 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.2 + 2.3.16.3-SNAPSHOT org.apache.struts struts2-archetypes diff --git a/archetypes/struts2-archetype-angularjs/pom.xml b/archetypes/struts2-archetype-angularjs/pom.xml index a15b95721..3f4065704 100644 --- a/archetypes/struts2-archetype-angularjs/pom.xml +++ b/archetypes/struts2-archetype-angularjs/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.2 + 2.3.16.3-SNAPSHOT 4.0.0 struts2-archetype-angularjs - 2.3.16.2 + 2.3.16.3-SNAPSHOT jar Struts 2 Archetypes - Angular JS diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml index 237b35a1f..00a6f4bab 100644 --- a/archetypes/struts2-archetype-blank/pom.xml +++ b/archetypes/struts2-archetype-blank/pom.xml @@ -3,12 +3,12 @@ org.apache.struts struts2-archetypes - 2.3.16.2 + 2.3.16.3-SNAPSHOT 4.0.0 struts2-archetype-blank - 2.3.16.2 + 2.3.16.3-SNAPSHOT jar Struts 2 Archetypes - Blank diff --git a/archetypes/struts2-archetype-convention/pom.xml b/archetypes/struts2-archetype-convention/pom.xml index aa3e82016..fca83b0e2 100644 --- a/archetypes/struts2-archetype-convention/pom.xml +++ b/archetypes/struts2-archetype-convention/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.2 + 2.3.16.3-SNAPSHOT 4.0.0 struts2-archetype-convention - 2.3.16.2 + 2.3.16.3-SNAPSHOT jar Struts 2 Archetypes - Blank Convention diff --git a/archetypes/struts2-archetype-dbportlet/pom.xml b/archetypes/struts2-archetype-dbportlet/pom.xml index c1e77493b..15a48ed01 100644 --- a/archetypes/struts2-archetype-dbportlet/pom.xml +++ b/archetypes/struts2-archetype-dbportlet/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.2 + 2.3.16.3-SNAPSHOT 4.0.0 struts2-archetype-dbportlet - 2.3.16.2 + 2.3.16.3-SNAPSHOT jar Struts 2 Archetypes - Database Portlet diff --git a/archetypes/struts2-archetype-plugin/pom.xml b/archetypes/struts2-archetype-plugin/pom.xml index 8535f80a5..bdb702f15 100644 --- a/archetypes/struts2-archetype-plugin/pom.xml +++ b/archetypes/struts2-archetype-plugin/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.2 + 2.3.16.3-SNAPSHOT 4.0.0 struts2-archetype-plugin - 2.3.16.2 + 2.3.16.3-SNAPSHOT jar Struts 2 Archetypes - Plugin diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml index a3baed835..1bc6d9ffa 100644 --- a/archetypes/struts2-archetype-portlet/pom.xml +++ b/archetypes/struts2-archetype-portlet/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.2 + 2.3.16.3-SNAPSHOT 4.0.0 struts2-archetype-portlet - 2.3.16.2 + 2.3.16.3-SNAPSHOT jar Struts 2 Archetypes - Portlet diff --git a/archetypes/struts2-archetype-starter/pom.xml b/archetypes/struts2-archetype-starter/pom.xml index 229a59161..935b47162 100644 --- a/archetypes/struts2-archetype-starter/pom.xml +++ b/archetypes/struts2-archetype-starter/pom.xml @@ -4,12 +4,12 @@ org.apache.struts struts2-archetypes - 2.3.16.2 + 2.3.16.3-SNAPSHOT 4.0.0 struts2-archetype-starter - 2.3.16.2 + 2.3.16.3-SNAPSHOT jar Struts 2 Archetypes - Starter diff --git a/assembly/pom.xml b/assembly/pom.xml index 7984c29ba..97aef43a8 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-parent - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-assembly diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index e9fdc7808..5ea89c4cc 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-osgi-bundles - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index a8613a3ea..0f67c7d29 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-osgi-bundles - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index b86c91fc1..f896c0c4e 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-osgi-bundles diff --git a/core/pom.xml b/core/pom.xml index 02aee40f1..6404358f5 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-core jar diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml index 8cd0325f9..ba6bbf26b 100644 --- a/plugins/cdi/pom.xml +++ b/plugins/cdi/pom.xml @@ -25,7 +25,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-cdi-plugin diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml index e978b792a..78701b28b 100644 --- a/plugins/codebehind/pom.xml +++ b/plugins/codebehind/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-codebehind-plugin diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml index 284f1c707..7a9016b72 100644 --- a/plugins/config-browser/pom.xml +++ b/plugins/config-browser/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-config-browser-plugin diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml index a55a79779..54346ba3c 100644 --- a/plugins/convention/pom.xml +++ b/plugins/convention/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-convention-plugin diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml index 29846eafc..f0f950dae 100644 --- a/plugins/dojo/pom.xml +++ b/plugins/dojo/pom.xml @@ -25,7 +25,7 @@ struts2-plugins org.apache.struts - 2.3.16.2 + 2.3.16.3-SNAPSHOT 4.0.0 diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml index dba899b0a..76259d2f6 100644 --- a/plugins/dwr/pom.xml +++ b/plugins/dwr/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-dwr-plugin diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml index 51488bef5..19b85fc83 100644 --- a/plugins/embeddedjsp/pom.xml +++ b/plugins/embeddedjsp/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-embeddedjsp-plugin diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml index 5ef6f6b3e..d984aca07 100644 --- a/plugins/gxp/pom.xml +++ b/plugins/gxp/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-gxp-plugin diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml index 3cf1c9434..45d22b2aa 100644 --- a/plugins/jasperreports/pom.xml +++ b/plugins/jasperreports/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-jasperreports-plugin diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml index e3a44c4fd..6d3ff2d84 100644 --- a/plugins/javatemplates/pom.xml +++ b/plugins/javatemplates/pom.xml @@ -25,7 +25,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-javatemplates-plugin diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml index 849c815fe..bb888b922 100644 --- a/plugins/jfreechart/pom.xml +++ b/plugins/jfreechart/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-jfreechart-plugin diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml index 33d00ea09..3f284ab1d 100644 --- a/plugins/jsf/pom.xml +++ b/plugins/jsf/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-jsf-plugin diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml index 444d311bb..f77b226ff 100644 --- a/plugins/json/pom.xml +++ b/plugins/json/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-json-plugin diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml index 2571fcb2c..6d02695ef 100644 --- a/plugins/junit/pom.xml +++ b/plugins/junit/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-junit-plugin diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml index 11e2c22d3..2762bfa1d 100644 --- a/plugins/osgi/pom.xml +++ b/plugins/osgi/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-osgi-plugin diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml index 457383fa9..997b2a76c 100644 --- a/plugins/oval/pom.xml +++ b/plugins/oval/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-oval-plugin diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml index b2ab339f1..307fc055b 100644 --- a/plugins/pell-multipart/pom.xml +++ b/plugins/pell-multipart/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-pell-multipart-plugin diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml index 8569137e7..79ce6afa0 100644 --- a/plugins/plexus/pom.xml +++ b/plugins/plexus/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-plexus-plugin diff --git a/plugins/pom.xml b/plugins/pom.xml index d98fc9a19..0d764e640 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-plugins diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml index 9d41d84fd..a937e7cfc 100644 --- a/plugins/portlet-tiles/pom.xml +++ b/plugins/portlet-tiles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-portlet-tiles-plugin diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml index 8134dad7d..4bea2e73e 100644 --- a/plugins/portlet/pom.xml +++ b/plugins/portlet/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-portlet-plugin diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml index aec40754d..3c416a454 100644 --- a/plugins/rest/pom.xml +++ b/plugins/rest/pom.xml @@ -26,11 +26,11 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-rest-plugin - 2.3.16.2 + 2.3.16.3-SNAPSHOT Struts 2 REST Plugin diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml index 243b1d261..829f883c9 100644 --- a/plugins/sitegraph/pom.xml +++ b/plugins/sitegraph/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-sitegraph-plugin diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml index 3c7b1b831..717c2bfaf 100644 --- a/plugins/sitemesh/pom.xml +++ b/plugins/sitemesh/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-sitemesh-plugin diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml index 6bcf25262..c5bf45b3b 100644 --- a/plugins/spring/pom.xml +++ b/plugins/spring/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-spring-plugin diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml index fb847998c..fbbd4f19d 100644 --- a/plugins/struts1/pom.xml +++ b/plugins/struts1/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-struts1-plugin diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml index eec0caf71..6879f548b 100644 --- a/plugins/testng/pom.xml +++ b/plugins/testng/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-testng-plugin diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml index 47b3980e8..f3fa2b6ad 100644 --- a/plugins/tiles/pom.xml +++ b/plugins/tiles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-tiles-plugin diff --git a/plugins/tiles3/pom.xml b/plugins/tiles3/pom.xml index 77fb083f6..2204fcf19 100644 --- a/plugins/tiles3/pom.xml +++ b/plugins/tiles3/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-tiles3-plugin diff --git a/pom.xml b/pom.xml index dc336c1c3..aaa30ebe2 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 struts2-parent - 2.3.16.2 + 2.3.16.3-SNAPSHOT pom Struts 2 http://struts.apache.org/ @@ -31,7 +31,7 @@ scm:git:git://git.apache.org/struts.git scm:git:https://git-wip-us.apache.org/repos/asf/struts.git http://git.apache.org/struts.git - STRUTS_2_3_16_2 + HEAD diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml index 34fe8e2d9..9d1c34cd6 100644 --- a/xwork-core/pom.xml +++ b/xwork-core/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-parent - 2.3.16.2 + 2.3.16.3-SNAPSHOT org.apache.struts.xwork