This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/WW-5525-sma-npe in repository https://gitbox.apache.org/repos/asf/struts.git
discard a8bce0f94 WW-5525 Fixes NPE when checking if expressions is acceptable add 358f80856 WW-5512 Extends the container to support injecting optional parameters into constructor add 05deb7b5e Merge pull request #1191 from apache/feature/WW-5512-optional-inject-s7 add 10d3545ac Bump github/codeql-action from 3.28.1 to 3.28.5 add ebc4e3516 Merge pull request #1196 from apache/dependabot/github_actions/github/codeql-action-3.28.5 add c5cf2f8f9 Bump byte-buddy.version from 1.15.11 to 1.16.1 add 01af64615 Merge pull request #1198 from apache/dependabot/maven/byte-buddy.version-1.16.1 add d5b94369d Bump org.apache.commons:commons-text from 1.12.0 to 1.13.0 add 25d0338e6 Merge pull request #1199 from apache/dependabot/maven/org.apache.commons-commons-text-1.13.0 add f6bf43ae0 [maven-release-plugin] prepare release STRUTS_7_0_1 add 080263e93 [maven-release-plugin] prepare for next development iteration 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 21c7ecc10 WW-5501 Ignores DMI related action field add abbb2aad2 Fix inject add 2d8433d30 WW-5516 Fix AttributeMap NPE when PageContext has no request add 9474ba41f Merge pull request #1209 from apache/WW-5516-attrmap-npe add 932627976 [maven-release-plugin] prepare release STRUTS_7_0_2 add a1de1cfde [maven-release-plugin] prepare for next development iteration add ff249c64c WW-5528 Ensure multipart upload illegal characters reported as error add 02e17f591 Merge pull request #1213 from apache/WW-5528-multipart-illegal-char-errors add 568b292bd WW-5501 Reverts changes related to WW-5501 (#1219) add adcd1df0c Bump github/codeql-action from 3.28.8 to 3.28.9 (#1217) add 3c856c92a WW-5525 Fix NPE in ProxyUtil for SecurityMemberAccess originating static members add 31c3fc50e Merge pull request #1214 from apache/WW-5525-proxyutil-npe add ac1fbc14f WW-5525 Fixes NPE when checking if expressions is acceptable 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 (a8bce0f94) \ N -- N -- N refs/heads/fix/WW-5525-sma-npe (ac1fbc14f) 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 +- apps/pom.xml | 2 +- apps/rest-showcase/pom.xml | 4 +- apps/showcase/pom.xml | 2 +- assembly/pom.xml | 2 +- bom/pom.xml | 6 +- core/pom.xml | 2 +- .../apache/struts2/dispatcher/AttributeMap.java | 4 +- .../multipart/AbstractMultiPartRequest.java | 32 +--- .../multipart/JakartaMultiPartRequest.java | 17 +- .../multipart/JakartaStreamMultiPartRequest.java | 14 +- .../org/apache/struts2/inject/ContainerImpl.java | 60 +++++- .../apache/struts2/ognl/SecurityMemberAccess.java | 35 ++-- .../java/org/apache/struts2/util/ProxyUtil.java | 9 +- .../struts2/dispatcher/AttributeMapTest.java | 47 +++-- .../multipart/AbstractMultiPartRequestTest.java | 57 +----- .../apache/struts2/inject/ContainerImplTest.java | 142 ++++++++++++--- .../ActionFileUploadInterceptorTest.java | 62 +------ .../apache/struts2/ognl/OgnlValueStackTest.java | 47 ++++- .../DefaultExcludedPatternsCheckerTest.java | 2 +- jakarta/pom.xml | 2 +- jakarta/velocity-tools-jsp-jakarta/pom.xml | 2 +- jakarta/velocity-tools-view-jakarta/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 +- .../convention/DefaultResultMapBuilder.java | 201 ++++++++++----------- .../convention/DefaultResultMapBuilderTest.java | 106 +++++++---- 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/pom.xml | 2 +- plugins/rest/pom.xml | 2 +- plugins/spring/pom.xml | 2 +- .../apache/struts2/spring/SpringProxyUtilTest.java | 4 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/velocity/pom.xml | 2 +- plugins/xslt/pom.xml | 2 +- pom.xml | 10 +- 45 files changed, 486 insertions(+), 429 deletions(-)