[struts] branch WW-5336-deprecate-ognltool deleted (was 6e5a1a07f)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5336-deprecate-ognltool in repository https://gitbox.apache.org/repos/asf/struts.git was 6e5a1a07f WW-5336 Move XML comment to be clearer The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[struts] branch master updated (c087f2e64 -> 555a3a37b)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts.git from c087f2e64 Merge pull request #737 from apache/fix/drops-duplicated-dependency add 709434eeb WW-5336 Tidy up FreemarkerManager add e8614a99d WW-5336 Deprecate OgnlTool add 12cd92cb6 WW-5336 Clean up StrutsUtil add 85e8d819e WW-5336 Deprecate OGNL in template context add 0f068d37a WW-5336 Reduce cognitive complexity #makeSelectList add 6b13e8ac3 WW-5336 Switch to HashMap as concurrency handling not required add 35b0a6887 WW-5336 Update JavaDoc VelocityManager add 3b515b1a7 WW-5336 Fix visibility warnings add 215541146 WW-5336 Correct assertions and add test case add 6e5a1a07f WW-5336 Move XML comment to be clearer add 555a3a37b Merge pull request #735 from apache/WW-5336-deprecate-ognltool No new revisions were added by this update. Summary of changes: .../java/org/apache/struts2/util/StrutsUtil.java | 171 ++--- .../views/freemarker/FreemarkerManager.java| 40 +++-- .../org/apache/struts2/views/jsp/ui/OgnlTool.java | 10 +- .../org/apache/struts2/views/util/ContextUtil.java | 6 +- core/src/main/resources/struts-beans.xml | 1 + core/src/main/resources/struts.vm | 2 +- .../org/apache/struts2/util/StrutsUtilTest.java| 92 --- .../struts2/views/velocity/VelocityManager.java| 24 +-- .../views/velocity/VelocityManagerTest.java| 3 +- 9 files changed, 200 insertions(+), 149 deletions(-)
[struts] branch dependabot/maven/org.mortbay.jetty-jsp-2.1-7.0.0pre2 deleted (was d0844e29b)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/maven/org.mortbay.jetty-jsp-2.1-7.0.0pre2 in repository https://gitbox.apache.org/repos/asf/struts.git was d0844e29b Bump org.mortbay.jetty:jsp-2.1 from 6.1.26 to 7.0.0pre2 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[struts] branch dependabot/maven/ognl-ognl-3.4.1 deleted (was 9a2fd7d7a)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/maven/ognl-ognl-3.4.1 in repository https://gitbox.apache.org/repos/asf/struts.git was 9a2fd7d7a Bump ognl:ognl from 3.3.4 to 3.4.1 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[struts] branch master updated: [maven-release-plugin] prepare release STRUTS_6_3_0
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/master by this push: new 04e924638 [maven-release-plugin] prepare release STRUTS_6_3_0 04e924638 is described below commit 04e92463898df31439b1544036085c565dc210fd Author: Lukasz Lenart AuthorDate: Wed Aug 23 07:30:08 2023 +0200 [maven-release-plugin] prepare release STRUTS_6_3_0 --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 8 bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/async/pom.xml | 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/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/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-junit/pom.xml | 2 +- plugins/portlet-mocks/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/velocity/pom.xml| 2 +- plugins/xslt/pom.xml| 2 +- pom.xml | 6 +++--- 39 files changed, 45 insertions(+), 45 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index 37682ab24..2327e638c 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.3.0-SNAPSHOT +6.3.0 struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 6dcd20c3e..29143b678 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -6.3.0-SNAPSHOT +6.3.0 struts2-rest-showcase war -6.3.0-SNAPSHOT +6.3.0 Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 0287d6cb5..763c02085 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -6.3.0-SNAPSHOT +6.3.0 struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 5caee68fc..186dec261 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.3.0-SNAPSHOT +6.3.0 struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index 6a9757382..4abc04066 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -6.3.0-SNAPSHOT +6.3.0 struts2-bom -6.3.0-SNAPSHOT +6.3.0 pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -6.3.0-SNAPSHOT +6.3.0 true true @@ -190,7 +190,7 @@ -HEAD +STRUTS_6_3_0 scm:git:https://gitbox.apache.org/repos/asf/struts.git scm:git:https://gitbox.apache.org/repos/asf/struts.git https://github.com/apache/struts/ diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index c5b9224c3..cb4ca538e 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.3.0-SNAPSHOT +6.3.0 struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index cdd4d..c624a99f6 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.3.0-SNAPSHOT +6.3.0 struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index 00e7e2f72..743661851 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.3.0-SNAPSHOT +6.3.0 struts2-osgi-bundles diff --git a/core/pom.xml b/core/pom.xml index 3a10ed47d..ed
[struts] annotated tag STRUTS_6_3_0 created (now 402aa8d66)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to annotated tag STRUTS_6_3_0 in repository https://gitbox.apache.org/repos/asf/struts.git at 402aa8d66 (tag) tagging 04e92463898df31439b1544036085c565dc210fd (commit) replaces STRUTS_6_2_0 by Lukasz Lenart on Wed Aug 23 07:30:12 2023 +0200 - Log - [maven-release-plugin] copy for tag STRUTS_6_3_0 --- No new revisions were added by this update.
[struts] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/master by this push: new 32e42b3ec [maven-release-plugin] prepare for next development iteration 32e42b3ec is described below commit 32e42b3ecd1298eb3ab96a79e52daab44bf6d2dc Author: Lukasz Lenart AuthorDate: Wed Aug 23 07:30:16 2023 +0200 [maven-release-plugin] prepare for next development iteration --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 8 bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/async/pom.xml | 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/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/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-junit/pom.xml | 2 +- plugins/portlet-mocks/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/velocity/pom.xml| 2 +- plugins/xslt/pom.xml| 2 +- pom.xml | 6 +++--- 39 files changed, 45 insertions(+), 45 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index 2327e638c..a1a187151 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.3.0 +6.4.0-SNAPSHOT struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 29143b678..e891f704d 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -6.3.0 +6.4.0-SNAPSHOT struts2-rest-showcase war -6.3.0 +6.4.0-SNAPSHOT Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 763c02085..87b524ac1 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -6.3.0 +6.4.0-SNAPSHOT struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 186dec261..531e3fb1a 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.3.0 +6.4.0-SNAPSHOT struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index 4abc04066..a45e5634e 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -6.3.0 +6.4.0-SNAPSHOT struts2-bom -6.3.0 +6.4.0-SNAPSHOT pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -6.3.0 +6.4.0-SNAPSHOT true true @@ -190,7 +190,7 @@ -STRUTS_6_3_0 +HEAD scm:git:https://gitbox.apache.org/repos/asf/struts.git scm:git:https://gitbox.apache.org/repos/asf/struts.git https://github.com/apache/struts/ diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index cb4ca538e..8c2c35a7d 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.3.0 +6.4.0-SNAPSHOT struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index c624a99f6..647be8c9c 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.3.0 +6.4.0-SNAPSHOT struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index 743661851..408947c8f 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.3.0 +6.4.0-SNAPSHOT struts2-osgi-bundles diff --git a/core/pom.xml b/core/pom.xml
svn commit: r63591 - /dev/struts/6.3.0/
Author: lukaszlenart Date: Wed Aug 23 05:46:15 2023 New Revision: 63591 Log: Updates test release 6.3.0 Added: dev/struts/6.3.0/ dev/struts/6.3.0/struts-6.3.0-all.zip (with props) dev/struts/6.3.0/struts-6.3.0-all.zip.asc dev/struts/6.3.0/struts-6.3.0-all.zip.sha256 dev/struts/6.3.0/struts-6.3.0-all.zip.sha512 dev/struts/6.3.0/struts-6.3.0-apps.zip (with props) dev/struts/6.3.0/struts-6.3.0-apps.zip.asc dev/struts/6.3.0/struts-6.3.0-apps.zip.sha256 dev/struts/6.3.0/struts-6.3.0-apps.zip.sha512 dev/struts/6.3.0/struts-6.3.0-docs.zip (with props) dev/struts/6.3.0/struts-6.3.0-docs.zip.asc dev/struts/6.3.0/struts-6.3.0-docs.zip.sha256 dev/struts/6.3.0/struts-6.3.0-docs.zip.sha512 dev/struts/6.3.0/struts-6.3.0-lib.zip (with props) dev/struts/6.3.0/struts-6.3.0-lib.zip.asc dev/struts/6.3.0/struts-6.3.0-lib.zip.sha256 dev/struts/6.3.0/struts-6.3.0-lib.zip.sha512 dev/struts/6.3.0/struts-6.3.0-min-lib.zip (with props) dev/struts/6.3.0/struts-6.3.0-min-lib.zip.asc dev/struts/6.3.0/struts-6.3.0-min-lib.zip.sha256 dev/struts/6.3.0/struts-6.3.0-min-lib.zip.sha512 dev/struts/6.3.0/struts-6.3.0-src.zip (with props) dev/struts/6.3.0/struts-6.3.0-src.zip.asc dev/struts/6.3.0/struts-6.3.0-src.zip.sha256 dev/struts/6.3.0/struts-6.3.0-src.zip.sha512 Added: dev/struts/6.3.0/struts-6.3.0-all.zip == Binary file - no diff available. Propchange: dev/struts/6.3.0/struts-6.3.0-all.zip -- svn:mime-type = application/octet-stream Added: dev/struts/6.3.0/struts-6.3.0-all.zip.asc == --- dev/struts/6.3.0/struts-6.3.0-all.zip.asc (added) +++ dev/struts/6.3.0/struts-6.3.0-all.zip.asc Wed Aug 23 05:46:15 2023 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- + +iQJMBAABCgA2FiEEDgCGmDROYrkGM7fGKEFhBmOvux8FAmTlmtIYHGx1a2Fzemxl +bmFydEBhcGFjaGUub3JnAAoJEChBYQZjr7sfc6wQAIP0jwU3NFTDWHDk7XaWT4Ff +IlVcCKlSKx/8t0mCQnc1jyJq2z1z5hz46arJSLMH3puVAMYn8vNfe/2+fO7E6gQ5 +d9jpzzG288+fPSaiO7LlZQRPL4W4qdypY1Im1hP6tw1C9AjKtZURWW6HrreEIO5c +Fb5LvSuUAleAc7Utbk/bswN8iHolqUTk2uSMIDEYS/6Pyj89DBEHW07fXiV8CIRw +vMKxFRFyCKdG7UBuytwJhfbqPF49eJNa89qK+FNEZLSQFQVo8yH+3mbvABMyCjzj +Ux2d0xuq4U+i0fGU8DKlROnTJWK7Op6XFNf9efPXdFw/MiT9sKJzZPCHSL+rua8n +RC2qzMUifxpul7AvSSvPt8IVfrAgYTEJUeFqHzewXTMnWngryvynUO/1JXi7PW/3 +FmJSU9iDBeLp86AF/Cd0b5ZoAtNPGR1GGJlB8G3zqwtytWY+y90qUQ8rm4rOEufL +xg91yx4GseWWwsOD+JS9YPGy1+qnah26fBmkQqtwB1bt/yrmwSistQ7i9rGRSC0A +QuYnd2sm5m+aMiwEdege3NB3fNCr+CM199GI3YUIiDmNffDMbAdmlM07rhVwAybD +fmIhHmuOmlxfEvQ2DTnG9WzGBkTPOiHatpqVtFJ4STtuJxmCw7VofAjNtNw4joZ1 +73p7IKmyUs8S7D5bxCjc +=DC6K +-END PGP SIGNATURE- Added: dev/struts/6.3.0/struts-6.3.0-all.zip.sha256 == --- dev/struts/6.3.0/struts-6.3.0-all.zip.sha256 (added) +++ dev/struts/6.3.0/struts-6.3.0-all.zip.sha256 Wed Aug 23 05:46:15 2023 @@ -0,0 +1 @@ +c44087c849420c7c80ef5586ead225aa9b862576ae3a41eb8ae95634da9029b7 struts-6.3.0-all.zip Added: dev/struts/6.3.0/struts-6.3.0-all.zip.sha512 == --- dev/struts/6.3.0/struts-6.3.0-all.zip.sha512 (added) +++ dev/struts/6.3.0/struts-6.3.0-all.zip.sha512 Wed Aug 23 05:46:15 2023 @@ -0,0 +1 @@ +ca7397b14cadb3bde8e6c8a6baf649c6ba66e349521b455b731ce79131ea98e51373fceccedaf3088fff0b6cb15ee4eaa43ef5f598c77ac293b4cdb3f43faca4 struts-6.3.0-all.zip Added: dev/struts/6.3.0/struts-6.3.0-apps.zip == Binary file - no diff available. Propchange: dev/struts/6.3.0/struts-6.3.0-apps.zip -- svn:mime-type = application/octet-stream Added: dev/struts/6.3.0/struts-6.3.0-apps.zip.asc == --- dev/struts/6.3.0/struts-6.3.0-apps.zip.asc (added) +++ dev/struts/6.3.0/struts-6.3.0-apps.zip.asc Wed Aug 23 05:46:15 2023 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- + +iQJMBAABCgA2FiEEDgCGmDROYrkGM7fGKEFhBmOvux8FAmTlmtMYHGx1a2Fzemxl +bmFydEBhcGFjaGUub3JnAAoJEChBYQZjr7sfjOIP/1+J6Q2vh6pc5Gkbg9bYQM3x +zClD3JEaIkHh8iCrAxKcDuZUvZqNKyvLfMq8e4StngqiX7DsZpfMWH6HXRZv8xzB +QD+yyFus/B5Rf/sBm69nJir10d5zaewhFX6A7X9qhdDaV5X1StXuwAhSyCqiqb+J +CRp8g1jR3xL5L4iBgnnVrG0VvXObhujhIAQqv6eWW4mJoAz3VxfSWQ3y/SVqyDr+ +fs1ZrVLUpIWj7xxQXOBiw+p5w7Nv3VBV8CSkQPqV6V7SgSZ4lq+8Xw13A9/KR8RU +3Ccvx7DOS9WSWbnamToQ89Zla4kMEfSPA/NFJVBLAi8t5DO0uUoiOtKIJ839g+wu +RchbxcZlXEtq9rhHu3D1B4hdR/6taXctZjbPdRv09RFMEaOKACIaTYT5cpHiS+Q6 +0PF2T2XWpCSL59QKWgihP38awF032ZfTbTIFLpfylrV2nymwP35hTSn5hBcuajkD +7fQ+85t0HrAThFk6kfc4nMloXq6ZLMCqgakDYoplqgUJAOv/AdzdEdtyeP3T0kaU +1FYRlWc+j50KqAL95F/fd8TsIbViXrDwGiyP+L+FAGvp8ehf
