Rebase struts-7-0-x branch

[lukaszlenart]

Rebases struts-7-0-x branch to be up to date with the master branch.

[sonarqubecloud]

Quality Gate failed

Failed conditions

52.6% Coverage on New Code (required ≥ 80%)

See analysis details on SonarCloud

[kusalk]

The diff for this PR is confusing me - it seems like some of the changes from my PRs (#800 and #806) are already present on the 7.0 branch and some are in this PR?

Anyway, I trust you know what you're doing so go ahead and merge this - but I usually avoid rebasing and rewriting history for release branches (or any long-living branch) because resolving conflicts can become cumbersome and complex, and it's often harder to revert back to a previous state in case of a mistaken push or change

I find it simpler to use merge commits as I did in #797 - I created that PR as follows:

git checkout release/struts-7-0-x
git pull
git checkout -b merge-master-to-70-2024-12-17
git merge origin/master

And then I created a PR from merge-master-to-70-2024-12-17 targeting release/struts-7-0-x.

Just an alternative approach you might find easier in the future :)

[lukaszlenart]

I rebased release/struts-7-0-x but looks like I missed something during that process, that's why I created the PR with all the missing parts

[kusalk]

All good then :)