[4/7] struts git commit: [maven-release-plugin] prepare release STRUTS_2_3_20_1
[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/develop Commit: a9974eec5689a7113a6fb1e2096252f0935064dd Parents: b01a7d5 Author: Lukasz Lenart lukaszlen...@apache.org Authored: Wed May 6 07:57:47 2015 +0200 Committer: Lukasz Lenart lukaszlen...@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 groupIdorg.apache.struts/groupId artifactIdstruts2-apps/artifactId -version2.3.20.1-SNAPSHOT/version +version2.3.20.1/version /parent artifactIdstruts2-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 groupIdorg.apache.struts/groupId artifactIdstruts2-apps/artifactId -version2.3.20.1-SNAPSHOT/version +version2.3.20.1/version /parent artifactIdstruts2-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
Git Push Summary
Repository: struts Updated Branches: refs/heads/struts-2-3-20-1 [deleted] f19707cb7
[5/7] struts git commit: [maven-release-plugin] prepare for next development iteration
[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/develop Commit: f19707cb760bbc2d4a055d946350d392b924bc89 Parents: a9974ee Author: Lukasz Lenart lukaszlen...@apache.org Authored: Wed May 6 07:59:11 2015 +0200 Committer: Lukasz Lenart lukaszlen...@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 groupIdorg.apache.struts/groupId artifactIdstruts2-apps/artifactId -version2.3.20.1/version +version2.3.20.2-SNAPSHOT/version /parent artifactIdstruts2-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 groupIdorg.apache.struts/groupId artifactIdstruts2-apps/artifactId -version2.3.20.1/version +version2.3.20.2-SNAPSHOT/version /parent artifactIdstruts2-jboss-blank/artifactId http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/apps/mailreader/pom.xml -- diff --git
[2/7] struts git commit: Applies better exclude patterns
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/develop Commit: d832747d647df343ed07a58b1b5e540a05a4d51b Parents: 8ab3272 Author: Lukasz Lenart lukaszlen...@apache.org Authored: Sun May 3 20:57:15 2015 +0200 Committer: Lukasz Lenart lukaszlen...@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=excludeMethodsinput,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=excludeMethodsinput,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
[3/7] struts git commit: Uses proper path to docs
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/develop
Commit: b01a7d566ad219b6bc5da59d99a592d65b51ccd3
Parents: d832747
Author: Lukasz Lenart lukaszlen...@apache.org
Authored: Wed May 6 07:49:45 2015 +0200
Committer: Lukasz Lenart lukaszlen...@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
artifactIdmaven-site-plugin/artifactId
configuration
+skiptrue/skip
+skipDeploytrue/skipDeploy
generateReportsfalse/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.* /
[6/7] struts git commit: Merge branch 'struts-2-3-20-1' into develop
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/develop Commit: ebb1e3fe395c4c07191037cc5ff32e7223bd5ac9 Parents: ea098ba f19707c Author: Lukasz Lenart lukaszlen...@apache.org Authored: Fri May 15 21:35:40 2015 +0200 Committer: Lukasz Lenart lukaszlen...@apache.org Committed: Fri May 15 21:35:40 2015 +0200 -- --
