svn commit: r13313 - /dev/struts/2.3.24.3/
Author: lukaszlenart Date: Wed Apr 20 13:17:01 2016 New Revision: 13313 Log: Updates test release 2.3.24.3 Added: dev/struts/2.3.24.3/ dev/struts/2.3.24.3/struts-2.3.24.3-all.zip (with props) dev/struts/2.3.24.3/struts-2.3.24.3-all.zip.asc (with props) dev/struts/2.3.24.3/struts-2.3.24.3-all.zip.md5 dev/struts/2.3.24.3/struts-2.3.24.3-all.zip.sha1 dev/struts/2.3.24.3/struts-2.3.24.3-apps.zip (with props) dev/struts/2.3.24.3/struts-2.3.24.3-apps.zip.asc (with props) dev/struts/2.3.24.3/struts-2.3.24.3-apps.zip.md5 dev/struts/2.3.24.3/struts-2.3.24.3-apps.zip.sha1 dev/struts/2.3.24.3/struts-2.3.24.3-docs.zip (with props) dev/struts/2.3.24.3/struts-2.3.24.3-docs.zip.asc (with props) dev/struts/2.3.24.3/struts-2.3.24.3-docs.zip.md5 dev/struts/2.3.24.3/struts-2.3.24.3-docs.zip.sha1 dev/struts/2.3.24.3/struts-2.3.24.3-lib.zip (with props) dev/struts/2.3.24.3/struts-2.3.24.3-lib.zip.asc (with props) dev/struts/2.3.24.3/struts-2.3.24.3-lib.zip.md5 dev/struts/2.3.24.3/struts-2.3.24.3-lib.zip.sha1 dev/struts/2.3.24.3/struts-2.3.24.3-src.zip (with props) dev/struts/2.3.24.3/struts-2.3.24.3-src.zip.asc (with props) dev/struts/2.3.24.3/struts-2.3.24.3-src.zip.md5 dev/struts/2.3.24.3/struts-2.3.24.3-src.zip.sha1 Added: dev/struts/2.3.24.3/struts-2.3.24.3-all.zip == Binary file - no diff available. Propchange: dev/struts/2.3.24.3/struts-2.3.24.3-all.zip -- svn:mime-type = application/zip Added: dev/struts/2.3.24.3/struts-2.3.24.3-all.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.3.24.3/struts-2.3.24.3-all.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.3.24.3/struts-2.3.24.3-all.zip.md5 == --- dev/struts/2.3.24.3/struts-2.3.24.3-all.zip.md5 (added) +++ dev/struts/2.3.24.3/struts-2.3.24.3-all.zip.md5 Wed Apr 20 13:17:01 2016 @@ -0,0 +1 @@ +66e8fc4d3037080d0b0ba5def5c1e57a \ No newline at end of file Added: dev/struts/2.3.24.3/struts-2.3.24.3-all.zip.sha1 == --- dev/struts/2.3.24.3/struts-2.3.24.3-all.zip.sha1 (added) +++ dev/struts/2.3.24.3/struts-2.3.24.3-all.zip.sha1 Wed Apr 20 13:17:01 2016 @@ -0,0 +1 @@ +ea6144dd71000d2df7c6b7c47eae5919284bd1db \ No newline at end of file Added: dev/struts/2.3.24.3/struts-2.3.24.3-apps.zip == Binary file - no diff available. Propchange: dev/struts/2.3.24.3/struts-2.3.24.3-apps.zip -- svn:mime-type = application/zip Added: dev/struts/2.3.24.3/struts-2.3.24.3-apps.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.3.24.3/struts-2.3.24.3-apps.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.3.24.3/struts-2.3.24.3-apps.zip.md5 == --- dev/struts/2.3.24.3/struts-2.3.24.3-apps.zip.md5 (added) +++ dev/struts/2.3.24.3/struts-2.3.24.3-apps.zip.md5 Wed Apr 20 13:17:01 2016 @@ -0,0 +1 @@ +efabb8a68c132a1cff4ba3b294650912 \ No newline at end of file Added: dev/struts/2.3.24.3/struts-2.3.24.3-apps.zip.sha1 == --- dev/struts/2.3.24.3/struts-2.3.24.3-apps.zip.sha1 (added) +++ dev/struts/2.3.24.3/struts-2.3.24.3-apps.zip.sha1 Wed Apr 20 13:17:01 2016 @@ -0,0 +1 @@ +ebec05681fb1e82862516bbac18176a1ed6c73b1 \ No newline at end of file Added: dev/struts/2.3.24.3/struts-2.3.24.3-docs.zip == Binary file - no diff available. Propchange: dev/struts/2.3.24.3/struts-2.3.24.3-docs.zip -- svn:mime-type = application/zip Added: dev/struts/2.3.24.3/struts-2.3.24.3-docs.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.3.24.3/struts-2.3.24.3-docs.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.3.24.3/struts-2.3.24.3-docs.zip.md5 == ---
[struts] Git Push Summary
Repository: struts Updated Tags: refs/tags/STRUTS_2_3_24_3 [created] ace0e4524
[1/2] struts git commit: Cleans up excludedClasses
Repository: struts Updated Branches: refs/heads/struts-2-3-24-2 ebc8222e7 -> 36b6fff05 Cleans up excludedClasses Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/036307bc Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/036307bc Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/036307bc Branch: refs/heads/struts-2-3-24-2 Commit: 036307bc089f717de590ae2a1ecdef2f27adfb50 Parents: ebc8222 Author: Lukasz LenartAuthored: Wed Apr 20 13:57:06 2016 +0200 Committer: Lukasz Lenart Committed: Wed Apr 20 13:57:06 2016 +0200 -- core/src/main/resources/struts-default.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/036307bc/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 56621a7..f56651d 100644 --- a/core/src/main/resources/struts-default.xml +++ b/core/src/main/resources/struts-default.xml @@ -46,8 +46,8 @@ java.lang.Class, java.lang.ClassLoader, java.lang.Shutdown, +java.lang.ProcessBuilder, ognl.OgnlContext, -ognl.MemberAccess, ognl.ClassResolver, ognl.TypeConverter, ognl.MemberAccess,
[2/2] struts git commit: [maven-release-plugin] prepare release STRUTS_2_3_24_3
[maven-release-plugin] prepare release STRUTS_2_3_24_3 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/36b6fff0 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/36b6fff0 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/36b6fff0 Branch: refs/heads/struts-2-3-24-2 Commit: 36b6fff05cd4a17f75b091c0edd52e0c1e65ec06 Parents: 036307b Author: Lukasz LenartAuthored: Wed Apr 20 14:03:19 2016 +0200 Committer: Lukasz Lenart Committed: Wed Apr 20 14:03:19 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/36b6fff0/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index ef0ab4a..8be1f92 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.24.3-SNAPSHOT +2.3.24.3 struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/36b6fff0/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 8a25311..baad2cd 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.24.3-SNAPSHOT +2.3.24.3 struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/36b6fff0/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 1072f39..3412350 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@
svn commit: r13309 - /dev/struts/2.3.20.3/
Author: lukaszlenart Date: Wed Apr 20 11:46:43 2016 New Revision: 13309 Log: Updates test release 2.3.20.3 Added: dev/struts/2.3.20.3/ dev/struts/2.3.20.3/struts-2.3.20.3-all.zip (with props) dev/struts/2.3.20.3/struts-2.3.20.3-all.zip.asc (with props) dev/struts/2.3.20.3/struts-2.3.20.3-all.zip.md5 dev/struts/2.3.20.3/struts-2.3.20.3-all.zip.sha1 dev/struts/2.3.20.3/struts-2.3.20.3-apps.zip (with props) dev/struts/2.3.20.3/struts-2.3.20.3-apps.zip.asc (with props) dev/struts/2.3.20.3/struts-2.3.20.3-apps.zip.md5 dev/struts/2.3.20.3/struts-2.3.20.3-apps.zip.sha1 dev/struts/2.3.20.3/struts-2.3.20.3-docs.zip (with props) dev/struts/2.3.20.3/struts-2.3.20.3-docs.zip.asc (with props) dev/struts/2.3.20.3/struts-2.3.20.3-docs.zip.md5 dev/struts/2.3.20.3/struts-2.3.20.3-docs.zip.sha1 dev/struts/2.3.20.3/struts-2.3.20.3-lib.zip (with props) dev/struts/2.3.20.3/struts-2.3.20.3-lib.zip.asc (with props) dev/struts/2.3.20.3/struts-2.3.20.3-lib.zip.md5 dev/struts/2.3.20.3/struts-2.3.20.3-lib.zip.sha1 dev/struts/2.3.20.3/struts-2.3.20.3-src.zip (with props) dev/struts/2.3.20.3/struts-2.3.20.3-src.zip.asc (with props) dev/struts/2.3.20.3/struts-2.3.20.3-src.zip.md5 dev/struts/2.3.20.3/struts-2.3.20.3-src.zip.sha1 Added: dev/struts/2.3.20.3/struts-2.3.20.3-all.zip == Binary file - no diff available. Propchange: dev/struts/2.3.20.3/struts-2.3.20.3-all.zip -- svn:mime-type = application/zip Added: dev/struts/2.3.20.3/struts-2.3.20.3-all.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.3.20.3/struts-2.3.20.3-all.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.3.20.3/struts-2.3.20.3-all.zip.md5 == --- dev/struts/2.3.20.3/struts-2.3.20.3-all.zip.md5 (added) +++ dev/struts/2.3.20.3/struts-2.3.20.3-all.zip.md5 Wed Apr 20 11:46:43 2016 @@ -0,0 +1 @@ +521ecdeb2cfc276e1d72e928324a92f1 \ No newline at end of file Added: dev/struts/2.3.20.3/struts-2.3.20.3-all.zip.sha1 == --- dev/struts/2.3.20.3/struts-2.3.20.3-all.zip.sha1 (added) +++ dev/struts/2.3.20.3/struts-2.3.20.3-all.zip.sha1 Wed Apr 20 11:46:43 2016 @@ -0,0 +1 @@ +6ee360cf44d451bf2e5a5f1d0f32ec21e21dd36c \ No newline at end of file Added: dev/struts/2.3.20.3/struts-2.3.20.3-apps.zip == Binary file - no diff available. Propchange: dev/struts/2.3.20.3/struts-2.3.20.3-apps.zip -- svn:mime-type = application/zip Added: dev/struts/2.3.20.3/struts-2.3.20.3-apps.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.3.20.3/struts-2.3.20.3-apps.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.3.20.3/struts-2.3.20.3-apps.zip.md5 == --- dev/struts/2.3.20.3/struts-2.3.20.3-apps.zip.md5 (added) +++ dev/struts/2.3.20.3/struts-2.3.20.3-apps.zip.md5 Wed Apr 20 11:46:43 2016 @@ -0,0 +1 @@ +30483349ed0c913748d68284c8091218 \ No newline at end of file Added: dev/struts/2.3.20.3/struts-2.3.20.3-apps.zip.sha1 == --- dev/struts/2.3.20.3/struts-2.3.20.3-apps.zip.sha1 (added) +++ dev/struts/2.3.20.3/struts-2.3.20.3-apps.zip.sha1 Wed Apr 20 11:46:43 2016 @@ -0,0 +1 @@ +355fdf12c393f9ab8caf9d66c05eedabec28fd18 \ No newline at end of file Added: dev/struts/2.3.20.3/struts-2.3.20.3-docs.zip == Binary file - no diff available. Propchange: dev/struts/2.3.20.3/struts-2.3.20.3-docs.zip -- svn:mime-type = application/zip Added: dev/struts/2.3.20.3/struts-2.3.20.3-docs.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.3.20.3/struts-2.3.20.3-docs.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.3.20.3/struts-2.3.20.3-docs.zip.md5 == ---
struts git commit: [maven-release-plugin] prepare for next development iteration
Repository: struts Updated Branches: refs/heads/struts-2-3-20-2 bbbf43ec5 -> da2734877 [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/da273487 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/da273487 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/da273487 Branch: refs/heads/struts-2-3-20-2 Commit: da2734877747e4259b7b4edc4f6bccc0ed416fc0 Parents: bbbf43e Author: Lukasz LenartAuthored: Wed Apr 20 12:48:00 2016 +0200 Committer: Lukasz Lenart Committed: Wed Apr 20 12:48:00 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/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/da273487/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index cf1e297..a46453d 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.20.3 +2.3.20.4-SNAPSHOT struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/da273487/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index dc213e7..57c0b43 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.20.3 +2.3.20.4-SNAPSHOT struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/da273487/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 4116646..1888186 100644 --- a/apps/mailreader/pom.xml +++
[struts] Git Push Summary
Repository: struts Updated Tags: refs/tags/STRUTS_2_3_20_3 [created] 22b7ccd20
[1/2] struts git commit: Cleans up excludedClasses
Repository: struts Updated Branches: refs/heads/struts-2-3-20-2 f5c34b9b5 -> bbbf43ec5 Cleans up excludedClasses Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/717b2ec7 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/717b2ec7 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/717b2ec7 Branch: refs/heads/struts-2-3-20-2 Commit: 717b2ec7d6fa0e217cb462af4a27279db4fc646e Parents: f5c34b9 Author: Lukasz LenartAuthored: Wed Apr 20 12:37:46 2016 +0200 Committer: Lukasz Lenart Committed: Wed Apr 20 12:37:46 2016 +0200 -- core/src/main/resources/struts-default.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/717b2ec7/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 b3fab8f..4eadf02 100644 --- a/core/src/main/resources/struts-default.xml +++ b/core/src/main/resources/struts-default.xml @@ -46,8 +46,8 @@ java.lang.Class, java.lang.ClassLoader, java.lang.Shutdown, +java.lang.ProcessBuilder, ognl.OgnlContext, -ognl.MemberAccess, ognl.ClassResolver, ognl.TypeConverter, ognl.MemberAccess,
[2/2] struts git commit: [maven-release-plugin] prepare release STRUTS_2_3_20_3
[maven-release-plugin] prepare release STRUTS_2_3_20_3 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bbbf43ec Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bbbf43ec Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bbbf43ec Branch: refs/heads/struts-2-3-20-2 Commit: bbbf43ec59e7bef3b07e9065dc9784c18a95d58b Parents: 717b2ec Author: Lukasz LenartAuthored: Wed Apr 20 12:47:47 2016 +0200 Committer: Lukasz Lenart Committed: Wed Apr 20 12:47:47 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/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/bbbf43ec/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 13ac088..cf1e297 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.20.3-SNAPSHOT +2.3.20.3 struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/bbbf43ec/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 9ea5361..dc213e7 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.20.3-SNAPSHOT +2.3.20.3 struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/bbbf43ec/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 46c2b7d..4116646 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -
[2/5] struts git commit: Uses isSequence flag to block chained expressions
Uses isSequence flag to block chained expressions Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/5190b536 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/5190b536 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/5190b536 Branch: refs/heads/support-2-3 Commit: 5190b53673a710ead31bbb5f82cf4ca171994629 Parents: d36f31b Author: Lukasz LenartAuthored: Mon Apr 18 20:38:27 2016 +0200 Committer: Lukasz Lenart Committed: Wed Apr 20 08:01:02 2016 +0200 -- .../java/com/opensymphony/xwork2/ognl/OgnlUtil.java | 6 +++--- .../com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 15 +++ 2 files changed, 18 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/5190b536/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java -- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java index eade684..40d112b 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java @@ -288,7 +288,7 @@ public class OgnlUtil { compileAndExecute(name, context, new OgnlTask() { public Void execute(Object tree) throws OgnlException { if (isEvalExpression(tree, context)) { -throw new OgnlException("Eval expression cannot be used as parameter name"); +throw new OgnlException("Eval expression/chained expressions cannot be used as parameter name"); } Ognl.setValue(tree, context, root, value); return null; @@ -304,7 +304,7 @@ public class OgnlUtil { if (context!=null && context instanceof OgnlContext) { ognlContext = (OgnlContext) context; } -return node.isEvalChain(ognlContext); +return node.isEvalChain(ognlContext) || node.isSequence(ognlContext); } return false; } @@ -361,7 +361,7 @@ public class OgnlUtil { private void checkEnableEvalExpression(Object tree, Map context) throws OgnlException { if (!enableEvalExpression && isEvalExpression(tree, context)) { -throw new OgnlException("Eval expressions has been disabled!"); +throw new OgnlException("Eval expressions/chained expressions have been disabled!"); } } http://git-wip-us.apache.org/repos/asf/struts/blob/5190b536/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java -- diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java index 96daab0..a0d3f2b 100644 --- a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java +++ b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java @@ -750,6 +750,21 @@ public class OgnlUtilTest extends XWorkTestCase { assertEquals(expected.getMessage(), "Method \"getRuntime\" failed for object class java.lang.Runtime"); } +public void testBlockSequenceOfExpressions() throws Exception { +Foo foo = new Foo(); + +Exception expected = null; +try { + ognlUtil.setValue("#booScope=@myclass@DEFAULT_SCOPE,#bootScope.init()", ognlUtil.createDefaultContext(foo), foo, true); +fail(); +} catch (OgnlException e) { +expected = e; +} +assertNotNull(expected); +assertSame(OgnlException.class, expected.getClass()); +assertEquals(expected.getMessage(), "Eval expressions/chained expressions have been disabled!"); +} + public static class Email { String address;
[3/5] struts git commit: Adds additional blocked classes
Adds additional blocked classes Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/46517afb Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/46517afb Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/46517afb Branch: refs/heads/support-2-3 Commit: 46517afb1402fbf3fd84089920b43cc07e948a92 Parents: 5190b53 Author: Lukasz LenartAuthored: Mon Apr 18 20:38:49 2016 +0200 Committer: Lukasz Lenart Committed: Wed Apr 20 08:01:12 2016 +0200 -- core/src/main/resources/struts-default.xml | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/struts/blob/46517afb/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 441ae54..3686c20 100644 --- a/core/src/main/resources/struts-default.xml +++ b/core/src/main/resources/struts-default.xml @@ -50,6 +50,8 @@ ognl.OgnlContext, ognl.ClassResolver, ognl.TypeConverter, +ognl.MemberAccess, +ognl.DefaultMemberAccess, com.opensymphony.xwork2.ognl.SecurityMemberAccess, com.opensymphony.xwork2.ActionContext" />