This is an automated email from the ASF dual-hosted git repository.
kusal pushed a change to branch feature/WW-3714-rename
in repository https://gitbox.apache.org/repos/asf/struts.git
discard 717ab9fd8 WW-3714 Moves all classes from com.opensymphony.xwork2 into
org.apache.struts2
add 5c5683907 WW-5468 Fixes @StrutsParameter for ModelDriven
add a57f51cc2 WW-5468 Reworked fix, exempt ModelDriven Action parameters
add 58e19dde3 WW-5468 Remove unneeded annotations
add f6c17e9c6 WW-5468 Replace tabs with spaces
add 762a0e02e Merge pull request #1072 from
apache/fix/WW-5468-modeldriven-2
add f03d36c46 Bump org.apache.maven.plugins:maven-site-plugin from 3.12.1
to 3.20.0
add 292420822 Merge pull request #1053 from
apache/dependabot/maven/org.apache.maven.plugins-maven-site-plugin-3.20.0
add fda2c546b Bump org.owasp:dependency-check-maven from 10.0.3 to 10.0.4
add 0ce2c7b5d Merge pull request #1054 from
apache/dependabot/maven/org.owasp-dependency-check-maven-10.0.4
add d7626ed7d Bump org.codehaus.mojo:exec-maven-plugin from 3.3.0 to 3.4.1
add 40b439580 Merge pull request #1057 from
apache/dependabot/maven/org.codehaus.mojo-exec-maven-plugin-3.4.1
add 3c71b2ed8 Bump github/codeql-action from 3.26.6 to 3.26.8
add 48c4e3b6a Merge pull request #1058 from
apache/dependabot/github_actions/github/codeql-action-3.26.8
add 0bd4266d2 WW-5297 Fixes checking nonce of invalidated session
add 75cc664fd Merge pull request #1060 from
apache/fix/WW-5297-invalid-session
add c81245029 [maven-release-plugin] prepare release STRUTS_6_6_1
add d33be1d43 [maven-release-plugin] prepare for next development iteration
add 3e04197ba Bump github/codeql-action from 3.26.8 to 3.26.12
add b3629460e Merge pull request #1073 from
apache/dependabot/github_actions/github/codeql-action-3.26.12
add 3528b8832 Bump actions/upload-artifact from 4.4.0 to 4.4.3
add 2eff2da4f Merge pull request #1074 from
apache/dependabot/github_actions/actions/upload-artifact-4.4.3
add 7473b4cef Bump commons-logging:commons-logging from 1.3.3 to 1.3.4
add cd7f1097e Merge pull request #1061 from
apache/dependabot/maven/commons-logging-commons-logging-1.3.4
add 9d903ddf9 Bump
org.apache.maven.plugins:maven-project-info-reports-plugin
add fbab5d4df Merge pull request #1065 from
apache/dependabot/maven/org.apache.maven.plugins-maven-project-info-reports-plugin-3.7.0
add 4ccde0087 Bump log4j2.version from 2.23.1 to 2.24.1
add b115a510a Merge pull request #1064 from
apache/dependabot/maven/log4j2.version-2.24.1
add 1bcadd468 Bump jackson.version from 2.17.2 to 2.18.0
add 78451db87 Merge pull request #1062 from
apache/dependabot/maven/jackson.version-2.18.0
add 8dc652789 Merge remote-tracking branch 'origin/master' into
merge/master-to-7xx-2024-10-15
add c1b9ff4ed Merge pull request #1076 from
apache/merge/master-to-7xx-2024-10-15
add a0819ad18 WW-3714 Moves all classes from com.opensymphony.xwork2 into
org.apache.struts2
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 (717ab9fd8)
\
N -- N -- N refs/heads/feature/WW-3714-rename (a0819ad18)
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 | 4 +-
.../showcase/modelDriven/ModelDrivenAction.java | 2 +-
.../main/java/org/apache/struts2/ModelDriven.java | 6 +
.../java/org/apache/struts2/components/UIBean.java | 8 +-
.../parameter/ParametersInterceptor.java | 59 ++-
.../java/org/apache/struts2/ModelDrivenAction.java | 3 +-
.../struts2/ModelDrivenAnnotationAction.java | 3 +-
.../org/apache/struts2/components/UIBeanTest.java | 43 ++-
.../interceptor/ModelDrivenInterceptorTest.java | 2 +-
.../parameter/StrutsParameterAnnotationTest.java | 35 +-
.../apache/struts2/result/StreamResultTest.java | 4 +-
.../apache/struts2/test/ModelDrivenAction2.java | 4 +-
.../struts2/test/ModelDrivenAnnotationAction2.java | 4 +-
.../test/subtest/NullModelDrivenAction.java | 3 +-
.../validator/VisitorValidatorModelAction.java | 5 +-
.../beanvalidation/actions/ModelDrivenAction.java | 5 +-
.../actions/ValidateGroupAction.java | 9 +-
.../struts2/views/java/simple/AbstractTest.java | 11 +
.../apache/struts2/views/java/simple/HeadTest.java | 2 +-
.../apache/struts2/views/java/simple/LinkTest.java | 18 +-
.../struts2/views/java/simple/ScriptTest.java | 12 -
.../apache/struts2/junit/StrutsRestTestCase.java | 3 +-
.../struts2/rest/RestActionInvocationTest.java | 404 ++++++++++-----------
.../java/org/apache/struts2/ModelDrivenAction.java | 3 +-
plugins/tiles/pom.xml | 2 +-
pom.xml | 12 +-
27 files changed, 364 insertions(+), 308 deletions(-)
