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 6cebeaca9 Merge pull request #970 from apache/feature/WW-5430-freemarker-jakarta add 13916c8b8 WW-5310 Fixes broken support for Fragments in <s:url/> tag add a8954508c Merge pull request #968 from apache/fix/WW-5310-fragment add b96cf2c07 WW-5429 Log parameter annotation issues at ERROR level when in DevMode add ba46c18f0 WW-5429 Make DebugUtils final and remove @author JavaDoc tag add 898a8d9ef Merge pull request #969 from apache/WW-5429-param-anno-log add 75ebbf436 WW-5431 Marks unused constants as deprecated To be removed in Struts 7 add 4267bf064 Merge pull request #971 from apache/feature/WW-5431-deprecated add 63fcf0f14 Bump commons-validator:commons-validator from 1.8.0 to 1.9.0 add 100ef07a4 Merge pull request #958 from apache/dependabot/maven/commons-validator-commons-validator-1.9.0 add 54bf309f8 Bump org.apache.felix:org.apache.felix.main from 6.0.3 to 7.0.5 add 53ed5f6df Merge pull request #960 from apache/dependabot/maven/org.apache.felix-org.apache.felix.main-7.0.5 add b07268d5b Bump org.apache.maven.plugins:maven-enforcer-plugin from 3.4.1 to 3.5.0 add 688413a35 Merge pull request #965 from apache/dependabot/maven/org.apache.maven.plugins-maven-enforcer-plugin-3.5.0 add a99162a1a Bump org.codehaus.mojo:exec-maven-plugin from 3.2.0 to 3.3.0 add 8b22f7170 Merge pull request #966 from apache/dependabot/maven/org.codehaus.mojo-exec-maven-plugin-3.3.0 add 98f2e68e0 "Swap order of sysStrSubstitutor and envStrSubstitutor in substitute method" add 82b364d52 Merge pull request #977 from stefansielaff/fix-behavior-of-envsvaluesubstitutor add 2f814186c WW-5428 Allowlist capability should resolve Hibernate proxies when disableProxyObjects is not set add abf03fdcc WW-5428 Clean up SecurityMemberAccessProxyTest add c965812ff WW-5428 Add unit test coverage for Hibernate proxy resolution add c6f394a0e WW-5428 Add log warning for Hibernate entities add 8555dc266 WW-5428 Add log warning for allowlist disabled add 05680d782 WW-5428 Amend log warning for missing allowlist entry add 7f57e895a Merge pull request #967 from apache/WW-5428-allowlist-hibernate add 81b494317 WW-5439 Move Dev Mode security configuration add 398e104fe Merge pull request #979 from apache/WW-5439-fix-dev-mode add e2d5cc2bd Merge branch 'refs/heads/master' into 7.0.x/merge-master-2024-07-08 add b65005c72 Merge pull request #980 from apache/7.0.x/merge-master-2024-07-08 No new revisions were added by this update. Summary of changes: .../config/providers/EnvsValueSubstitutor.java | 4 +- .../xwork2/interceptor/ValidationAware.java | 6 +- .../xwork2/ognl/ErrorMessageBuilder.java | 4 +- .../com/opensymphony/xwork2/ognl/OgnlUtil.java | 53 +++++----- .../xwork2/ognl/SecurityMemberAccess.java | 108 ++++++++++++++++++++- .../ValidatorContext.java => util/DebugUtils.java} | 30 +++--- .../com/opensymphony/xwork2/util/ProxyUtil.java | 33 +++++++ .../struts2/components/ServletUrlRenderer.java | 18 ++-- .../parameter/ParametersInterceptor.java | 51 +++++----- .../views/freemarker/FreemarkerManager.java | 26 ++++- .../com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 36 ++++--- .../xwork2/ognl/SecurityMemberAccessTest.java | 81 +++++++++++++++- .../parameter/ParametersInterceptorTest.java | 61 +++++++----- .../struts2/url/StrutsQueryStringParserTest.java | 8 ++ .../org/apache/struts2/views/jsp/URLTagTest.java | 36 +++++++ .../xwork2/ognl/SecurityMemberAccessProxyTest.java | 92 +++++++++--------- plugins/tiles/pom.xml | 2 +- pom.xml | 6 +- 18 files changed, 474 insertions(+), 181 deletions(-) copy core/src/main/java/com/opensymphony/xwork2/{validator/ValidatorContext.java => util/DebugUtils.java} (58%)