(struts) 01/01: Merge remote-tracking branch 'origin/master' into merge-forward-master
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch merge-forward-master in repository https://gitbox.apache.org/repos/asf/struts.git commit 2190497733df27ff13955a54616b2ce99f20dbd2 Merge: ed04c009c 63b0da3a7 Author: Kusal Kithul-Godage AuthorDate: Tue Nov 21 17:13:57 2023 +1100 Merge remote-tracking branch 'origin/master' into merge-forward-master .asf.yaml | 4 +- Jenkinsfile| 6 +- .../com/opensymphony/xwork2/ognl/OgnlUtil.java | 78 --- .../opensymphony/xwork2/ognl/OgnlValueStack.java | 3 + .../xwork2/ognl/SecurityMemberAccess.java | 56 -- .../java/org/apache/struts2/StrutsConstants.java | 6 ++ .../xwork2/ognl/SecurityMemberAccessTest.java | 77 ++ .../views/velocity/StrutsVelocityContext.java | 47 +++ .../views/velocity/StrutsVelocityContextTest.java | 90 ++ 9 files changed, 329 insertions(+), 38 deletions(-)
(struts) branch merge-forward-master created (now 219049773)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch merge-forward-master in repository https://gitbox.apache.org/repos/asf/struts.git at 219049773 Merge remote-tracking branch 'origin/master' into merge-forward-master This branch includes the following new commits: new 219049773 Merge remote-tracking branch 'origin/master' into merge-forward-master 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 merge-forward-master deleted (was 219049773)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch merge-forward-master in repository https://gitbox.apache.org/repos/asf/struts.git was 219049773 Merge remote-tracking branch 'origin/master' into merge-forward-master 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 (ed04c009c -> 0321d2777)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git from ed04c009c Merge pull request #794 from apache/fix/WW-5335-scorecards add fadfe24c5 Uses the new notifications@ list for all the messages form Github add 30aee93f7 Merge pull request #788 from apache/feature/notifications-list add 2188d1159 Send Jenkins notifications to the notifications@ list add ea856e0d4 Merge pull request #790 from apache/feature/jenkins-notifications-list add a2b4744c3 WW-5363 Velocity: read chained contexts before ValueStack add cf9e53573 WW-5363 Add test coverage add 6c98663f8 WW-5363 Fix super#internalGet add 29d471e2d WW-5363 Improve code coverage add f989f370b Merge pull request #789 from apache/issue/WW-5363-velocity-order add bef976917 WW-5350 Implement OGNL Allowlist capability add b4fbc0f0d Merge branch 'master' into WW-5350-allowlist-2 add 9f45983da Merge pull request #781 from apache/WW-5350-allowlist-2 add 0504e7076 WW-5363 Remove redundant method from VelocityManager add 63b0da3a7 Merge pull request #793 from apache/WW-5363-velocity-order-2 add 219049773 Merge remote-tracking branch 'origin/master' into merge-forward-master add 0321d2777 Merge pull request #797 from apache/merge-forward-master No new revisions were added by this update. Summary of changes: .asf.yaml | 4 +- Jenkinsfile| 6 +- .../com/opensymphony/xwork2/ognl/OgnlUtil.java | 78 --- .../opensymphony/xwork2/ognl/OgnlValueStack.java | 3 + .../xwork2/ognl/SecurityMemberAccess.java | 56 -- .../java/org/apache/struts2/StrutsConstants.java | 6 ++ .../xwork2/ognl/SecurityMemberAccessTest.java | 77 ++ .../views/velocity/StrutsVelocityContext.java | 47 +++ .../views/velocity/StrutsVelocityContextTest.java | 90 ++ 9 files changed, 329 insertions(+), 38 deletions(-) create mode 100644 plugins/velocity/src/test/java/org/apache/struts2/views/velocity/StrutsVelocityContextTest.java
