struts git commit: [maven-release-plugin] prepare for next development iteration

2016-06-13 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/support-2-3 bb22c585b -> 730441b7a


[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/730441b7
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/730441b7
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/730441b7

Branch: refs/heads/support-2-3
Commit: 730441b7a7ca6d760ed7d96e149d9765bcad7a01
Parents: bb22c58
Author: Lukasz Lenart 
Authored: Tue Jun 14 07:11:10 2016 +0200
Committer: Lukasz Lenart 
Committed: Tue Jun 14 07:11:10 2016 +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/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 | 4 ++--
 xwork-core/pom.xml  | 2 +-
 53 files changed, 57 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/730441b7/apps/blank/pom.xml
--
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index bb6f3ac..09d6154 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.3.29
+2.3.30-SNAPSHOT
 
 
 struts2-blank

http://git-wip-us.apache.org/repos/asf/struts/blob/730441b7/apps/jboss-blank/pom.xml
--
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index 33e7115..3ec8438 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.3.29
+2.3.30-SNAPSHOT
 
 
 struts2-jboss-blank

http://git-wip-us.apache.org/repos/asf/struts/blob/730441b7/apps/mailreader/pom.xml
--
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index 3efeee6..8513ab1

[struts] Git Push Summary

2016-06-13 Thread lukaszlenart 
Repository: struts
Updated Tags:  refs/tags/STRUTS_2_3_29 [created] 32cf3321c

struts git commit: [maven-release-plugin] prepare release STRUTS_2_3_29

2016-06-13 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/support-2-3 eccc31ebc -> bb22c585b


[maven-release-plugin] prepare release STRUTS_2_3_29


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

Branch: refs/heads/support-2-3
Commit: bb22c585b5b52967fab033dba02cd244cd5b5b7a
Parents: eccc31e
Author: Lukasz Lenart 
Authored: Tue Jun 14 07:10:57 2016 +0200
Committer: Lukasz Lenart 
Committed: Tue Jun 14 07:10:57 2016 +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/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 | 4 ++--
 xwork-core/pom.xml  | 2 +-
 53 files changed, 57 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/bb22c585/apps/blank/pom.xml
--
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index fc6d5bb..bb6f3ac 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.3.29-SNAPSHOT
+2.3.29
 
 
 struts2-blank

http://git-wip-us.apache.org/repos/asf/struts/blob/bb22c585/apps/jboss-blank/pom.xml
--
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index 755ee49..33e7115 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.3.29-SNAPSHOT
+2.3.29
 
 
 struts2-jboss-blank

http://git-wip-us.apache.org/repos/asf/struts/blob/bb22c585/apps/mailreader/pom.xml
--
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index 779cde7..3efeee6 100644
---

struts git commit: Improves validation RegEx

2016-06-13 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/master 7621c2bc9 -> a0fdca138


Improves validation RegEx


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

Branch: refs/heads/master
Commit: a0fdca138feec2c2e94eb75ca1f8b76678b4d152
Parents: 7621c2b
Author: Lukasz Lenart 
Authored: Tue Jun 14 06:53:36 2016 +0200
Committer: Lukasz Lenart 
Committed: Tue Jun 14 07:02:09 2016 +0200

--
 .../com/opensymphony/xwork2/validator/validators/URLValidator.java | 2 +-
 .../java/com/opensymphony/xwork2/validator/URLValidatorTest.java   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/a0fdca13/core/src/main/java/com/opensymphony/xwork2/validator/validators/URLValidator.java
--
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/validator/validators/URLValidator.java
 
b/core/src/main/java/com/opensymphony/xwork2/validator/validators/URLValidator.java
index f49d914..fd678a7 100644
--- 
a/core/src/main/java/com/opensymphony/xwork2/validator/validators/URLValidator.java
+++ 
b/core/src/main/java/com/opensymphony/xwork2/validator/validators/URLValidator.java
@@ -81,7 +81,7 @@ public class URLValidator extends FieldValidatorSupport {
 "|((\\d|[1-9]\\d|1\\d{2}|2[0-4][0-9]|25[0-5])\\.){3}" +
 "(\\d|[1-9]\\d|1\\d{2}|2[0-4][0-9]|25[0-5])" +
 ")(:\\d+)?" +
-
")(((\\/+([a-z0-9$_\\.\\+!\\*\\'\\(\\),;:@&=-]|%[0-9a-f]{2})*)*" +
+
")(((\\/{0,1}([a-z0-9$_\\.\\+!\\*\\'\\(\\),;:@&=-]|%[0-9a-f]{2})*)*" +
 
"(\\?([a-z0-9$_\\.\\+!\\*\\'\\(\\),;:@&=-]|%[0-9a-f]{2})*)" +
 "?)?)?" +
 "(#([a-z0-9$_\\.\\+!\\*\\'\\(\\),;:@&=-]|%[0-9a-f]{2})*)?" 
+

http://git-wip-us.apache.org/repos/asf/struts/blob/a0fdca13/core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java
--
diff --git 
a/core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java 
b/core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java
index 2895d80..77223eb 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java
@@ -138,6 +138,7 @@ public class URLValidatorTest extends XWorkTestCase {
 assertFalse(pattern.matcher("").matches());
 assertFalse(pattern.matcher("   ").matches());
 assertFalse(pattern.matcher("no url").matches());
+   
assertFalse(pattern.matcher("http://example.com??;).matches());
 
 assertTrue(pattern.matcher("http://www.opensymphony.com;).matches());
 assertTrue(pattern.matcher("https://www.opensymphony.com;).matches());

struts git commit: Improves validation RegEx

2016-06-13 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/support-2-3 1c92a8b2c -> eccc31ebc


Improves validation RegEx


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

Branch: refs/heads/support-2-3
Commit: eccc31ebce5430f9e91b9684c63eaaf885e603f9
Parents: 1c92a8b
Author: Lukasz Lenart 
Authored: Tue Jun 14 06:53:36 2016 +0200
Committer: Lukasz Lenart 
Committed: Tue Jun 14 06:53:36 2016 +0200

--
 .../com/opensymphony/xwork2/validator/validators/URLValidator.java | 2 +-
 .../java/com/opensymphony/xwork2/validator/URLValidatorTest.java   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/eccc31eb/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/URLValidator.java
--
diff --git 
a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/URLValidator.java
 
b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/URLValidator.java
index 767416d..9aa3c9d 100644
--- 
a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/URLValidator.java
+++ 
b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/URLValidator.java
@@ -82,7 +82,7 @@ public class URLValidator extends FieldValidatorSupport {
 "|((\\d|[1-9]\\d|1\\d{2}|2[0-4][0-9]|25[0-5])\\.){3}" +
 "(\\d|[1-9]\\d|1\\d{2}|2[0-4][0-9]|25[0-5])" +
 ")(:\\d+)?" +
-
")(((\\/+([a-z0-9$_\\.\\+!\\*\\'\\(\\),;:@&=-]|%[0-9a-f]{2})*)*" +
+
")(((\\/{0,1}([a-z0-9$_\\.\\+!\\*\\'\\(\\),;:@&=-]|%[0-9a-f]{2})*)*" +
 
"(\\?([a-z0-9$_\\.\\+!\\*\\'\\(\\),;:@&=-]|%[0-9a-f]{2})*)" +
 "?)?)?" +
 "(#([a-z0-9$_\\.\\+!\\*\\'\\(\\),;:@&=-]|%[0-9a-f]{2})*)?" 
+

http://git-wip-us.apache.org/repos/asf/struts/blob/eccc31eb/xwork-core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java
--
diff --git 
a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java
 
b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java
index f495557..da9806a 100644
--- 
a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java
+++ 
b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java
@@ -139,6 +139,7 @@ public class URLValidatorTest extends XWorkTestCase {
 assertFalse(pattern.matcher("").matches());
 assertFalse(pattern.matcher("   ").matches());
 assertFalse(pattern.matcher("no url").matches());
+   
assertFalse(pattern.matcher("http://example.com??;).matches());
 
 assertTrue(pattern.matcher("http://www.opensymphony.com;).matches());
 assertTrue(pattern.matcher("https://www.opensymphony.com;).matches());