[struts] 01/01: Merge pull request #524 from apache/WW-5117-evaluate-dynamic-attributes
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch struts-2-5-x in repository https://gitbox.apache.org/repos/asf/struts.git commit c495824e56a1e3f4e80f737ce55cea74b6294f84 Merge: 377c0cb 5c247b3 Author: Lukasz Lenart AuthorDate: Thu Jan 13 08:16:49 2022 +0100 Merge pull request #524 from apache/WW-5117-evaluate-dynamic-attributes [WW-5117] Evaluates dynamic attributes .../apache/struts2/components/CheckboxList.java| 16 --- .../org/apache/struts2/components/ListUIBean.java | 1 - .../java/org/apache/struts2/components/Radio.java | 17 +--- .../java/org/apache/struts2/components/UIBean.java | 31 +- .../template/FreemarkerTemplateEngine.java | 9 +++ .../resources/template/simple/checkboxlist.ftl | 8 +++--- .../template/simple/dynamic-attributes.ftl | 8 -- .../main/resources/template/simple/radiomap.ftl| 5 ++-- .../apache/struts2/views/jsp/ui/TextfieldTest.java | 5 ++-- .../apache/struts2/views/jsp/ui/Textfield-5.txt| 2 +- 10 files changed, 72 insertions(+), 30 deletions(-)
[struts] branch struts-2-5-x updated (377c0cb -> c495824)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch struts-2-5-x in repository https://gitbox.apache.org/repos/asf/struts.git. from 377c0cb Fixes versioning after the latest release add 5e624fa WW-5117 Restores previous behavior where tag was before action on stack add 2825fdb WW-5117 Evaluates dynamic attributes when assigning them to tag Reverts https://github.com/apache/struts/pull/447/commits/8bbe1949e17d58e1b5aef9c71e1279ad12ad7ba7#diff-0a39f082871f48bd14037ab2e3a3911b0b1046506c1d93338024d77d412a7075L305-L309 add a7fdf13 WW-5117 Does a conditional evaluation depending on the tag Some tags requires to perform a lazy evaluation which can only happen in ftl template as performing it in the component class is not possible add 5c247b3 WW-5117 Uses translateVariables instead of findString to allow join expressions new c495824 Merge pull request #524 from apache/WW-5117-evaluate-dynamic-attributes The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/struts2/components/CheckboxList.java| 16 --- .../org/apache/struts2/components/ListUIBean.java | 1 - .../java/org/apache/struts2/components/Radio.java | 17 +--- .../java/org/apache/struts2/components/UIBean.java | 31 +- .../template/FreemarkerTemplateEngine.java | 9 +++ .../resources/template/simple/checkboxlist.ftl | 8 +++--- .../template/simple/dynamic-attributes.ftl | 8 -- .../main/resources/template/simple/radiomap.ftl| 5 ++-- .../apache/struts2/views/jsp/ui/TextfieldTest.java | 5 ++-- .../apache/struts2/views/jsp/ui/Textfield-5.txt| 2 +- 10 files changed, 72 insertions(+), 30 deletions(-)
[struts] branch struts-2-5-x updated: Fixes wrong SNAPSHOT version in BOM
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch struts-2-5-x in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/struts-2-5-x by this push: new e6b9aab Fixes wrong SNAPSHOT version in BOM e6b9aab is described below commit e6b9aaba54e33bf8b5f99a455adb8f69d11fd2f9 Author: Lukasz Lenart AuthorDate: Thu Jan 13 08:39:48 2022 +0100 Fixes wrong SNAPSHOT version in BOM --- bom/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index d195ea4..be11a56 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -30,7 +30,7 @@ struts2-bom -2.5.9-SNAPSHOT +2.5.29-SNAPSHOT pom Struts 2 Bill of Materials @@ -45,7 +45,7 @@ -2.5.9-SNAPSHOT +2.5.29-SNAPSHOT true true
[struts] branch struts-2-5-x updated: [maven-release-plugin] prepare release STRUTS_2_5_29
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch struts-2-5-x in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/struts-2-5-x by this push: new 00be980 [maven-release-plugin] prepare release STRUTS_2_5_29 00be980 is described below commit 00be9803d5ac4d6573179a460b4c0486d635f44a Author: Lukasz Lenart AuthorDate: Thu Jan 13 08:48:24 2022 +0100 [maven-release-plugin] prepare release STRUTS_2_5_29 --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/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/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-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/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- pom.xml | 6 +++--- 35 files changed, 40 insertions(+), 40 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index 0b0a58a..b2414e7 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -2.5.29-SNAPSHOT +2.5.29 struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 1125bb2..e21809c 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -2.5.29-SNAPSHOT +2.5.29 struts2-rest-showcase war -2.5.29-SNAPSHOT +2.5.29 Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 3d9450c..c47fbb3 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -2.5.29-SNAPSHOT +2.5.29 struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index c76947d..3436f62 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -2.5.29-SNAPSHOT +2.5.29 struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index be11a56..75436c5 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -30,7 +30,7 @@ struts2-bom -2.5.29-SNAPSHOT +2.5.29 pom Struts 2 Bill of Materials @@ -45,7 +45,7 @@ -2.5.29-SNAPSHOT +2.5.29 true true @@ -181,7 +181,7 @@ -STRUTS_2_5_27 +STRUTS_2_5_29 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 98532d4..ca102f8 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -2.5.29-SNAPSHOT +2.5.29 struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index fbab73d..5f8608b 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -2.5.29-SNAPSHOT +2.5.29 struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index 1181254..86385d1 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -2.5.29-SNAPSHOT +2.5.29 struts2-osgi-bundles diff --git a/core/pom.xml b/core/pom.xml index 2cab900..6eb2e61 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -2.5.29-SNAPSHOT +2.5.29 struts2-core jar diff --git a/plugins/bean-validation/pom.xml b/plugin
[struts] annotated tag STRUTS_2_5_29 created (now 0aadca5)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to annotated tag STRUTS_2_5_29 in repository https://gitbox.apache.org/repos/asf/struts.git. at 0aadca5 (tag) tagging 00be9803d5ac4d6573179a460b4c0486d635f44a (commit) replaces STRUTS_2_5_28_3 by Lukasz Lenart on Thu Jan 13 08:48:29 2022 +0100 - Log - [maven-release-plugin] copy for tag STRUTS_2_5_29 --- No new revisions were added by this update.
[struts] branch struts-2-5-x 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 struts-2-5-x in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/struts-2-5-x by this push: new 8d0382c [maven-release-plugin] prepare for next development iteration 8d0382c is described below commit 8d0382c34e2cd9fcb6a53cd9ab5f76d81b0104c8 Author: Lukasz Lenart AuthorDate: Thu Jan 13 08:48:34 2022 +0100 [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 | 6 +++--- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/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-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/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- pom.xml | 6 +++--- 35 files changed, 40 insertions(+), 40 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index b2414e7..433ed67 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -2.5.29 +2.5.30-SNAPSHOT struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index e21809c..d5c3093 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -2.5.29 +2.5.30-SNAPSHOT struts2-rest-showcase war -2.5.29 +2.5.30-SNAPSHOT Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index c47fbb3..f5ddac7 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -2.5.29 +2.5.30-SNAPSHOT struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 3436f62..4127635 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -2.5.29 +2.5.30-SNAPSHOT struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index 75436c5..1f82dca 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -30,7 +30,7 @@ struts2-bom -2.5.29 +2.5.30-SNAPSHOT pom Struts 2 Bill of Materials @@ -45,7 +45,7 @@ -2.5.29 +2.5.30-SNAPSHOT true true @@ -181,7 +181,7 @@ -STRUTS_2_5_29 +STRUTS_2_5_27 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 ca102f8..7ed49c5 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -2.5.29 +2.5.30-SNAPSHOT struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index 5f8608b..284970d 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -2.5.29 +2.5.30-SNAPSHOT struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index 86385d1..858b05a 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -2.5.29 +2.5.30-SNAPSHOT struts2-osgi-bundles diff --git a/core/pom.xml b/core/pom.xml index 6eb2e61..f642766 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -2.5.29 +2.5.30-SNAPSHOT struts2-core jar diff --git a/plugins/bean-validatio
