You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2015/05/21 20:01:09 UTC
[01/10] struts git commit: Merge branch 'master' into develop
Repository: struts
Updated Branches:
refs/heads/master 26ab3e477 -> 003fe35c9
Merge branch 'master' into develop
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ea098ba0
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ea098ba0
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ea098ba0
Branch: refs/heads/master
Commit: ea098ba08ff0a326f7d30ac9dacc7b48c3ba3151
Parents: 7063f5e 26ab3e4
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sun May 3 14:01:21 2015 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sun May 3 14:01:21 2015 +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 +-
bom/pom.xml | 4 ++--
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/java8-support/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 | 2 +-
plugins/sitegraph/pom.xml | 2 +-
plugins/sitemesh/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/struts1/pom.xml | 2 +-
plugins/testng/pom.xml | 2 +-
plugins/tiles/pom.xml | 2 +-
plugins/tiles3/pom.xml | 2 +-
pom.xml | 2 +-
xwork-core/pom.xml | 2 +-
53 files changed, 55 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
[10/10] struts git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/struts into develop
Posted by lu...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/struts into develop
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/003fe35c
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/003fe35c
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/003fe35c
Branch: refs/heads/master
Commit: 003fe35c909920bc5e5af2473c0376bc126c0b17
Parents: ebb1e3f 0127963
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri May 15 21:36:20 2015 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri May 15 21:36:20 2015 +0200
----------------------------------------------------------------------
.../src/main/webapp/js/controllers.js | 8 ++++----
.../src/main/webapp/js/services.js | 15 ++++++++-------
2 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
[06/10] struts git commit: [maven-release-plugin] prepare for next
development iteration
Posted by lu...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f19707cb
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f19707cb
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f19707cb
Branch: refs/heads/master
Commit: f19707cb760bbc2d4a055d946350d392b924bc89
Parents: a9974ee
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed May 6 07:59:11 2015 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed May 6 07:59:11 2015 +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 +-
bom/pom.xml | 6 +++---
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 | 2 +-
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 +-
52 files changed, 56 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/apps/blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index 248904b..0ef12d5 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-blank</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/apps/jboss-blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index 90747fd..0447b43 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-jboss-blank</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/apps/mailreader/pom.xml
----------------------------------------------------------------------
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index 7c2418a..8ef4a4e 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-mailreader</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index 3ad67ae..c55969e 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-apps</artifactId>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/apps/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index 9bfce96..ec37cb2 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/apps/rest-showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index d0ad4e6..1b4194a 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -26,12 +26,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-rest-showcase</artifactId>
<packaging>war</packaging>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
<name>Struts 2 Rest Showcase Webapp</name>
<description>Struts 2 Rest Showcase Example</description>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/apps/showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 38851ba..8aa9a26 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-showcase</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index f35b03a..56f8c5a 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-archetypes</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/archetypes/struts2-archetype-angularjs/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-angularjs/pom.xml b/archetypes/struts2-archetype-angularjs/pom.xml
index fbb2de4..2e9c9c3 100644
--- a/archetypes/struts2-archetype-angularjs/pom.xml
+++ b/archetypes/struts2-archetype-angularjs/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/archetypes/struts2-archetype-blank/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml
index 4818cc8..6df4f5b 100644
--- a/archetypes/struts2-archetype-blank/pom.xml
+++ b/archetypes/struts2-archetype-blank/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/archetypes/struts2-archetype-convention/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-convention/pom.xml b/archetypes/struts2-archetype-convention/pom.xml
index 6a0eaff..619ff34 100644
--- a/archetypes/struts2-archetype-convention/pom.xml
+++ b/archetypes/struts2-archetype-convention/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/archetypes/struts2-archetype-dbportlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-dbportlet/pom.xml b/archetypes/struts2-archetype-dbportlet/pom.xml
index a6ac1da..37e4e48 100644
--- a/archetypes/struts2-archetype-dbportlet/pom.xml
+++ b/archetypes/struts2-archetype-dbportlet/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/archetypes/struts2-archetype-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-plugin/pom.xml b/archetypes/struts2-archetype-plugin/pom.xml
index 9a94f4e..c4d5d85 100644
--- a/archetypes/struts2-archetype-plugin/pom.xml
+++ b/archetypes/struts2-archetype-plugin/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/archetypes/struts2-archetype-portlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml
index 362234d..79190d0 100644
--- a/archetypes/struts2-archetype-portlet/pom.xml
+++ b/archetypes/struts2-archetype-portlet/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/archetypes/struts2-archetype-starter/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-starter/pom.xml b/archetypes/struts2-archetype-starter/pom.xml
index e568bb8..6f317d3 100644
--- a/archetypes/struts2-archetype-starter/pom.xml
+++ b/archetypes/struts2-archetype-starter/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 31a1210..006ac47 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-assembly</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/bom/pom.xml
----------------------------------------------------------------------
diff --git a/bom/pom.xml b/bom/pom.xml
index d500915..14cc383 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -9,7 +9,7 @@
</parent>
<artifactId>struts2-bom</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2 Bill of Materials</name>
@@ -24,7 +24,7 @@
</licenses>
<properties>
- <struts-version.version>2.3.20.1</struts-version.version>
+ <struts-version.version>2.3.20.2-SNAPSHOT</struts-version.version>
</properties>
<dependencyManagement>
@@ -183,6 +183,6 @@
</dependencyManagement>
<scm>
- <tag>STRUTS_2_3_20_1</tag>
+ <tag>STRUTS_2_3_20</tag>
</scm>
</project>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/bundles/admin/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index 66218e8..8e56afe 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-admin-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/bundles/demo/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml
index b3ad827..db7ef3a 100644
--- a/bundles/demo/pom.xml
+++ b/bundles/demo/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-demo-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/bundles/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/pom.xml b/bundles/pom.xml
index dfbf7d8..ba9ece0 100755
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-bundles</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index fb46bf5..590b493 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/plugins/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index e8b7908..ce732c2 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-cdi-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/plugins/codebehind/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml
index a2c8062..6d5a1f4 100644
--- a/plugins/codebehind/pom.xml
+++ b/plugins/codebehind/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-codebehind-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/plugins/config-browser/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml
index b103492..3781eeb 100644
--- a/plugins/config-browser/pom.xml
+++ b/plugins/config-browser/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-config-browser-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/plugins/convention/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index 8e9306e..ae79e7c 100644
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-convention-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/plugins/dojo/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml
index e319348..bd9816f 100644
--- a/plugins/dojo/pom.xml
+++ b/plugins/dojo/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>struts2-plugins</artifactId>
<groupId>org.apache.struts</groupId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/plugins/dwr/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml
index 57dd21c..fa377d0 100644
--- a/plugins/dwr/pom.xml
+++ b/plugins/dwr/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-dwr-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/plugins/embeddedjsp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml
index 7c0f5e7..e76d9bb 100644
--- a/plugins/embeddedjsp/pom.xml
+++ b/plugins/embeddedjsp/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-embeddedjsp-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/plugins/gxp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml
index 222d78b..5f40f00 100644
--- a/plugins/gxp/pom.xml
+++ b/plugins/gxp/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-gxp-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/plugins/jasperreports/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index 85185f0..9f21aeb 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-jasperreports-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/plugins/javatemplates/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
index e23cb03..8ac78fb 100644
--- a/plugins/javatemplates/pom.xml
+++ b/plugins/javatemplates/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-javatemplates-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/plugins/jfreechart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index 9fb67b1..b063e3f 100644
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-jfreechart-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/plugins/jsf/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml
index 88c707c..b4877d0 100644
--- a/plugins/jsf/pom.xml
+++ b/plugins/jsf/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-jsf-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/plugins/json/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml
index 6e713f6..542637b 100644
--- a/plugins/json/pom.xml
+++ b/plugins/json/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-json-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/plugins/junit/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 213e972..d2515a0 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/plugins/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
index fb1cfcc..26b2b5e 100644
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/plugins/oval/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml
index bdd5b47..71232d1 100644
--- a/plugins/oval/pom.xml
+++ b/plugins/oval/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-oval-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/plugins/pell-multipart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml
index 2a13674..9b7f40a 100644
--- a/plugins/pell-multipart/pom.xml
+++ b/plugins/pell-multipart/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-pell-multipart-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/plugins/plexus/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml
index e3a816e..fd6f087 100644
--- a/plugins/plexus/pom.xml
+++ b/plugins/plexus/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-plexus-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 0d0a354..c78a6db 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-plugins</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/plugins/portlet-tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml
index 37fcc82..21354b4 100644
--- a/plugins/portlet-tiles/pom.xml
+++ b/plugins/portlet-tiles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-tiles-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/plugins/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index def9505..075f2a7 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/plugins/rest/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index a2d359c..009ea32 100644
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-rest-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/plugins/sitegraph/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml
index 856fee6..68349a7 100644
--- a/plugins/sitegraph/pom.xml
+++ b/plugins/sitegraph/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-sitegraph-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/plugins/sitemesh/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index 0c06fe1..4c86977 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-sitemesh-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/plugins/spring/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index b7fbb05..8e26c33 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/plugins/struts1/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml
index 23920ef..16c78db 100644
--- a/plugins/struts1/pom.xml
+++ b/plugins/struts1/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-struts1-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/plugins/testng/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml
index 4d879d9..faa4198 100644
--- a/plugins/testng/pom.xml
+++ b/plugins/testng/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-testng-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/plugins/tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index c00b7be..60563ae 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-tiles-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/plugins/tiles3/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles3/pom.xml b/plugins/tiles3/pom.xml
index 2fb5b7b..e7c541f 100644
--- a/plugins/tiles3/pom.xml
+++ b/plugins/tiles3/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-tiles3-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 34b9f3f..94911a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>http://struts.apache.org/</url>
@@ -31,7 +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>STRUTS_2_3_20_1</tag>
+ <tag>STRUTS_2_3_20</tag>
</scm>
<issueManagement>
http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/xwork-core/pom.xml
----------------------------------------------------------------------
diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml
index d97a5e1..bc50cc1 100644
--- a/xwork-core/pom.xml
+++ b/xwork-core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.20.1</version>
+ <version>2.3.20.2-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts.xwork</groupId>
[02/10] struts git commit: Sets SNAPSHOT version to allow release
plugin to work
Posted by lu...@apache.org.
Sets SNAPSHOT version to allow release plugin to work
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/8ab3272d
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/8ab3272d
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/8ab3272d
Branch: refs/heads/master
Commit: 8ab3272d9fd547880f06aa32366f7956628e6630
Parents: 0320310
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sun May 3 20:44:32 2015 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sun May 3 20:44:32 2015 +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 +-
bom/pom.xml | 4 ++--
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 | 2 +-
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 +-
52 files changed, 54 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/apps/blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index 0336a50..ea63abc 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-blank</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/apps/jboss-blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index aa7de05..fcc5612 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-jboss-blank</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/apps/mailreader/pom.xml
----------------------------------------------------------------------
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index 12fc9a9..14d5021 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-mailreader</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index de3584e..0f1fb3d 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-apps</artifactId>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/apps/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index a2cb3d5..dd9dd41 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/apps/rest-showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index 19fbfe6..63ae109 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -26,12 +26,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-rest-showcase</artifactId>
<packaging>war</packaging>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
<name>Struts 2 Rest Showcase Webapp</name>
<description>Struts 2 Rest Showcase Example</description>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/apps/showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index b47657d..c267534 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-showcase</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index 9bcbcc1..ab99ee5 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-archetypes</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/archetypes/struts2-archetype-angularjs/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-angularjs/pom.xml b/archetypes/struts2-archetype-angularjs/pom.xml
index 9e596c0..c1f0b33 100644
--- a/archetypes/struts2-archetype-angularjs/pom.xml
+++ b/archetypes/struts2-archetype-angularjs/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/archetypes/struts2-archetype-blank/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml
index 1cc4328..a9d3393 100644
--- a/archetypes/struts2-archetype-blank/pom.xml
+++ b/archetypes/struts2-archetype-blank/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/archetypes/struts2-archetype-convention/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-convention/pom.xml b/archetypes/struts2-archetype-convention/pom.xml
index 6a94f2c..d20438f 100644
--- a/archetypes/struts2-archetype-convention/pom.xml
+++ b/archetypes/struts2-archetype-convention/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/archetypes/struts2-archetype-dbportlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-dbportlet/pom.xml b/archetypes/struts2-archetype-dbportlet/pom.xml
index 9150794..c1f7d63 100644
--- a/archetypes/struts2-archetype-dbportlet/pom.xml
+++ b/archetypes/struts2-archetype-dbportlet/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/archetypes/struts2-archetype-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-plugin/pom.xml b/archetypes/struts2-archetype-plugin/pom.xml
index ca6bd2f..f055f0c 100644
--- a/archetypes/struts2-archetype-plugin/pom.xml
+++ b/archetypes/struts2-archetype-plugin/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/archetypes/struts2-archetype-portlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml
index 2d68d26..c3b37b9 100644
--- a/archetypes/struts2-archetype-portlet/pom.xml
+++ b/archetypes/struts2-archetype-portlet/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/archetypes/struts2-archetype-starter/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-starter/pom.xml b/archetypes/struts2-archetype-starter/pom.xml
index 3eac13a..8aa6690 100644
--- a/archetypes/struts2-archetype-starter/pom.xml
+++ b/archetypes/struts2-archetype-starter/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 4a66e6f..bf520e6 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-assembly</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/bom/pom.xml
----------------------------------------------------------------------
diff --git a/bom/pom.xml b/bom/pom.xml
index 98e85f4..833c81c 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -9,7 +9,7 @@
</parent>
<artifactId>struts2-bom</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2 Bill of Materials</name>
@@ -24,7 +24,7 @@
</licenses>
<properties>
- <struts-version.version>2.3.20</struts-version.version>
+ <struts-version.version>2.3.20.1-SNAPSHOT</struts-version.version>
</properties>
<dependencyManagement>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/bundles/admin/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index e459db0..28605e7 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-admin-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/bundles/demo/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml
index dda96fc..ccd1730 100644
--- a/bundles/demo/pom.xml
+++ b/bundles/demo/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-demo-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/bundles/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/pom.xml b/bundles/pom.xml
index 76191c2..68cf4e0 100755
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-bundles</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 8c035b3..b77ba3e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/plugins/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index c9e854d..da9306f 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-cdi-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/plugins/codebehind/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml
index c418f1f..9424b7c 100644
--- a/plugins/codebehind/pom.xml
+++ b/plugins/codebehind/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-codebehind-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/plugins/config-browser/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml
index 308f85e..327f6b5 100644
--- a/plugins/config-browser/pom.xml
+++ b/plugins/config-browser/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-config-browser-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/plugins/convention/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index 186deda..e85c767 100644
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-convention-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/plugins/dojo/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml
index 2631cf0..27686fd 100644
--- a/plugins/dojo/pom.xml
+++ b/plugins/dojo/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>struts2-plugins</artifactId>
<groupId>org.apache.struts</groupId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/plugins/dwr/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml
index 23c7dab..e4bf40a 100644
--- a/plugins/dwr/pom.xml
+++ b/plugins/dwr/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-dwr-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/plugins/embeddedjsp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml
index 354cb80..291c3e3 100644
--- a/plugins/embeddedjsp/pom.xml
+++ b/plugins/embeddedjsp/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-embeddedjsp-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/plugins/gxp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml
index 10130ee..1fe993c 100644
--- a/plugins/gxp/pom.xml
+++ b/plugins/gxp/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-gxp-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/plugins/jasperreports/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index 22e1cf9..674be55 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-jasperreports-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/plugins/javatemplates/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
index 529e2f9..2f8fb21 100644
--- a/plugins/javatemplates/pom.xml
+++ b/plugins/javatemplates/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-javatemplates-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/plugins/jfreechart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index 88312e7..c4bccbe 100644
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-jfreechart-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/plugins/jsf/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml
index e187d70..4e964f9 100644
--- a/plugins/jsf/pom.xml
+++ b/plugins/jsf/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-jsf-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/plugins/json/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml
index 4c3c2ea..ad0dcba 100644
--- a/plugins/json/pom.xml
+++ b/plugins/json/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-json-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/plugins/junit/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index e3e80cd..1e88209 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/plugins/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
index 32bec1e..c1ba6cc 100644
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/plugins/oval/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml
index 013951b..06e0ca5 100644
--- a/plugins/oval/pom.xml
+++ b/plugins/oval/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-oval-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/plugins/pell-multipart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml
index 2a4cb63..8f895d1 100644
--- a/plugins/pell-multipart/pom.xml
+++ b/plugins/pell-multipart/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-pell-multipart-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/plugins/plexus/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml
index ee170d3..8adeb88 100644
--- a/plugins/plexus/pom.xml
+++ b/plugins/plexus/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-plexus-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index bb31b7c..2ef2d0c 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-plugins</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/plugins/portlet-tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml
index 6dc0387..a29ab74 100644
--- a/plugins/portlet-tiles/pom.xml
+++ b/plugins/portlet-tiles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-tiles-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/plugins/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index a61b85b..165b94a 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/plugins/rest/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index c0e8361..d09051a 100644
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-rest-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/plugins/sitegraph/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml
index d5cd0f3..a5b963e 100644
--- a/plugins/sitegraph/pom.xml
+++ b/plugins/sitegraph/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-sitegraph-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/plugins/sitemesh/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index d813289..4e1e954 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-sitemesh-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/plugins/spring/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 47bf5cd..58e04be 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/plugins/struts1/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml
index c24327c..ba578fd 100644
--- a/plugins/struts1/pom.xml
+++ b/plugins/struts1/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-struts1-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/plugins/testng/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml
index b2182a2..d371365 100644
--- a/plugins/testng/pom.xml
+++ b/plugins/testng/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-testng-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/plugins/tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 209c3ec..69c3c63 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-tiles-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/plugins/tiles3/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles3/pom.xml b/plugins/tiles3/pom.xml
index bf08c00..a459e80 100644
--- a/plugins/tiles3/pom.xml
+++ b/plugins/tiles3/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-tiles3-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 564b4f4..db13631 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>http://struts.apache.org/</url>
http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/xwork-core/pom.xml
----------------------------------------------------------------------
diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml
index 7e23989..05562ec 100644
--- a/xwork-core/pom.xml
+++ b/xwork-core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.20</version>
+ <version>2.3.20.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts.xwork</groupId>
[08/10] struts git commit: Correct usage of promises and improve
logging in data service
Posted by lu...@apache.org.
Correct usage of promises and improve logging in data service
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/01279636
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/01279636
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/01279636
Branch: refs/heads/master
Commit: 01279636d9160508dc94151e19e47a74ddf319aa
Parents: aa1e50f
Author: Johannes Geppert <jo...@gmail.com>
Authored: Wed May 6 20:49:29 2015 +0200
Committer: Johannes Geppert <jo...@gmail.com>
Committed: Wed May 6 20:49:29 2015 +0200
----------------------------------------------------------------------
.../src/main/webapp/js/controllers.js | 8 ++++----
.../src/main/webapp/js/services.js | 15 ++++++++-------
2 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/01279636/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js
index f0d72f1..07f12d7 100644
--- a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js
+++ b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js
@@ -24,12 +24,12 @@ angularStrutsApp.controller('HomeController', function ($scope) {
$scope.name = "Sunshine";
});
-angularStrutsApp.controller('ApacheProjectsController', function ($scope, DataService) {
+angularStrutsApp.controller('ApacheProjectsController', function ($scope, $log, DataService) {
this.init = function() {
DataService.getProjects().then(function(data) {
- $scope.projects = data.data.projectNames;
- }, function(data) {
- console.log('Could not receive project names.')
+ $scope.projects = data.projectNames;
+ }, function() {
+ $log.error('Could not receive project names.')
});
};
http://git-wip-us.apache.org/repos/asf/struts/blob/01279636/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/services.js
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/services.js b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/services.js
index e3be1de..10ec867 100644
--- a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/services.js
+++ b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/services.js
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-angularStrutsApp.factory('DataService', ['$http', '$q', function($http, $q) {
+angularStrutsApp.factory('DataService', ['$http', '$log', '$q', function($http, $log, $q) {
var DataService = {
urls : {
@@ -32,18 +32,19 @@ angularStrutsApp.factory('DataService', ['$http', '$q', function($http, $q) {
}
var def = $q.defer();
if(method === 'GET') {
- return $http.get(url).success(function(data) {
- DataService.data = data;
+ $http.get(url).success(function(data) {
def.resolve(data);
- }).error(function() {
- def.reject("Failed to get data");
+ }).error(function(data, code) {
+ def.reject(data);
+ $log.error(data, code);
});
} else if(method === 'POST'){
$http.post(url, model).success(function(data) {
DataService.data = data;
def.resolve(data);
- }).error(function() {
- def.reject("Failed to post data");
+ }).error(function(data, code) {
+ def.reject(data);
+ $log.error(data, code);
});
}
return def.promise;
[09/10] struts git commit: Merge branch 'struts-2-3-20-1' into develop
Posted by lu...@apache.org.
Merge branch 'struts-2-3-20-1' into develop
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ebb1e3fe
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ebb1e3fe
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ebb1e3fe
Branch: refs/heads/master
Commit: ebb1e3fe395c4c07191037cc5ff32e7223bd5ac9
Parents: ea098ba f19707c
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri May 15 21:35:40 2015 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri May 15 21:35:40 2015 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
[04/10] struts git commit: Uses proper path to docs
Posted by lu...@apache.org.
Uses proper path to docs
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b01a7d56
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b01a7d56
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b01a7d56
Branch: refs/heads/master
Commit: b01a7d566ad219b6bc5da59d99a592d65b51ccd3
Parents: d832747
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed May 6 07:49:45 2015 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed May 6 07:49:45 2015 +0200
----------------------------------------------------------------------
assembly/pom.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/b01a7d56/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index bf520e6..9e63d43 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -16,6 +16,8 @@
<plugin>
<artifactId>maven-site-plugin</artifactId>
<configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
<generateReports>false</generateReports>
</configuration>
</plugin>
@@ -100,7 +102,7 @@
<arg value="--directory-prefix=${project.build.directory}/cwiki" />
<arg value="--no-check-certificate" />
<arg value="-r" />
- <arg value="http://struts.apache.org/development/2.x/docs/" />
+ <arg value="http://struts.apache.org/docs/" />
</exec>
<delete>
<fileset dir="${project.build.directory}/cwiki/" includes="**/index.*" />
[03/10] struts git commit: Applies better exclude patterns
Posted by lu...@apache.org.
Applies better exclude patterns
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d832747d
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d832747d
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d832747d
Branch: refs/heads/master
Commit: d832747d647df343ed07a58b1b5e540a05a4d51b
Parents: 8ab3272
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sun May 3 20:57:15 2015 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sun May 3 20:57:15 2015 +0200
----------------------------------------------------------------------
core/src/main/resources/struts-default.xml | 18 +++++-------------
.../interceptor/CookieInterceptorTest.java | 5 ++++-
.../security/DefaultExcludedPatternsChecker.java | 12 ++----------
.../DefaultExcludedPatternsCheckerTest.java | 7 +++++--
.../src/test/resources/xwork-param-test.xml | 3 ++-
5 files changed, 18 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/d832747d/core/src/main/resources/struts-default.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index 43f69ed..256d056 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -52,7 +52,7 @@
ognl.TypeConverter,
com.opensymphony.xwork2.ActionContext" />
<!-- this must be valid regex, each '.' in package name must be escaped! -->
- <constant name="struts.excludedPackageNamePatterns" value="^java\.lang\..*,^ognl.*,^javax.*" />
+ <constant name="struts.excludedPackageNamePatterns" value="^java\.lang\..*,^ognl.*,^(?!javax\.servlet\..+)(javax\..+)" />
<bean class="com.opensymphony.xwork2.ObjectFactory" name="struts"/>
<bean type="com.opensymphony.xwork2.factory.ResultFactory" name="struts" class="org.apache.struts2.factory.StrutsResultFactory" />
@@ -224,9 +224,7 @@
<interceptor-ref name="datetime"/>
<interceptor-ref name="multiselect"/>
<interceptor-ref name="actionMappingParams"/>
- <interceptor-ref name="params">
- <param name="excludeParams">^action:.*,^method:.*</param>
- </interceptor-ref>
+ <interceptor-ref name="params"/>
<interceptor-ref name="conversionError"/>
<interceptor-ref name="deprecation"/>
</interceptor-stack>
@@ -281,9 +279,7 @@
<interceptor-ref name="checkbox"/>
<interceptor-ref name="datetime"/>
<interceptor-ref name="multiselect"/>
- <interceptor-ref name="params">
- <param name="excludeParams">^action:.*,^method:.*</param>
- </interceptor-ref>
+ <interceptor-ref name="params"/>
<interceptor-ref name="servletConfig"/>
<interceptor-ref name="prepare"/>
<interceptor-ref name="chain"/>
@@ -291,9 +287,7 @@
<interceptor-ref name="fileUpload"/>
<interceptor-ref name="staticParams"/>
<interceptor-ref name="actionMappingParams"/>
- <interceptor-ref name="params">
- <param name="excludeParams">^action:.*,^method:.*</param>
- </interceptor-ref>
+ <interceptor-ref name="params"/>
<interceptor-ref name="conversionError"/>
<interceptor-ref name="validation">
<param name="excludeMethods">input,back,cancel,browse</param>
@@ -329,9 +323,7 @@
<interceptor-ref name="multiselect"/>
<interceptor-ref name="staticParams"/>
<interceptor-ref name="actionMappingParams"/>
- <interceptor-ref name="params">
- <param name="excludeParams">^action:.*,^method:.*</param>
- </interceptor-ref>
+ <interceptor-ref name="params"/>
<interceptor-ref name="conversionError"/>
<interceptor-ref name="validation">
<param name="excludeMethods">input,back,cancel,browse</param>
http://git-wip-us.apache.org/repos/asf/struts/blob/d832747d/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
----------------------------------------------------------------------
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 a531a69..170d7b5 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
@@ -27,6 +27,7 @@ import java.util.Map;
import javax.servlet.http.Cookie;
+import com.opensymphony.xwork2.security.DefaultAcceptedPatternsChecker;
import com.opensymphony.xwork2.security.DefaultExcludedPatternsChecker;
import com.opensymphony.xwork2.mock.MockActionInvocation;
import org.easymock.MockControl;
@@ -370,7 +371,9 @@ public class CookieInterceptorTest extends StrutsInternalTestCase {
return accepted;
}
};
- interceptor.setExcludedPatternsChecker(new DefaultExcludedPatternsChecker());
+ DefaultExcludedPatternsChecker excludedPatternsChecker = new DefaultExcludedPatternsChecker();
+ excludedPatternsChecker.setAdditionalExcludePatterns(".*(^|\\.|\\[|'|\")class(\\.|\\[|'|\").*");
+ interceptor.setExcludedPatternsChecker(excludedPatternsChecker);
interceptor.setCookiesName("*");
MockActionInvocation invocation = new MockActionInvocation();
http://git-wip-us.apache.org/repos/asf/struts/blob/d832747d/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java b/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
index 8878dd2..d96b67a 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
@@ -16,16 +16,8 @@ public class DefaultExcludedPatternsChecker implements ExcludedPatternsChecker {
private static final Logger LOG = LoggerFactory.getLogger(DefaultExcludedPatternsChecker.class);
public static final String[] EXCLUDED_PATTERNS = {
- "(.*\\.|^|.*|\\[('|\"))\\bclass(\\.|('|\")]|\\[).*",
- "(^|.*#)dojo(\\.|\\[).*",
- "(^|.*#)struts(\\.|\\[).*",
- "(^|.*#)session(\\.|\\[).*",
- "(^|.*#)request(\\.|\\[).*",
- "(^|.*#)application(\\.|\\[).*",
- "(^|.*#)servlet(Request|Response)(\\.|\\[).*",
- "(^|.*#)parameters(\\.|\\[).*",
- "(^|.*#)context(\\.|\\[).*",
- "(^|.*#)_memberAccess(\\.|\\[).*"
+ "(^|.*#)(dojo|struts|session|request|application|servlet(Request|Response)|parameters|context|_memberAccess)(\\.|\\[).*",
+ "^(action|method):.*"
};
private Set<Pattern> excludedPatterns;
http://git-wip-us.apache.org/repos/asf/struts/blob/d832747d/xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java
index 5c9276c..22e4a73 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java
@@ -53,7 +53,8 @@ public class DefaultExcludedPatternsCheckerTest extends XWorkTestCase {
}
};
- ExcludedPatternsChecker checker = new DefaultExcludedPatternsChecker();
+ DefaultExcludedPatternsChecker checker = new DefaultExcludedPatternsChecker();
+ checker.setAdditionalExcludePatterns(".*(^|\\.|\\[|'|\")class(\\.|\\[|'|\").*");
for (String param : params) {
// when
@@ -71,6 +72,8 @@ public class DefaultExcludedPatternsCheckerTest extends XWorkTestCase {
properParams.add("form.eventClass");
properParams.add("form[\"eventClass\"]");
properParams.add("form['eventClass']");
+ properParams.add("class.super@demo.com");
+ properParams.add("super.class@demo.com");
ExcludedPatternsChecker checker = new DefaultExcludedPatternsChecker();
@@ -100,4 +103,4 @@ public class DefaultExcludedPatternsCheckerTest extends XWorkTestCase {
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/struts/blob/d832747d/xwork-core/src/test/resources/xwork-param-test.xml
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/resources/xwork-param-test.xml b/xwork-core/src/test/resources/xwork-param-test.xml
index 01787f7..7a97df1 100644
--- a/xwork-core/src/test/resources/xwork-param-test.xml
+++ b/xwork-core/src/test/resources/xwork-param-test.xml
@@ -5,4 +5,5 @@
<xwork>
<constant name="devMode" value="true" />
<constant name="ognlExcludedClasses" value="java.lang.Object,java.lang.Runtime" />
-</xwork>
\ No newline at end of file
+ <constant name="additionalExcludedPatterns" value=".*(^|\.|\[|\'|")class(\.|\[|\'|").*" />
+</xwork>
[05/10] struts git commit: [maven-release-plugin] prepare release
STRUTS_2_3_20_1
Posted by lu...@apache.org.
[maven-release-plugin] prepare release STRUTS_2_3_20_1
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a9974eec
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a9974eec
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a9974eec
Branch: refs/heads/master
Commit: a9974eec5689a7113a6fb1e2096252f0935064dd
Parents: b01a7d5
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed May 6 07:57:47 2015 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed May 6 07:57:47 2015 +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 +-
bom/pom.xml | 6 +++---
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 | 2 +-
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 +-
52 files changed, 56 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/apps/blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index ea63abc..248904b 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-blank</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/apps/jboss-blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index fcc5612..90747fd 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-jboss-blank</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/apps/mailreader/pom.xml
----------------------------------------------------------------------
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index 14d5021..7c2418a 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-mailreader</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index 0f1fb3d..3ad67ae 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-apps</artifactId>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/apps/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index dd9dd41..9bfce96 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-portlet</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/apps/rest-showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index 63ae109..d0ad4e6 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -26,12 +26,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-rest-showcase</artifactId>
<packaging>war</packaging>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
<name>Struts 2 Rest Showcase Webapp</name>
<description>Struts 2 Rest Showcase Example</description>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/apps/showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index c267534..38851ba 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-showcase</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index ab99ee5..f35b03a 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-archetypes</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/archetypes/struts2-archetype-angularjs/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-angularjs/pom.xml b/archetypes/struts2-archetype-angularjs/pom.xml
index c1f0b33..fbb2de4 100644
--- a/archetypes/struts2-archetype-angularjs/pom.xml
+++ b/archetypes/struts2-archetype-angularjs/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/archetypes/struts2-archetype-blank/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml
index a9d3393..4818cc8 100644
--- a/archetypes/struts2-archetype-blank/pom.xml
+++ b/archetypes/struts2-archetype-blank/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/archetypes/struts2-archetype-convention/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-convention/pom.xml b/archetypes/struts2-archetype-convention/pom.xml
index d20438f..6a0eaff 100644
--- a/archetypes/struts2-archetype-convention/pom.xml
+++ b/archetypes/struts2-archetype-convention/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/archetypes/struts2-archetype-dbportlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-dbportlet/pom.xml b/archetypes/struts2-archetype-dbportlet/pom.xml
index c1f7d63..a6ac1da 100644
--- a/archetypes/struts2-archetype-dbportlet/pom.xml
+++ b/archetypes/struts2-archetype-dbportlet/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/archetypes/struts2-archetype-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-plugin/pom.xml b/archetypes/struts2-archetype-plugin/pom.xml
index f055f0c..9a94f4e 100644
--- a/archetypes/struts2-archetype-plugin/pom.xml
+++ b/archetypes/struts2-archetype-plugin/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/archetypes/struts2-archetype-portlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml
index c3b37b9..362234d 100644
--- a/archetypes/struts2-archetype-portlet/pom.xml
+++ b/archetypes/struts2-archetype-portlet/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/archetypes/struts2-archetype-starter/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-starter/pom.xml b/archetypes/struts2-archetype-starter/pom.xml
index 8aa6690..e568bb8 100644
--- a/archetypes/struts2-archetype-starter/pom.xml
+++ b/archetypes/struts2-archetype-starter/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 9e63d43..31a1210 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-assembly</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/bom/pom.xml
----------------------------------------------------------------------
diff --git a/bom/pom.xml b/bom/pom.xml
index 833c81c..d500915 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -9,7 +9,7 @@
</parent>
<artifactId>struts2-bom</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
<packaging>pom</packaging>
<name>Struts 2 Bill of Materials</name>
@@ -24,7 +24,7 @@
</licenses>
<properties>
- <struts-version.version>2.3.20.1-SNAPSHOT</struts-version.version>
+ <struts-version.version>2.3.20.1</struts-version.version>
</properties>
<dependencyManagement>
@@ -183,6 +183,6 @@
</dependencyManagement>
<scm>
- <tag>STRUTS_2_3_20</tag>
+ <tag>STRUTS_2_3_20_1</tag>
</scm>
</project>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/bundles/admin/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index 28605e7..66218e8 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-osgi-admin-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/bundles/demo/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml
index ccd1730..b3ad827 100644
--- a/bundles/demo/pom.xml
+++ b/bundles/demo/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-osgi-demo-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/bundles/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/pom.xml b/bundles/pom.xml
index 68cf4e0..dfbf7d8 100755
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-osgi-bundles</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index b77ba3e..fb46bf5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/plugins/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index da9306f..e8b7908 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-cdi-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/plugins/codebehind/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml
index 9424b7c..a2c8062 100644
--- a/plugins/codebehind/pom.xml
+++ b/plugins/codebehind/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-codebehind-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/plugins/config-browser/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml
index 327f6b5..b103492 100644
--- a/plugins/config-browser/pom.xml
+++ b/plugins/config-browser/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-config-browser-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/plugins/convention/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index e85c767..8e9306e 100644
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-convention-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/plugins/dojo/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml
index 27686fd..e319348 100644
--- a/plugins/dojo/pom.xml
+++ b/plugins/dojo/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>struts2-plugins</artifactId>
<groupId>org.apache.struts</groupId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/plugins/dwr/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml
index e4bf40a..57dd21c 100644
--- a/plugins/dwr/pom.xml
+++ b/plugins/dwr/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-dwr-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/plugins/embeddedjsp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml
index 291c3e3..7c0f5e7 100644
--- a/plugins/embeddedjsp/pom.xml
+++ b/plugins/embeddedjsp/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-embeddedjsp-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/plugins/gxp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml
index 1fe993c..222d78b 100644
--- a/plugins/gxp/pom.xml
+++ b/plugins/gxp/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-gxp-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/plugins/jasperreports/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index 674be55..85185f0 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-jasperreports-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/plugins/javatemplates/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
index 2f8fb21..e23cb03 100644
--- a/plugins/javatemplates/pom.xml
+++ b/plugins/javatemplates/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-javatemplates-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/plugins/jfreechart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index c4bccbe..9fb67b1 100644
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-jfreechart-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/plugins/jsf/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml
index 4e964f9..88c707c 100644
--- a/plugins/jsf/pom.xml
+++ b/plugins/jsf/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-jsf-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/plugins/json/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml
index ad0dcba..6e713f6 100644
--- a/plugins/json/pom.xml
+++ b/plugins/json/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-json-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/plugins/junit/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 1e88209..213e972 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/plugins/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
index c1ba6cc..fb1cfcc 100644
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-osgi-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/plugins/oval/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml
index 06e0ca5..bdd5b47 100644
--- a/plugins/oval/pom.xml
+++ b/plugins/oval/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-oval-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/plugins/pell-multipart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml
index 8f895d1..2a13674 100644
--- a/plugins/pell-multipart/pom.xml
+++ b/plugins/pell-multipart/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-pell-multipart-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/plugins/plexus/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml
index 8adeb88..e3a816e 100644
--- a/plugins/plexus/pom.xml
+++ b/plugins/plexus/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-plexus-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 2ef2d0c..0d0a354 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-plugins</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/plugins/portlet-tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml
index a29ab74..37fcc82 100644
--- a/plugins/portlet-tiles/pom.xml
+++ b/plugins/portlet-tiles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-portlet-tiles-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/plugins/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index 165b94a..def9505 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-portlet-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/plugins/rest/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index d09051a..a2d359c 100644
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-rest-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/plugins/sitegraph/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml
index a5b963e..856fee6 100644
--- a/plugins/sitegraph/pom.xml
+++ b/plugins/sitegraph/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-sitegraph-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/plugins/sitemesh/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index 4e1e954..0c06fe1 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-sitemesh-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/plugins/spring/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 58e04be..b7fbb05 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/plugins/struts1/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml
index ba578fd..23920ef 100644
--- a/plugins/struts1/pom.xml
+++ b/plugins/struts1/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-struts1-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/plugins/testng/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml
index d371365..4d879d9 100644
--- a/plugins/testng/pom.xml
+++ b/plugins/testng/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-testng-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/plugins/tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 69c3c63..c00b7be 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-tiles-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/plugins/tiles3/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles3/pom.xml b/plugins/tiles3/pom.xml
index a459e80..2fb5b7b 100644
--- a/plugins/tiles3/pom.xml
+++ b/plugins/tiles3/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<artifactId>struts2-tiles3-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index db13631..34b9f3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>http://struts.apache.org/</url>
@@ -31,7 +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>STRUTS_2_3_20</tag>
+ <tag>STRUTS_2_3_20_1</tag>
</scm>
<issueManagement>
http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/xwork-core/pom.xml
----------------------------------------------------------------------
diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml
index 05562ec..d97a5e1 100644
--- a/xwork-core/pom.xml
+++ b/xwork-core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.20.1-SNAPSHOT</version>
+ <version>2.3.20.1</version>
</parent>
<groupId>org.apache.struts.xwork</groupId>
[07/10] struts git commit: Remove unused dependency from
ApacheProjectsController
Posted by lu...@apache.org.
Remove unused dependency from ApacheProjectsController
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/aa1e50f4
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/aa1e50f4
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/aa1e50f4
Branch: refs/heads/master
Commit: aa1e50f4124f5861a2ea9a4014c897bf29a59d1b
Parents: ea098ba
Author: Johannes Geppert <jo...@gmail.com>
Authored: Wed May 6 20:34:35 2015 +0200
Committer: Johannes Geppert <jo...@gmail.com>
Committed: Wed May 6 20:34:35 2015 +0200
----------------------------------------------------------------------
.../archetype-resources/src/main/webapp/js/controllers.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/aa1e50f4/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js
index ed57b00..f0d72f1 100644
--- a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js
+++ b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js
@@ -24,7 +24,7 @@ angularStrutsApp.controller('HomeController', function ($scope) {
$scope.name = "Sunshine";
});
-angularStrutsApp.controller('ApacheProjectsController', function ($scope, $http, DataService) {
+angularStrutsApp.controller('ApacheProjectsController', function ($scope, DataService) {
this.init = function() {
DataService.getProjects().then(function(data) {
$scope.projects = data.data.projectNames;