This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch release/struts-6-8-x in repository https://gitbox.apache.org/repos/asf/struts.git
commit 7d7060896bbeab2b901b037bfb6c378050f82d8a Merge: 80225c716 80739da11 Author: Lukasz Lenart <[email protected]> AuthorDate: Thu Dec 11 11:33:22 2025 +0100 Merge pull request #1458 from apache/release/struts-6-7-x Merges changes from older release branch Jenkinsfile | 18 ++++++++++ apps/pom.xml | 2 +- apps/rest-showcase/pom.xml | 4 +-- apps/showcase/pom.xml | 4 +-- 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 | 8 +---- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/README.md | 44 +++++++++++++++++++++++++ plugins/convention/design.txt | 39 ---------------------- 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 | 4 +-- 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 | 4 +-- plugins/velocity/pom.xml | 2 +- plugins/xslt/pom.xml | 2 +- pom.xml | 71 ++++++++++++++++++---------------------- src/main/groovy/Jenkinsfile.gdsl | 18 ++++++++++ 43 files changed, 156 insertions(+), 130 deletions(-)
