[struts] branch WW-5117-evaluate-dynamic-attributes updated (8c6eb6f -> d7b688e)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch WW-5117-evaluate-dynamic-attributes in repository https://gitbox.apache.org/repos/asf/struts.git. from 8c6eb6f 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 d7b688e WW-5117 Uses translateVariables instead of findString to allow join expressions No new revisions were added by this update. Summary of changes: core/src/main/java/org/apache/struts2/components/UIBean.java | 4 +++- .../src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java | 5 +++-- .../test/resources/org/apache/struts2/views/jsp/ui/Textfield-5.txt | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-)
[struts] branch struts-2-5-x updated: Fixes versioning after the latest release
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 377c0cb Fixes versioning after the latest release 377c0cb is described below commit 377c0cb20b672c2942c372cb2ad0454fa7b0119f Author: Lukasz Lenart AuthorDate: Thu Jan 6 09:05:08 2022 +0100 Fixes versioning after the latest release --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- 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 | 2 +- 34 files changed, 35 insertions(+), 35 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index eb134bc..0b0a58a 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -2.5.9-SNAPSHOT +2.5.29-SNAPSHOT struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index e9b3714..1125bb2 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -2.5.9-SNAPSHOT +2.5.29-SNAPSHOT struts2-rest-showcase war -2.5.9-SNAPSHOT +2.5.29-SNAPSHOT Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 3b13825..3d9450c 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -2.5.9-SNAPSHOT +2.5.29-SNAPSHOT struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 73fb3d5..c76947d 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -2.5.9-SNAPSHOT +2.5.29-SNAPSHOT struts2-assembly diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index e5c065c..98532d4 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -2.5.9-SNAPSHOT +2.5.29-SNAPSHOT struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index 5ec6c72..fbab73d 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -2.5.9-SNAPSHOT +2.5.29-SNAPSHOT struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index dcd0226..1181254 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -2.5.9-SNAPSHOT +2.5.29-SNAPSHOT struts2-osgi-bundles diff --git a/core/pom.xml b/core/pom.xml index 4f27f87..2cab900 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -2.5.9-SNAPSHOT +2.5.29-SNAPSHOT struts2-core jar diff --git a/plugins/bean-validation/pom.xml b/plugins/bean-validation/pom.xml index d45da63..500a7e2 100644 --- a/plugins/bean-validation/pom.xml +++ b/plugins/bean-validation/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-plugins -2.5.9-SNAPSHOT +2.5.29-SNAPSHOT 4.0.0 diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml index 6e4cc49..a2fde88 100644 --- a/plugins/cdi/pom.xml +++ b/plugins/cdi/pom.xml @@ -25,7 +25,7 @@ org.apache.struts struts2-plugins -2.5.9-SNAPSHOT +2.5.29-SNAPSHOT struts2-cd
[struts] branch WW-5117-evaluate-dynamic-attributes updated (d7b688e -> 5c247b3)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch WW-5117-evaluate-dynamic-attributes in repository https://gitbox.apache.org/repos/asf/struts.git. omit d7b688e WW-5117 Uses translateVariables instead of findString to allow join expressions omit 8c6eb6f 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 omit 9a509eb WW-5117 Evaluates dynamic attributes when assigning them to tag Reverts https://github.com/apache/struts/pull/447/commits/8bbe1949e17d58e1b5aef9c71e1279ad12ad7ba7#diff-0a39f082871f48bd14037ab2e3a3911b0b1046506c1d93338024d77d412a7075L305-L309 omit 412cd60 WW-5117 Restores previous behavior where tag was before action on stack add 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 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d7b688e) \ N -- N -- N refs/heads/WW-5117-evaluate-dynamic-attributes (5c247b3) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- 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 | 2 +- 34 files changed, 35 insertions(+), 35 deletions(-)
[struts] branch master updated (bab276e -> 60e1212)
This is an automated email from the ASF dual-hosted git repository. yasserzamani pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts.git. from bab276e Uses Log4j instead of SLF4J add 5c9299b WW-4792 Uses proper names for constants new 60e1212 Merge pull request #522 from apache/WW-4792-constants-cleanup 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: apps/rest-showcase/pom.xml | 6 .../xwork2/config/impl/DefaultConfiguration.java | 4 +-- .../xwork2/config/impl/MockConfiguration.java | 2 +- .../StrutsDefaultConfigurationProvider.java| 4 +-- .../com/opensymphony/xwork2/ognl/OgnlUtil.java | 6 ++-- .../java/org/apache/struts2/StrutsConstants.java | 36 -- .../struts2/config/entities/ConstantConfig.java| 14 - 7 files changed, 42 insertions(+), 30 deletions(-)
[struts] 01/01: Merge pull request #522 from apache/WW-4792-constants-cleanup
This is an automated email from the ASF dual-hosted git repository. yasserzamani pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git commit 60e1212bcc4f2f68efdedcf132565bf790fe6222 Merge: bab276e 5c9299b Author: Yasser Zamani AuthorDate: Thu Jan 6 19:20:54 2022 +0330 Merge pull request #522 from apache/WW-4792-constants-cleanup [WW-4792] Uses proper names for constants apps/rest-showcase/pom.xml | 6 .../xwork2/config/impl/DefaultConfiguration.java | 4 +-- .../xwork2/config/impl/MockConfiguration.java | 2 +- .../StrutsDefaultConfigurationProvider.java| 4 +-- .../com/opensymphony/xwork2/ognl/OgnlUtil.java | 6 ++-- .../java/org/apache/struts2/StrutsConstants.java | 36 -- .../struts2/config/entities/ConstantConfig.java| 14 - 7 files changed, 42 insertions(+), 30 deletions(-)
