(struts) branch release/struts-7-0-x updated (5132f09bb -> 3a08c1094)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git from 5132f09bb Merge pull request #1078 from apache/fix/WW-5473-multipart-wraper add 00f979e9c WW-5465 Renames tag parameters to attributes add b17d7f6ff WW-5465 Short-circuits attributes processing if not found in ValueStack add 3a08c1094 Merge pull request #1067 from apache/feature/WW-5465-attributes No new revisions were added by this update. Summary of changes: .../myTemplateDir/myTheme/myAnotherTemplate.ftl| 2 +- .../template/ajaxErrorContainers/actionerror.ftl | 16 +- .../template/ajaxErrorContainers/controlfooter.ftl | 10 +- .../ajaxErrorContainers/controlheader-core.ftl | 34 +-- .../webapp/WEB-INF/tags/ui/componentTagExample.jsp | 110 .../customTheme/ftlCustomTemplate.ftl | 2 +- .../customTheme/jspCustomTemplate.jsp | 4 +- .../src/main/webapp/template/xhtml/mytemplate.jsp | 2 +- .../apache/struts2/components/ActionComponent.java | 10 +- .../java/org/apache/struts2/components/Anchor.java | 12 +- .../apache/struts2/components/AppendIterator.java | 44 ++- .../org/apache/struts2/components/Component.java | 36 +-- .../struts2/components/DoubleListUIBean.java | 4 +- .../apache/struts2/components/DoubleSelect.java| 2 +- .../java/org/apache/struts2/components/File.java | 4 +- .../java/org/apache/struts2/components/Form.java | 10 +- .../org/apache/struts2/components/FormButton.java | 6 +- .../apache/struts2/components/GenericUIBean.java | 12 +- .../org/apache/struts2/components/Include.java | 8 +- .../struts2/components/InputTransferSelect.java| 8 +- .../java/org/apache/struts2/components/Label.java | 2 +- .../org/apache/struts2/components/ListUIBean.java | 2 +- .../apache/struts2/components/MergeIterator.java | 49 ++-- .../org/apache/struts2/components/OptGroup.java| 2 +- .../struts2/components/OptionTransferSelect.java | 16 +- .../struts2/components/ServletUrlRenderer.java | 2 +- .../java/org/apache/struts2/components/Token.java | 2 +- .../java/org/apache/struts2/components/UIBean.java | 26 +- .../java/org/apache/struts2/components/URL.java| 2 +- .../apache/struts2/components/UpDownSelect.java| 6 +- .../apache/struts2/util/AppendIteratorFilter.java | 18 +- .../struts2/views/freemarker/ScopesHashModel.java | 11 +- .../struts2/views/freemarker/tags/TagModel.java| 2 +- .../struts2/views/jsp/ComponentTagSupport.java | 13 +- .../main/resources/template/css_xhtml/checkbox.ftl | 46 ++-- .../resources/template/css_xhtml/controlfooter.ftl | 22 +- .../template/css_xhtml/controlheader-core.ftl | 36 +-- .../resources/template/css_xhtml/controlheader.ftl | 12 +- .../resources/template/css_xhtml/form-validate.ftl | 10 +- .../src/main/resources/template/css_xhtml/head.ftl | 4 +- .../main/resources/template/css_xhtml/hidden.ftl | 2 +- .../main/resources/template/css_xhtml/label.ftl| 30 +- .../main/resources/template/css_xhtml/reset.ftl| 14 +- .../resources/template/css_xhtml/submit-close.ftl | 10 +- .../main/resources/template/css_xhtml/submit.ftl | 14 +- .../src/main/resources/template/simple/a-close.ftl | 34 +-- .../main/resources/template/simple/actionerror.ftl | 16 +- .../resources/template/simple/actionmessage.ftl| 16 +- .../main/resources/template/simple/checkbox.ftl| 32 +-- .../resources/template/simple/checkboxlist.ftl | 78 +++--- .../main/resources/template/simple/combobox.ftl| 56 ++-- .../template/simple/common-attributes.ftl | 4 +- core/src/main/resources/template/simple/css.ftl| 22 +- core/src/main/resources/template/simple/debug.ftl | 6 +- .../resources/template/simple/doubleselect.ftl | 206 +++--- .../template/simple/dynamic-attributes.ftl | 6 +- .../main/resources/template/simple/fielderror.ftl | 24 +- core/src/main/resources/template/simple/file.ftl | 32 +-- .../template/simple/form-close-tooltips.ftl| 6 +- .../main/resources/template/simple/form-close.ftl | 44 +-- .../main/resources/template/simple/form-common.ftl | 56 ++-- core/src/main/resources/template/simple/form.ftl | 6 +- core/src/main/resources/template/simple/head.ftl | 2 +- core/src/main/resources/template/simple/hidden.ftl | 22 +- .../template/simple/inputtransferselect.ftl| 102 +++ core/src/main/resources/template/simple/label.ftl | 22 +- core/src/main/resources/template/simple/link.ftl | 56 ++-- core/src/main/resources/template/simple/nonce.ftl | 4 +- .../main/resources/template/simple/optgroup.ftl| 32 +-- .../template/simple/optiontransferselect.ftl | 306 ++--- .../main/resources/template/simple/password.ftl| 38 +-- .../simple/prefix
(struts) branch feature/WW-5465-attributes deleted (was b17d7f6ff)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5465-attributes in repository https://gitbox.apache.org/repos/asf/struts.git was b17d7f6ff WW-5465 Short-circuits attributes processing if not found in ValueStack 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 release/struts-7-0-x updated (3a08c1094 -> 954453b66)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git from 3a08c1094 Merge pull request #1067 from apache/feature/WW-5465-attributes add ce71dab1d WW-5472 Removes Struts Sitemesh plugin add 954453b66 Merge pull request #1077 from apache/feature/WW-5472-remove-sitemesh No new revisions were added by this update. Summary of changes: apps/showcase/pom.xml | 28 +- .../src/main/webapp/WEB-INF/decorators.xml | 36 --- .../src/main/webapp/WEB-INF/decorators/main.jsp| 9 +- .../src/main/webapp/WEB-INF/sitemesh-decorator.tld | 99 -- .../src/main/webapp/WEB-INF/sitemesh-page.tld | 115 --- apps/showcase/src/main/webapp/WEB-INF/sitemesh.xml | 75 - .../showcase/src/main/webapp/WEB-INF/sitemesh3.xml | 10 +- apps/showcase/src/main/webapp/WEB-INF/web.xml | 11 +- assembly/pom.xml | 5 +- assembly/src/main/assembly/all.xml | 11 - assembly/src/main/assembly/apps.xml| 7 - assembly/src/main/assembly/docs.xml| 4 - assembly/src/main/assembly/lib.xml | 7 - bom/pom.xml| 5 - jakarta/pom.xml| 1 - jakarta/sitemesh2-jakarta/README.md| 4 - jakarta/sitemesh2-jakarta/pom.xml | 69 - plugins/pom.xml| 1 - plugins/sitemesh/README.md | 2 - plugins/sitemesh/pom.xml | 62 .../sitemesh/FreemarkerDecoratorServlet.java | 333 - .../FreemarkerMapper2DecoratorSelector.java| 56 .../struts2/sitemesh/FreemarkerPageFilter.java | 65 .../struts2/sitemesh/NoneDecoratorMapper.java | 39 --- .../sitemesh/OldDecorator2NewStrutsDecorator.java | 204 - .../OldDecorator2NewStrutsFreemarkerDecorator.java | 101 --- .../OldDecorator2NewStrutsVelocityDecorator.java | 101 --- .../struts2/sitemesh/StrutsSiteMeshFactory.java| 55 .../struts2/sitemesh/VelocityDecoratorServlet.java | 196 .../sitemesh/VelocityMapper2DecoratorSelector.java | 58 .../struts2/sitemesh/VelocityPageFilter.java | 55 plugins/sitemesh/src/main/resources/LICENSE.txt| 174 --- plugins/sitemesh/src/main/resources/NOTICE.txt | 8 - .../src/main/resources/SITEMESH-LICENSE.txt| 51 .../sitemesh/src/main/resources/struts-plugin.xml | 30 -- plugins/sitemesh/src/site/site.xml | 56 pom.xml| 14 +- 37 files changed, 36 insertions(+), 2121 deletions(-) delete mode 100644 apps/showcase/src/main/webapp/WEB-INF/decorators.xml delete mode 100644 apps/showcase/src/main/webapp/WEB-INF/sitemesh-decorator.tld delete mode 100644 apps/showcase/src/main/webapp/WEB-INF/sitemesh-page.tld delete mode 100644 apps/showcase/src/main/webapp/WEB-INF/sitemesh.xml copy core/src/main/resources/author.dtd => apps/showcase/src/main/webapp/WEB-INF/sitemesh3.xml (70%) delete mode 100644 jakarta/sitemesh2-jakarta/README.md delete mode 100644 jakarta/sitemesh2-jakarta/pom.xml delete mode 100644 plugins/sitemesh/README.md delete mode 100644 plugins/sitemesh/pom.xml delete mode 100644 plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java delete mode 100644 plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerMapper2DecoratorSelector.java delete mode 100644 plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerPageFilter.java delete mode 100644 plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/NoneDecoratorMapper.java delete mode 100644 plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsDecorator.java delete mode 100644 plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsFreemarkerDecorator.java delete mode 100644 plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsVelocityDecorator.java delete mode 100644 plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/StrutsSiteMeshFactory.java delete mode 100644 plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java delete mode 100644 plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityMapper2DecoratorSelector.java delete mode 100644 plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java delete mode 100644 plugins/sitemesh/src/main/resources/LICENSE.txt delete mode 100644 plugins/sitemesh/src/main/resources/NOTICE.txt delete mode 100644 plugins/sitemesh/src/main/resources/SITEMESH-LICENSE.txt delete mode 100644 plugins/sitemesh/src/main/r
(struts) 01/01: Merge pull request #1068 from JCgH4164838Gh792C124B5/localS2_66_JakartaMulipartRequestFix1
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 commit b359da5517a156e43b0ca9a4327c5f9003546866 Merge: 9f2770b2c 09eb28602 Author: Lukasz Lenart AuthorDate: Sun Oct 20 11:09:53 2024 +0200 Merge pull request #1068 from JCgH4164838Gh792C124B5/localS2_66_JakartaMulipartRequestFix1 Potential mitigation for WW-5466 .../multipart/JakartaMultiPartRequest.java | 2 +- .../ActionFileUploadInterceptorTest.java | 151 + .../interceptor/FileUploadInterceptorTest.java | 181 - 3 files changed, 332 insertions(+), 2 deletions(-)
(struts) branch master updated (9f2770b2c -> b359da551)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts.git from 9f2770b2c Merge pull request #1075 from apache/feature/WW-5471-deprecate-sitemesh add 09eb28602 Initial Commit: - Fix for boundary condition bug in JakartaMultipartRequest that results in a NPE when struts.multipart.maxStringLength is not explicitly set, and normal fields are processed along with a file upload. - Additional unit tests for file upload interceptors to confirm functionality with-or-without max parameters being set when a file upload is processed alone as well as with normal fields. new b359da551 Merge pull request #1068 from JCgH4164838Gh792C124B5/localS2_66_JakartaMulipartRequestFix1 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: .../multipart/JakartaMultiPartRequest.java | 2 +- .../ActionFileUploadInterceptorTest.java | 151 + .../interceptor/FileUploadInterceptorTest.java | 181 - 3 files changed, 332 insertions(+), 2 deletions(-)
(struts) branch dependabot/github_actions/github/codeql-action-3.26.13 created (now d1695f7a4)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/github/codeql-action-3.26.13 in repository https://gitbox.apache.org/repos/asf/struts.git at d1695f7a4 Bump github/codeql-action from 3.26.12 to 3.26.13 No new revisions were added by this update.
(struts) branch dependabot/maven/org.apache.maven.plugins-maven-failsafe-plugin-3.5.1 created (now cf6cbf381)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-failsafe-plugin-3.5.1 in repository https://gitbox.apache.org/repos/asf/struts.git at cf6cbf381 Bump org.apache.maven.plugins:maven-failsafe-plugin from 3.3.1 to 3.5.1 No new revisions were added by this update.
(struts) branch dependabot/maven/org.eclipse.jetty-jetty-maven-plugin-11.0.24 created (now b9fdb3211)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.eclipse.jetty-jetty-maven-plugin-11.0.24 in repository https://gitbox.apache.org/repos/asf/struts.git at b9fdb3211 Bump org.eclipse.jetty:jetty-maven-plugin No new revisions were added by this update.
(struts) branch dependabot/maven/org.apache.maven.doxia-doxia-core-2.0.0 created (now b18fbda1f)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven.doxia-doxia-core-2.0.0 in repository https://gitbox.apache.org/repos/asf/struts.git at b18fbda1f Bump org.apache.maven.doxia:doxia-core from 1.12.0 to 2.0.0 No new revisions were added by this update.
(struts) branch dependabot/maven/org.apache.commons-commons-lang3-3.17.0 created (now 48ee44bbc)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.commons-commons-lang3-3.17.0 in repository https://gitbox.apache.org/repos/asf/struts.git at 48ee44bbc Bump org.apache.commons:commons-lang3 from 3.15.0 to 3.17.0 No new revisions were added by this update.
(struts) branch dependabot/maven/maven-surefire-plugin.version-3.5.1 created (now 28c8f1503)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/maven-surefire-plugin.version-3.5.1 in repository https://gitbox.apache.org/repos/asf/struts.git at 28c8f1503 Bump maven-surefire-plugin.version from 3.5.0 to 3.5.1 No new revisions were added by this update.
(struts) 01/01: WW-5209 Upgrade to Jakarta Bean Validation 3.1.0
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5209-bean-validation
in repository https://gitbox.apache.org/repos/asf/struts.git
commit ad9224512dd6e09134833cae967b1846fb401fec
Author: Lukasz Lenart
AuthorDate: Sun Oct 20 11:35:56 2024 +0200
WW-5209 Upgrade to Jakarta Bean Validation 3.1.0
---
apps/showcase/pom.xml| 6 ++
core/src/test/java/org/apache/struts2/components/UIBeanTest.java | 2 +-
plugins/bean-validation/pom.xml | 3 +--
pom.xml | 2 +-
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 802ca8421..9cf119743 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -149,6 +149,12 @@
org.hibernate.validator
hibernate-validator
${hibernate-validator.version}
+
+
+jakarta.validation
+jakarta.validation-api
+
+
(struts) branch feature/WW-5209-bean-validation created (now ad9224512)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5209-bean-validation in repository https://gitbox.apache.org/repos/asf/struts.git at ad9224512 WW-5209 Upgrade to Jakarta Bean Validation 3.1.0 This branch includes the following new commits: new ad9224512 WW-5209 Upgrade to Jakarta Bean Validation 3.1.0 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.
(struts) branch feature/WW-5427-incompatible-improvements updated (d50dce395 -> c3e0b9c90)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5427-incompatible-improvements in repository https://gitbox.apache.org/repos/asf/struts.git discard d50dce395 WW-5427 Upgrades Freemarker incompatible_improvements to version 2.3.33 add c3e0b9c90 WW-5427 Upgrades Freemarker incompatible_improvements to version 2.3.33 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 (d50dce395) \ N -- N -- N refs/heads/feature/WW-5427-incompatible-improvements (c3e0b9c90) 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: .../java/org/apache/struts2/views/freemarker/FreemarkerManagerTest.java | 1 + 1 file changed, 1 insertion(+)
(struts) branch feature/WW-5472-remove-sitemesh deleted (was ce71dab1d)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5472-remove-sitemesh in repository https://gitbox.apache.org/repos/asf/struts.git was ce71dab1d WW-5472 Removes Struts Sitemesh plugin 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 feature/WW-5427-incompatible-improvements created (now b103b3294)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5427-incompatible-improvements in repository https://gitbox.apache.org/repos/asf/struts.git at b103b3294 WW-5427 Upgrades Freemarker incompatible_improvements to version 2.3.33 This branch includes the following new commits: new b103b3294 WW-5427 Upgrades Freemarker incompatible_improvements to version 2.3.33 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.
(struts) 01/01: WW-5427 Upgrades Freemarker incompatible_improvements to version 2.3.33
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5427-incompatible-improvements
in repository https://gitbox.apache.org/repos/asf/struts.git
commit b103b3294143b596a0a2766c2711c15e534ca336
Author: Lukasz Lenart
AuthorDate: Sun Oct 20 11:19:08 2024 +0200
WW-5427 Upgrades Freemarker incompatible_improvements to version 2.3.33
---
.../java/org/apache/struts2/views/freemarker/FreemarkerManager.java | 2 +-
core/src/test/java/org/apache/struts2/components/UIBeanTest.java| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
index 6f0594769..d3a90d4f2 100644
---
a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
+++
b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
@@ -353,7 +353,7 @@ public class FreemarkerManager {
}
protected Version getFreemarkerVersion(ServletContext servletContext) {
-Version incompatibleImprovements = Configuration.VERSION_2_3_28;
+Version incompatibleImprovements = Configuration.VERSION_2_3_33;
String incompatibleImprovementsParam =
servletContext.getInitParameter("freemarker." +
Configuration.INCOMPATIBLE_IMPROVEMENTS_KEY_SNAKE_CASE);
if (incompatibleImprovementsParam != null) {
diff --git a/core/src/test/java/org/apache/struts2/components/UIBeanTest.java
b/core/src/test/java/org/apache/struts2/components/UIBeanTest.java
index dfacfeea3..680fb115d 100644
--- a/core/src/test/java/org/apache/struts2/components/UIBeanTest.java
+++ b/core/src/test/java/org/apache/struts2/components/UIBeanTest.java
@@ -387,7 +387,7 @@ public class UIBeanTest extends StrutsInternalTestCase {
DoubleSelect dblSelect = new DoubleSelect(stack, req, res);
dblSelect.evaluateParams();
-assertNull(dblSelect.getParameters().get("nonce"));
+assertNull(dblSelect.getAttributes().get("nonce"));
}
public void testSetNullUiStaticContentPath() {
(struts) branch feature/WW-5427-incompatible-improvements updated (b103b3294 -> d50dce395)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5427-incompatible-improvements in repository https://gitbox.apache.org/repos/asf/struts.git discard b103b3294 WW-5427 Upgrades Freemarker incompatible_improvements to version 2.3.33 add d50dce395 WW-5427 Upgrades Freemarker incompatible_improvements to version 2.3.33 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 (b103b3294) \ N -- N -- N refs/heads/feature/WW-5427-incompatible-improvements (d50dce395) 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: .../struts2/views/freemarker/FreemarkerManagerTest.java| 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-)
