This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5336-deprecate-ognltool in repository https://gitbox.apache.org/repos/asf/struts.git
discard 8832865b2 WW-5336 Reduce cognitive complexity #makeSelectList discard 23abcf7eb WW-5336 Deprecate OGNL in template context discard 7469eecc4 WW-5336 Clean up StrutsUtil discard 028ca92ac WW-5336 Deprecate OgnlTool discard 542700e8b WW-5336 Tidy up FreemarkerManager add 298eefe8c WW-5331 Uses proper signature of get() add 5aa1d076b Increases wait time to avoid failing test add e1a80789f WW-5331 Covers new logic with tests add e8287ddee WW-5331 Adds missing header with licence add 710ec2edb WW-5331 Adds tests covering ApplicationMap add 4a678f6bb WW-5331 Adds missing @Override annotations add f31ba637c Merge pull request #727 from apache/fix/WW-5331-proper-get add dc43c891d WW-5334 Extract ConventionJUnit4Test into correct module add 94a3e6bd9 Merge pull request #733 from apache/WW-5334-move-convention-test add 3f558a8cf Defines a proper CODEOWNERS file https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners add 87f80f473 Merge pull request #728 from apache/feature/codeowners add 2d6fe8430 WW-5334 Remove unused imports ContextUtil add f4daeb3ea WW-5334 Clean up VelocityStrutsUtil add 114b6e4f2 WW-5334 Clean up VelocityManager#applyDefaultConfiguration add 2abf8677b WW-5334 Clean up VelocityManager context creation add 6d9bfb6af WW-5334 Remove unused import XWorkTestCase add 225063960 WW-5334 Modernise VelocityResultTest add 2fa9d60a2 WW-5334 Add basic unit tests for VelocityManager add d70ad5b73 WW-5334 Fix license for VelocityManagerTest add 94c1b2a29 WW-5334 Add AssertJ as default plugin test dependency add 22a6ae9d6 WW-5334 Add further unit tests to VelocityManagerTest add 0ef086c89 Merge pull request #731 from apache/WW-5334-velocity-manager add bb68ce6ae WW-5337 Catch PatternSyntaxException and ensure ConfigurationException thrown add 393eb8c0f WW-5337 Minor clean up OgnlUtil add 841705cad WW-5337 Strip trailing periods from package names provided as not needed add 4145d1af1 WW-5337 Make #isExcludedPackageNamePatterns more succinct add e53dd7dd5 WW-5337 Make #isClassExcluded (semantics changes) and #isExcludedPackageExempt constant time add 746c75413 WW-5337 Make #isExcludedPackageNames runtime proportional to no. of package parts rather than no. of excluded packages add 72a5d2133 WW-5337 Update struts-excluded-classes.xml to not have trailing periods add b0f1ef1f8 WW-5337 Revert Object special handling add a228b14a4 WW-5337 Drop superinterface/superclass banning test add 270ec4ad7 WW-5337 Fix #testPackageNameExclusionAsCommaDelimited add 783063c66 WW-5337 Initialise default exclusions one-time in SecurityMemberAccess (more performant) add e75f8d82b Merge pull request #736 from apache/WW-5337-exclusion-performance add 709434eeb WW-5336 Tidy up FreemarkerManager add e8614a99d WW-5336 Deprecate OgnlTool add 79e950fe7 WW-5336 Clean up StrutsUtil add 51345dbe5 WW-5336 Deprecate OGNL in template context add ba44510fc WW-5336 Reduce cognitive complexity #makeSelectList 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 (8832865b2) \ N -- N -- N refs/heads/WW-5336-deprecate-ognltool (ba44510fc) 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: CODEOWNERS | 2 + .../com/opensymphony/xwork2/XWorkTestCase.java | 7 +- .../com/opensymphony/xwork2/ognl/OgnlUtil.java | 26 +-- .../xwork2/ognl/SecurityMemberAccess.java | 50 +++--- .../apache/struts2/dispatcher/ApplicationMap.java | 13 +- .../org/apache/struts2/dispatcher/RequestMap.java | 8 +- .../org/apache/struts2/views/jsp/TagUtils.java | 4 +- .../src/main/resources/struts-excluded-classes.xml | 84 +++++----- .../xwork2/ognl/SecurityMemberAccessTest.java | 19 +-- .../struts2/dispatcher/ApplicationMapTest.java | 93 +++++++++++ .../apache/struts2/dispatcher/RequestMapTest.java | 93 +++++++++++ .../exec/StrutsBackgroundProcessTest.java | 2 +- plugins/convention/pom.xml | 15 ++ .../src/test/java/actions/MessageAction.java} | 5 +- .../struts2/convention/ConventionJUnit4Test.java} | 11 +- .../src/test/resources/message-success.ftl} | 0 .../resources/struts-convention-configuration.xml} | 5 +- plugins/json/pom.xml | 6 - plugins/junit/pom.xml | 14 -- .../resources/struts-convention-configuration.xml | 38 ----- plugins/pom.xml | 5 + .../struts2/portlet/PortletApplicationMap.java | 16 +- .../apache/struts2/portlet/PortletRequestMap.java | 3 + .../apache/struts2/portlet/PortletSessionMap.java | 2 +- plugins/rest/pom.xml | 6 - .../struts2/views/velocity/VelocityManager.java | 186 +++++++-------------- .../struts2/views/velocity/VelocityStrutsUtil.java | 16 +- .../views/velocity/VelocityManagerTest.java | 116 +++++++++++++ .../views/velocity/result/VelocityResultTest.java | 102 +++++------ .../main => velocity/src/test}/resources/tools.xml | 6 +- pom.xml | 5 + 31 files changed, 583 insertions(+), 375 deletions(-) create mode 100644 CODEOWNERS create mode 100644 core/src/test/java/org/apache/struts2/dispatcher/ApplicationMapTest.java create mode 100644 core/src/test/java/org/apache/struts2/dispatcher/RequestMapTest.java rename plugins/{junit/src/test/java/actions/ViewAction.java => convention/src/test/java/actions/MessageAction.java} (85%) rename plugins/{junit/src/test/java/org/apache/struts2/junit/convention/StrutsJUnit4ConventionTestCaseTest.java => convention/src/test/java/org/apache/struts2/convention/ConventionJUnit4Test.java} (86%) rename plugins/{junit/src/test/resources/view-success.ftl => convention/src/test/resources/message-success.ftl} (100%) copy plugins/{velocity/src/main/resources/struts-deferred.xml => convention/src/test/resources/struts-convention-configuration.xml} (88%) delete mode 100644 plugins/junit/src/test/resources/struts-convention-configuration.xml create mode 100644 plugins/velocity/src/test/java/org/apache/struts2/views/velocity/VelocityManagerTest.java copy plugins/{tiles/src/main => velocity/src/test}/resources/tools.xml (84%)