(struts) branch fix/WW-5501-dmi-s7 updated (bdd29ac73 -> ab431be76)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/WW-5501-dmi-s7 in repository https://gitbox.apache.org/repos/asf/struts.git omit bdd29ac73 WW-5501 Ignores DMI related action field add b34665046 Improves code quality Uses existing function to split input using comma add f4d6564bb Merge pull request #1204 from apache/fix/improves-code-quality add 9d5d80298 Bump github/codeql-action from 3.28.5 to 3.28.8 add 442b4ea2e Merge pull request #1205 from apache/dependabot/github_actions/github/codeql-action-3.28.8 add 0b4855ac4 Bump org.htmlunit:htmlunit from 4.2.0 to 4.9.0 add 58b0d536e Merge pull request #1207 from apache/dependabot/maven/org.htmlunit-htmlunit-4.9.0 add ab431be76 WW-5501 Ignores DMI related action field 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 (bdd29ac73) \ N -- N -- N refs/heads/fix/WW-5501-dmi-s7 (ab431be76) 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: .github/workflows/codeql.yml | 6 +- .github/workflows/scorecards-analysis.yaml | 2 +- .../convention/DefaultResultMapBuilder.java| 201 ++--- .../convention/DefaultResultMapBuilderTest.java| 106 +++ pom.xml| 2 +- 5 files changed, 170 insertions(+), 147 deletions(-)
(struts) 01/01: Merge pull request #1207 from apache/dependabot/maven/org.htmlunit-htmlunit-4.9.0
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/struts.git commit 58b0d536e8679e54e69060b594f9a71a670ee16d Merge: 442b4ea2e 0b4855ac4 Author: Lukasz Lenart AuthorDate: Mon Feb 3 07:17:58 2025 +0100 Merge pull request #1207 from apache/dependabot/maven/org.htmlunit-htmlunit-4.9.0 Bump org.htmlunit:htmlunit from 4.2.0 to 4.9.0 pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) branch dependabot/maven/org.htmlunit-htmlunit-4.9.0 deleted (was 0b4855ac4)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/maven/org.htmlunit-htmlunit-4.9.0 in repository https://gitbox.apache.org/repos/asf/struts.git was 0b4855ac4 Bump org.htmlunit:htmlunit from 4.2.0 to 4.9.0 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) 01/01: Defines proper snapshot version for BOM
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch fix/bom-version in repository https://gitbox.apache.org/repos/asf/struts.git commit 67ba458d036ced59bbeeb770ac0606b2fbd20504 Author: Lukasz Lenart AuthorDate: Sun Feb 2 10:00:09 2025 +0100 Defines proper snapshot version for BOM --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 09d4daf40..ac842cb3e 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -44,7 +44,7 @@ -6.7.0 +6.7.1-SNAPSHOT true true
(struts) branch fix/bom-version created (now 67ba458d0)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/bom-version in repository https://gitbox.apache.org/repos/asf/struts.git at 67ba458d0 Defines proper snapshot version for BOM This branch includes the following new commits: new 67ba458d0 Defines proper snapshot version for BOM 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 release/struts-6-7-x updated (959b2182b -> 4a8ddbb27)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch release/struts-6-7-x in repository https://gitbox.apache.org/repos/asf/struts.git from 959b2182b Merge pull request #1195 from apache/fix/proper-version add 67ba458d0 Defines proper snapshot version for BOM new 4a8ddbb27 Merge pull request #1202 from apache/fix/bom-version 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: bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) branch fix/bom-version deleted (was 67ba458d0)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/bom-version in repository https://gitbox.apache.org/repos/asf/struts.git was 67ba458d0 Defines proper snapshot version for BOM 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) 01/01: Merge pull request #1202 from apache/fix/bom-version
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch release/struts-6-7-x in repository https://gitbox.apache.org/repos/asf/struts.git commit 4a8ddbb2744cb9c5f22b2fbe578bf11213fe0585 Merge: 959b2182b 67ba458d0 Author: Lukasz Lenart AuthorDate: Sun Feb 2 10:10:35 2025 +0100 Merge pull request #1202 from apache/fix/bom-version Defines proper snapshot version for BOM bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) branch release/struts-6-7-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 release/struts-6-7-x in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/release/struts-6-7-x by this push: new 07603b959 [maven-release-plugin] prepare for next development iteration 07603b959 is described below commit 07603b9591b75a0a8bac01ed84c888cb815c928e Author: Lukasz Lenart AuthorDate: Sun Feb 2 10:16:30 2025 +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 | 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 9408a47ff..ba8d7fdf4 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.7.1 +6.7.2-SNAPSHOT struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index a0c7008bb..d15c4b1ac 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -6.7.1 +6.7.2-SNAPSHOT struts2-rest-showcase war -6.7.1 +6.7.2-SNAPSHOT Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index b756a15ca..c5af7d3d8 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -6.7.1 +6.7.2-SNAPSHOT struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 9a412a5a7..6f003fe96 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.7.1 +6.7.2-SNAPSHOT struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index 50a090d42..d004d9dee 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -6.7.1 +6.7.2-SNAPSHOT struts2-bom -6.7.1 +6.7.2-SNAPSHOT pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -6.7.1 +6.7.2-SNAPSHOT true true @@ -190,7 +190,7 @@ -STRUTS_6_7_1 +STRUTS_6_7_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 411e10a5b..fbb7517f1 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.7.1 +6.7.2-SNAPSHOT struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index 26008cfca..ca00dbccf 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.7.1 +6.7.2-SNAPSHOT struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index 255d368fa..101811ae8 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.7.1 +6.7.2-SNAPSHOT struts2-osgi-bundles diff
(struts) branch release/struts-6-7-x updated: [maven-release-plugin] prepare release STRUTS_6_7_1
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch release/struts-6-7-x in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/release/struts-6-7-x by this push: new 3227d5929 [maven-release-plugin] prepare release STRUTS_6_7_1 3227d5929 is described below commit 3227d5929ae0335b17d8e0d0845d4b5b560d4968 Author: Lukasz Lenart AuthorDate: Sun Feb 2 10:16:20 2025 +0100 [maven-release-plugin] prepare release STRUTS_6_7_1 --- 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 acbf24d68..9408a47ff 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.7.1-SNAPSHOT +6.7.1 struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index ac2464dbe..a0c7008bb 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -6.7.1-SNAPSHOT +6.7.1 struts2-rest-showcase war -6.7.1-SNAPSHOT +6.7.1 Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 65e01f559..b756a15ca 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -6.7.1-SNAPSHOT +6.7.1 struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 55fc648f7..9a412a5a7 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.7.1-SNAPSHOT +6.7.1 struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index ac842cb3e..50a090d42 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -6.7.1-SNAPSHOT +6.7.1 struts2-bom -6.7.1-SNAPSHOT +6.7.1 pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -6.7.1-SNAPSHOT +6.7.1 true true @@ -190,7 +190,7 @@ -STRUTS_6_7_0 +STRUTS_6_7_1 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 5ff189848..411e10a5b 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.7.1-SNAPSHOT +6.7.1 struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index bbd051da3..26008cfca 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.7.1-SNAPSHOT +6.7.1 struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index 7d346e6ee..255d368fa 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.7.1-SNAPSHOT +6.7.1 struts2-osgi-bundles diff --git a/core/pom.xm
(struts) annotated tag STRUTS_6_7_1 created (now e5b4d3771)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to annotated tag STRUTS_6_7_1 in repository https://gitbox.apache.org/repos/asf/struts.git at e5b4d3771 (tag) tagging 3227d5929ae0335b17d8e0d0845d4b5b560d4968 (commit) replaces STRUTS_6_7_0 by Lukasz Lenart on Sun Feb 2 10:16:26 2025 +0100 - Log - [maven-release-plugin] copy for tag STRUTS_6_7_1 --- No new revisions were added by this update.
(struts) branch fix/improves-code-quality updated (14437155e -> b34665046)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/improves-code-quality in repository https://gitbox.apache.org/repos/asf/struts.git discard 14437155e Improves code quality Uses existing function to split input using comma add b34665046 Improves code quality Uses existing function to split input using comma 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 (14437155e) \ N -- N -- N refs/heads/fix/improves-code-quality (b34665046) 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: .../apache/struts2/convention/DefaultResultMapBuilderTest.java| 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-)
svn commit: r74583 - /dev/struts/6.7.1/
Author: lukaszlenart Date: Sun Feb 2 09:30:28 2025 New Revision: 74583 Log: Updates test release 6.7.1 Added: dev/struts/6.7.1/ dev/struts/6.7.1/struts-6.7.1-all.zip (with props) dev/struts/6.7.1/struts-6.7.1-all.zip.asc dev/struts/6.7.1/struts-6.7.1-all.zip.sha256 dev/struts/6.7.1/struts-6.7.1-all.zip.sha512 dev/struts/6.7.1/struts-6.7.1-apps.zip (with props) dev/struts/6.7.1/struts-6.7.1-apps.zip.asc dev/struts/6.7.1/struts-6.7.1-apps.zip.sha256 dev/struts/6.7.1/struts-6.7.1-apps.zip.sha512 dev/struts/6.7.1/struts-6.7.1-docs.zip (with props) dev/struts/6.7.1/struts-6.7.1-docs.zip.asc dev/struts/6.7.1/struts-6.7.1-docs.zip.sha256 dev/struts/6.7.1/struts-6.7.1-docs.zip.sha512 dev/struts/6.7.1/struts-6.7.1-lib.zip (with props) dev/struts/6.7.1/struts-6.7.1-lib.zip.asc dev/struts/6.7.1/struts-6.7.1-lib.zip.sha256 dev/struts/6.7.1/struts-6.7.1-lib.zip.sha512 dev/struts/6.7.1/struts-6.7.1-min-lib.zip (with props) dev/struts/6.7.1/struts-6.7.1-min-lib.zip.asc dev/struts/6.7.1/struts-6.7.1-min-lib.zip.sha256 dev/struts/6.7.1/struts-6.7.1-min-lib.zip.sha512 dev/struts/6.7.1/struts-6.7.1-src.zip (with props) dev/struts/6.7.1/struts-6.7.1-src.zip.asc dev/struts/6.7.1/struts-6.7.1-src.zip.sha256 dev/struts/6.7.1/struts-6.7.1-src.zip.sha512 Added: dev/struts/6.7.1/struts-6.7.1-all.zip == Binary file - no diff available. Propchange: dev/struts/6.7.1/struts-6.7.1-all.zip -- svn:mime-type = application/octet-stream Added: dev/struts/6.7.1/struts-6.7.1-all.zip.asc == --- dev/struts/6.7.1/struts-6.7.1-all.zip.asc (added) +++ dev/struts/6.7.1/struts-6.7.1-all.zip.asc Sun Feb 2 09:30:28 2025 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- + +iQJMBAABCgA2FiEEDgCGmDROYrkGM7fGKEFhBmOvux8FAmefOngYHGx1a2Fzemxl +bmFydEBhcGFjaGUub3JnAAoJEChBYQZjr7sfAQoQALYsCgO5vurD+MW08H8La1oZ +2ENitw/kYLuYlpWi2nia3PkSG7tRI7T0SwVvunEWRs9PFl0pBM4ybG5p5RzJ8adG +FPeL7xUscEqsY/VnkctBbD3OGwNQ0cVo5+0s8Q27rEDLykVBpXEoepl/FyHMqS8q +IvTBii813QO3rfy0+JlnXBSAU8F+JrILjmq1koYXeqMG92kmIwu/zBSgxlxFwOrQ +CCK+AC698pbetMKZuDyzMS79Ly2xP6QTChU+VJC6CiIv3zzN50VeGpY7UjKmTUhO +ysnbFB4wCRDlXvytLnow7LPn+WvynhYTO97Jcm6Dkpzz25Qm74bDu/et5XMKAJrE +Pqf09R4V5Qw8OW8sYbvns4Pc9EOFzOQhJFQNy7AbOMrjWq37oOEdEWFWWeTBMGVK +oJwOqgQMucWaJLEDpBBcZwgW6CfHFz+ds7SBr7VrftCpQ+YzdBRFyIFIQLIXRdQ3 +6hFQNEBWyGvZONz8Cuvu0VOkJ/fbVbP3F7QlqHvx6jYTWbAXj09o+YLR8VFzxzv8 +b9MxBVN2jYwULV3tr5dSb0r9KGOZK6lpQEFgn6CpYghwHVEqIicFrZnFBI6NWnvr +py8KkaZO90UAnqRX8S7NnKz1UbuIaEK3VdzyeS8ZALZHRrVhikSDjmmxbkrNvy9/ +DsLNbnAgjZjb4G7SXEXq +=0M/0 +-END PGP SIGNATURE- Added: dev/struts/6.7.1/struts-6.7.1-all.zip.sha256 == --- dev/struts/6.7.1/struts-6.7.1-all.zip.sha256 (added) +++ dev/struts/6.7.1/struts-6.7.1-all.zip.sha256 Sun Feb 2 09:30:28 2025 @@ -0,0 +1 @@ +90c64b6baf570abfd9f3f177ffa5505e8af543d71e0e17ec95985232c8a6bd32 struts-6.7.1-all.zip Added: dev/struts/6.7.1/struts-6.7.1-all.zip.sha512 == --- dev/struts/6.7.1/struts-6.7.1-all.zip.sha512 (added) +++ dev/struts/6.7.1/struts-6.7.1-all.zip.sha512 Sun Feb 2 09:30:28 2025 @@ -0,0 +1 @@ +ea2a06d0a19bc3f5c070aab8793549634202d825c65682183168e807f10759cd5a9979b9853bdaf035bad5492182741e893ab7396c54ac5181a5b7923b5aa179 struts-6.7.1-all.zip Added: dev/struts/6.7.1/struts-6.7.1-apps.zip == Binary file - no diff available. Propchange: dev/struts/6.7.1/struts-6.7.1-apps.zip -- svn:mime-type = application/octet-stream Added: dev/struts/6.7.1/struts-6.7.1-apps.zip.asc == --- dev/struts/6.7.1/struts-6.7.1-apps.zip.asc (added) +++ dev/struts/6.7.1/struts-6.7.1-apps.zip.asc Sun Feb 2 09:30:28 2025 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- + +iQJMBAABCgA2FiEEDgCGmDROYrkGM7fGKEFhBmOvux8FAmefOnkYHGx1a2Fzemxl +bmFydEBhcGFjaGUub3JnAAoJEChBYQZjr7sf0EUQAJorVR444MMhAHqT+Z4RUJ0Z +GFZnybevWfDOVTkzyUsmefQcL7rOG7O3H6gsCqdHwDqNwkrVcRKUW1lcofcYxywm +lDy9woEniUU/11TA9ZwiiaZA/9c/Lly0gMj7qAUtn79klq6vlLWOxZsDEHz5ldCe +QYCmjwAgvpG6bDiE0Xn5Q17RwpyN3IbobTbna5S8MSiQq8DriC+R0TBJewikbhs8 +v/h3QLxOh0fv4u16ED/YKzMFwu4RT0sZ9XrmwrtcD9PhkmWhfXO71UodvicYQIfM +MGiSdQ4zl2WToNSFAu9wtomXorEHq4tFl/Yjqn05sI/sWkl++clDLC8JEZ+noehq +Ub30ElKQ0vRzOh32jmTxtHZDD2YwptWrSFPZXemiC5i1gUJb5WP5dU2PnHkVRuSZ +Je5i2CNKNJ2XABwnZ8YrNWpCmQ8VAPMhOE5y1zsbXz42nSMEy68kOYtfug6U98ZC +mtSv0HhsiZa1PAE6bI9HagnKnOTlPchQQeNv5clCBYAieBSuNfZ//kRHHkkFpiIX +U/xuKjKOZKxXNuzGoQzRBiPiBTHJTFjefZQvLXIKS01baO8q
(struts) branch dependabot/github_actions/github/codeql-action-3.28.8 created (now 9d5d80298)
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.28.8 in repository https://gitbox.apache.org/repos/asf/struts.git at 9d5d80298 Bump github/codeql-action from 3.28.5 to 3.28.8 No new revisions were added by this update.
(struts) branch dependabot/maven/jakarta.servlet.jsp-jakarta.servlet.jsp-api-3.1.1 created (now 653d73896)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/jakarta.servlet.jsp-jakarta.servlet.jsp-api-3.1.1 in repository https://gitbox.apache.org/repos/asf/struts.git at 653d73896 Bump jakarta.servlet.jsp:jakarta.servlet.jsp-api from 3.1.0 to 3.1.1 No new revisions were added by this update.
(struts) branch dependabot/maven/org.htmlunit-htmlunit-4.9.0 created (now 0b4855ac4)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.htmlunit-htmlunit-4.9.0 in repository https://gitbox.apache.org/repos/asf/struts.git at 0b4855ac4 Bump org.htmlunit:htmlunit from 4.2.0 to 4.9.0 No new revisions were added by this update.
(struts-examples) branch dependabot/maven/io.quarkus-quarkus-universe-bom-3.17.8 deleted (was 5a17daa)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/io.quarkus-quarkus-universe-bom-3.17.8 in repository https://gitbox.apache.org/repos/asf/struts-examples.git was 5a17daa Bump io.quarkus:quarkus-universe-bom from 3.17.5 to 3.17.8 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-examples) branch dependabot/maven/io.quarkus-quarkus-universe-bom-3.18.1 created (now 42e9a14)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/io.quarkus-quarkus-universe-bom-3.18.1 in repository https://gitbox.apache.org/repos/asf/struts-examples.git at 42e9a14 Bump io.quarkus:quarkus-universe-bom from 3.17.5 to 3.18.1 No new revisions were added by this update.
(struts) 01/01: Merge pull request #1204 from apache/fix/improves-code-quality
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/struts.git commit f4d6564bbb4d9702b838c4d23fee6e582732b555 Merge: 080263e93 b34665046 Author: Lukasz Lenart AuthorDate: Mon Feb 3 07:16:47 2025 +0100 Merge pull request #1204 from apache/fix/improves-code-quality Improves code quality .../convention/DefaultResultMapBuilder.java| 201 ++--- .../convention/DefaultResultMapBuilderTest.java| 106 +++ 2 files changed, 165 insertions(+), 142 deletions(-)
(struts) branch fix/improves-code-quality deleted (was b34665046)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/improves-code-quality in repository https://gitbox.apache.org/repos/asf/struts.git was b34665046 Improves code quality Uses existing function to split input using comma 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 main updated (080263e93 -> f4d6564bb)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/struts.git from 080263e93 [maven-release-plugin] prepare for next development iteration add b34665046 Improves code quality Uses existing function to split input using comma new f4d6564bb Merge pull request #1204 from apache/fix/improves-code-quality 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: .../convention/DefaultResultMapBuilder.java| 201 ++--- .../convention/DefaultResultMapBuilderTest.java| 106 +++ 2 files changed, 165 insertions(+), 142 deletions(-)
(struts) branch main updated (f4d6564bb -> 442b4ea2e)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/struts.git from f4d6564bb Merge pull request #1204 from apache/fix/improves-code-quality add 9d5d80298 Bump github/codeql-action from 3.28.5 to 3.28.8 new 442b4ea2e Merge pull request #1205 from apache/dependabot/github_actions/github/codeql-action-3.28.8 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: .github/workflows/codeql.yml | 6 +++--- .github/workflows/scorecards-analysis.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
(struts) 01/01: Merge pull request #1205 from apache/dependabot/github_actions/github/codeql-action-3.28.8
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/struts.git commit 442b4ea2e64032573485be417a43fa2b3c0d3580 Merge: f4d6564bb 9d5d80298 Author: Lukasz Lenart AuthorDate: Mon Feb 3 07:17:24 2025 +0100 Merge pull request #1205 from apache/dependabot/github_actions/github/codeql-action-3.28.8 Bump github/codeql-action from 3.28.5 to 3.28.8 .github/workflows/codeql.yml | 6 +++--- .github/workflows/scorecards-analysis.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
(struts) branch dependabot/github_actions/github/codeql-action-3.28.8 deleted (was 9d5d80298)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/github_actions/github/codeql-action-3.28.8 in repository https://gitbox.apache.org/repos/asf/struts.git was 9d5d80298 Bump github/codeql-action from 3.28.5 to 3.28.8 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 main updated (442b4ea2e -> 58b0d536e)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/struts.git from 442b4ea2e Merge pull request #1205 from apache/dependabot/github_actions/github/codeql-action-3.28.8 add 0b4855ac4 Bump org.htmlunit:htmlunit from 4.2.0 to 4.9.0 new 58b0d536e Merge pull request #1207 from apache/dependabot/maven/org.htmlunit-htmlunit-4.9.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. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) branch fix/WW-5501-dmi-s7 created (now bdd29ac73)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/WW-5501-dmi-s7 in repository https://gitbox.apache.org/repos/asf/struts.git at bdd29ac73 WW-5501 Ignores DMI related action field This branch includes the following new commits: new bdd29ac73 WW-5501 Ignores DMI related action field 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-5501 Ignores DMI related action field
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/WW-5501-dmi-s7
in repository https://gitbox.apache.org/repos/asf/struts.git
commit bdd29ac7322dbf0743abc3db494124492d18b842
Author: Lukasz Lenart
AuthorDate: Sun Feb 2 13:56:03 2025 +0100
WW-5501 Ignores DMI related action field
---
.../multipart/AbstractMultiPartRequest.java| 18 --
.../multipart/JakartaMultiPartRequest.java | 12
.../multipart/JakartaStreamMultiPartRequest.java | 12
.../AbstractMultiPartRequestWithDMITest.java | 69 ++
.../JakartaMultiPartRequestWithDMITest.java| 28 +
.../JakartaStreamMultiPartRequestWithDMITest.java | 28 +
6 files changed, 161 insertions(+), 6 deletions(-)
diff --git
a/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java
b/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java
index cceef2cab..7f848a56d 100644
---
a/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java
+++
b/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java
@@ -18,9 +18,6 @@
*/
package org.apache.struts2.dispatcher.multipart;
-import org.apache.struts2.inject.Inject;
-import org.apache.struts2.security.DefaultExcludedPatternsChecker;
-import org.apache.struts2.security.ExcludedPatternsChecker;
import jakarta.servlet.http.HttpServletRequest;
import org.apache.commons.fileupload2.core.FileUploadByteCountLimitException;
import org.apache.commons.fileupload2.core.FileUploadContentTypeException;
@@ -28,11 +25,15 @@ import
org.apache.commons.fileupload2.core.FileUploadException;
import org.apache.commons.fileupload2.core.FileUploadFileCountLimitException;
import org.apache.commons.fileupload2.core.FileUploadSizeException;
import
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletDiskFileUpload;
+import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.dispatcher.LocalizedMessage;
+import org.apache.struts2.inject.Inject;
+import org.apache.struts2.security.DefaultExcludedPatternsChecker;
+import org.apache.struts2.security.ExcludedPatternsChecker;
import java.io.IOException;
import java.nio.charset.Charset;
@@ -54,7 +55,8 @@ public abstract class AbstractMultiPartRequest implements
MultiPartRequest {
private static final Logger LOG =
LogManager.getLogger(AbstractMultiPartRequest.class);
-private static final String EXCLUDED_FILE_PATTERN =
".*[<>&\"'|;/?*:]+.*|.*\\.\\..*";
+private static final String EXCLUDED_FILE_PATTERN =
"^(.*[<>&\"'|;/?*:]+.*|.*\\.\\..*)$";
+private static final String EXCLUDED_FILE_PATTERN_WITH_DMI_SUPPORT =
"^(?!action:[^<>&\"'|;/?*:]+(![^<>&\"'|;/?*:]+)?$)(.*[<>&\"'|;/?*:]+.*|.*\\.\\..*)$\n";
/**
* Defines the internal buffer size used during streaming operations.
@@ -114,9 +116,13 @@ public abstract class AbstractMultiPartRequest implements
MultiPartRequest {
private final ExcludedPatternsChecker patternsChecker;
-protected AbstractMultiPartRequest() {
+protected AbstractMultiPartRequest(String dmiValue) {
patternsChecker = new DefaultExcludedPatternsChecker();
-((DefaultExcludedPatternsChecker)
patternsChecker).setAdditionalExcludePatterns(EXCLUDED_FILE_PATTERN);
+if (BooleanUtils.toBoolean(dmiValue)) {
+((DefaultExcludedPatternsChecker)
patternsChecker).setAdditionalExcludePatterns(EXCLUDED_FILE_PATTERN_WITH_DMI_SUPPORT);
+} else {
+((DefaultExcludedPatternsChecker)
patternsChecker).setAdditionalExcludePatterns(EXCLUDED_FILE_PATTERN);
+}
}
/**
diff --git
a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
index 737ba23f8..341900eb8 100644
---
a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
+++
b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
@@ -25,6 +25,8 @@ import
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletDiskFileUpl
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.inject.Inject;
import java.io.IOException;
import java.nio.charset.Charset;
@@ -41,6 +43,16 @@ public class JakartaMultiPartRequest extends
AbstractMultiPartRequest {
private static final Logger LOG =
LogManager.getLogger(JakartaMultiPartRequest.class);
+public JakartaMultiPartRequest() {
+s
(struts) 01/01: Improves code quality Uses existing function to split input using comma
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/improves-code-quality
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 14437155e3c1210250666252c3330ca200bad046
Author: Lukasz Lenart
AuthorDate: Sun Feb 2 16:21:07 2025 +0100
Improves code quality
Uses existing function to split input using comma
---
.../convention/DefaultResultMapBuilder.java| 201 ++---
.../convention/DefaultResultMapBuilderTest.java| 102 +++
2 files changed, 162 insertions(+), 141 deletions(-)
diff --git
a/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java
b/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java
index 2688e32d7..380b77994 100644
---
a/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java
+++
b/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java
@@ -18,26 +18,27 @@
*/
package org.apache.struts2.convention;
-import org.apache.struts2.action.Action;
+import jakarta.servlet.ServletContext;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.struts2.ActionContext;
+import org.apache.struts2.action.Action;
import org.apache.struts2.config.ConfigurationException;
import org.apache.struts2.config.entities.PackageConfig;
import org.apache.struts2.config.entities.ResultConfig;
import org.apache.struts2.config.entities.ResultTypeConfig;
+import org.apache.struts2.convention.annotation.Result;
+import org.apache.struts2.convention.annotation.Results;
import org.apache.struts2.inject.Container;
import org.apache.struts2.inject.Inject;
+import org.apache.struts2.util.TextParseUtil;
import org.apache.struts2.util.finder.ClassLoaderInterface;
import org.apache.struts2.util.finder.ClassLoaderInterfaceDelegate;
import org.apache.struts2.util.finder.ResourceFinder;
import org.apache.struts2.util.finder.Test;
-import jakarta.servlet.ServletContext;
-import org.apache.commons.lang3.BooleanUtils;
-import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.struts2.convention.annotation.Result;
-import org.apache.struts2.convention.annotation.Results;
import java.io.IOException;
import java.net.URL;
@@ -123,23 +124,24 @@ public class DefaultResultMapBuilder implements
ResultMapBuilder {
/**
* Constructs the SimpleResultMapBuilder using the given result location.
*
- * @param servletContext The ServletContext for finding the resources of
the web application.
- * @param container The Xwork container
- * @param relativeResultTypes The list of result types that can have
locations that are relative
- * and the result location (which is the resultPath plus the
namespace) prepended to them.
+ * @param servletContext The ServletContext for finding the resources
of the web application.
+ * @param container The Xwork container
+ * @param relativeResultTypes The list of result types that can have
locations that are relative
+ *and the result location (which is the
resultPath plus the namespace) prepended to them.
*/
@Inject
public DefaultResultMapBuilder(ServletContext servletContext, Container
container,
-@Inject(ConventionConstants.CONVENTION_RELATIVE_RESULT_TYPES)
String relativeResultTypes) {
+
@Inject(ConventionConstants.CONVENTION_RELATIVE_RESULT_TYPES) String
relativeResultTypes) {
this.servletContext = servletContext;
-this.relativeResultTypes =
Set.of(relativeResultTypes.split("\\s*[,]\\s*"));
-this.conventionsService =
container.getInstance(ConventionsService.class,
container.getInstance(String.class,
ConventionConstants.CONVENTION_CONVENTIONS_SERVICE));
+this.relativeResultTypes =
TextParseUtil.commaDelimitedStringToSet(relativeResultTypes);
+String instanceName = container.getInstance(String.class,
ConventionConstants.CONVENTION_CONVENTIONS_SERVICE);
+this.conventionsService =
container.getInstance(ConventionsService.class, instanceName);
}
/**
* @param flatResultLayout If 'true' result resources will be expected to
be in the form
- * ${namespace}/${actionName}-${result}.${extension}, otherwise
in the form
- * ${namespace}/${actionName}/${result}.${extension}
+ *
${namespace}/${actionName}-${result}.${extension}, otherwise in the form
+ *
${namespace}/${actionName}/${result}.${exte
(struts) branch fix/improves-code-quality created (now 14437155e)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/improves-code-quality in repository https://gitbox.apache.org/repos/asf/struts.git at 14437155e Improves code quality Uses existing function to split input using comma This branch includes the following new commits: new 14437155e Improves code quality Uses existing function to split input using comma 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.
