This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/sonar in repository https://gitbox.apache.org/repos/asf/struts.git
omit 47215ba42 Always run Sonar scan against the master branch add 100f5052d WW-5418 Forbid enums add 7e9f6e84f WW-5418 Exclude Tomcat Jasper classes add 3c21e8229 Merge pull request #916 from apache/WW-5418-struts-sec add 268ed789e Bump org.assertj:assertj-core from 3.25.2 to 3.25.3 add efdaf7e50 Merge pull request #909 from apache/dependabot/maven/org.assertj-assertj-core-3.25.3 add 856d98010 Bump actions/upload-artifact from 4.3.1 to 4.3.2 add eca5b2108 Merge pull request #923 from apache/dependabot/github_actions/actions/upload-artifact-4.3.2 add b2b35f066 Bump org.codehaus.mojo:versions-maven-plugin from 2.16.1 to 2.16.2 add 3cde66859 Merge pull request #922 from apache/dependabot/maven/org.codehaus.mojo-versions-maven-plugin-2.16.2 add c1c6a463a Bump org.codehaus.mojo:exec-maven-plugin from 3.1.0 to 3.2.0 add 5cd935604 Merge pull request #925 from apache/dependabot/maven/org.codehaus.mojo-exec-maven-plugin-3.2.0 add 2d9af47a9 Bump actions/upload-artifact from 4.3.2 to 4.3.3 add ed3786c6b Merge pull request #926 from apache/dependabot/github_actions/actions/upload-artifact-4.3.3 add ccd5f5d53 Bump asm.version from 9.6 to 9.7 add 3ed212a1f Merge pull request #907 from apache/dependabot/maven/asm.version-9.7 add ac409d6cb Bump org.apache.maven.plugins:maven-failsafe-plugin add f2e93d017 Merge pull request #905 from apache/dependabot/maven/org.apache.maven.plugins-maven-failsafe-plugin-3.2.5 add 36275b9e0 WW-5420 Upgrades commons-text to ver. 1.12.0 add c0d1217d7 Merge pull request #924 from apache/feature/WW-5420-text add a88cb741d WW-5419 Fixes support for loading Tiles definitions add 49b8eedf1 Merge pull request #920 from apache/fix/WW-5419-tiles add 758174c52 WW-5400 Extend default configuration options for the CSP interceptor. Previously, it was impossible to set global options for the CSP interceptor. The only options was to have every action individually implement CspSettingsAware. add 0151bdeb9 WW-5400 Better toString formatting add 6ac8b04ad WW-5400 Added @since Struts 6.5.0 to new properties as requested add 649760d8b Merge pull request #913 from eschulma/master add 942fbd67e Bump org.apache.maven.plugins:maven-source-plugin from 3.3.0 to 3.3.1 add f338fda6d Merge pull request #934 from apache/dependabot/maven/org.apache.maven.plugins-maven-source-plugin-3.3.1 add c6b53d488 Bump slf4j.version from 2.0.12 to 2.0.13 add 73be382a9 Merge pull request #936 from apache/dependabot/maven/slf4j.version-2.0.13 add 6e12c25ac Bump org.apache.maven.plugins:maven-project-info-reports-plugin add 03126c01b Merge pull request #938 from apache/dependabot/maven/org.apache.maven.plugins-maven-project-info-reports-plugin-3.5.0 add 039c5f8d4 Bump ossf/scorecard-action from 2.3.1 to 2.3.3 add 195b0e59d Merge pull request #939 from apache/dependabot/github_actions/ossf/scorecard-action-2.3.3 add 0a57cac6d WW-5422 Adds dedicate unit test to cover DefaultLocaleProvider add 49eda37f2 Merge pull request #931 from apache/fix/WW-5422-trimable add 4dfbe0934 WW-5414 Always call afterInvocation even in case of exception add d147543dc Merge pull request #932 from apache/feature/WW-5414-after add b36e88ff4 WW-5415 Fixes accessing public constructors via expression add 7c523ac33 WW-5415 Constructor members should be exempted as static members add 40ccc74b8 Merge pull request #933 from apache/fix/WW-5415-constructor add 9ee39d0a2 INFRA-25666 Disables review by code owners * this functionality requires to have public teams * currently all ASF teams are private add 36230dc5b Merge pull request #945 from apache/fix/disable-review add 19252adea Bump org.jacoco:jacoco-maven-plugin from 0.8.11 to 0.8.12 add 8268d0b06 Merge pull request #940 from apache/dependabot/maven/org.jacoco-jacoco-maven-plugin-0.8.12 add ab89b8287 Bump jackson.version from 2.16.1 to 2.17.1 add 9682b3b42 Merge pull request #944 from apache/dependabot/maven/jackson.version-2.17.1 add e5fcc8f17 Bump org.apache.maven.plugins:maven-assembly-plugin from 3.6.0 to 3.7.1 add f6b25ac8a Merge pull request #950 from apache/dependabot/maven/org.apache.maven.plugins-maven-assembly-plugin-3.7.1 add 5c2be7cc7 Bump org.freemarker:freemarker from 2.3.32 to 2.3.33 add ee040babd Merge pull request #953 from apache/dependabot/maven/org.freemarker-freemarker-2.3.33 add 4a8ff99b1 WW-5424 Fixes ClassCastException when using short var name in s:set tag add 0cdce0574 Merge pull request #946 from apache/fix/WW-5424-class-cast-exception add 00752e33c Disables required reviewers option This option doesn't play with Silence Consensus add a25173f65 Merge pull request #947 from apache/fix/no-reviewers-required add 855b95e55 WW-5412 Upgrades struts-master to ver 15 add dcaff0bf1 Merge pull request #948 from apache/feature/WW-5412-master add 86b14c706 Bump org.apache.commons:commons-compress from 1.26.0 to 1.26.2 add de2a8d990 Merge pull request #961 from apache/dependabot/maven/org.apache.commons-commons-compress-1.26.2 add 9133d24f6 Bump org.owasp:dependency-check-maven from 8.4.2 to 9.2.0 add cabc076e4 Merge pull request #962 from apache/dependabot/maven/org.owasp-dependency-check-maven-9.2.0 add 3a6ad5a55 WW-5400 Simplifies how CspSettings is created add 4a05653a5 Removes duplication add cf34f0dbc Merge pull request #956 from apache/feature/WW-5400-refactor add 03db4f1ab WW-5250 Addresses TODO in test and stops using Mock Objects add 444e4d4c0 Merge pull request #957 from apache/fix/WW-5250-todo 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 40ab7a776 Bump org.apache.maven.plugins:maven-failsafe-plugin from 3.2.5 to 3.3.0 add 7cb57087d Merge pull request #976 from apache/dependabot/maven/org.apache.maven.plugins-maven-failsafe-plugin-3.3.0 add 7762d7fba Bump actions/upload-artifact from 4.3.3 to 4.3.4 add 3693ea2ee Merge pull request #978 from apache/dependabot/github_actions/actions/upload-artifact-4.3.4 add 9fe1a4a03 WW-5428 Stop excessive logging in DevMode add d4a0f4fdd Merge pull request #982 from apache/WW-5428-stop-excessive-logging add dbfb59cb7 [maven-release-plugin] prepare release STRUTS_6_5_0 add 54e387dc6 [maven-release-plugin] prepare for next development iteration add fcc2c9d3a WW-5441 Bump net.sf.jasperreports:jasperreports to 6.21.3 add e9a166819 Merge pull request #985 from apache/WW-5441-jasper add abfb2f456 WW-5428 Stop further excessive logging in DevMode add 92fc324f2 Merge pull request #987 from apache/WW-5428-more-logging add 5372aff1d WW-5443 Bump Spring dependencies to 5.3.37 add 9ea9d566d Merge pull request #990 from apache/WW-5443-spring-bump add b7b5bff13 WW-5442 Enforce allowlist for OgnlReflectionProvider add 085471b40 Merge pull request #988 from apache/kusal-experimental add 1f46802ba Bump jackson.version from 2.17.1 to 2.17.2 add de0b3204e Merge pull request #993 from apache/dependabot/maven/jackson.version-2.17.2 add 6d0fc2aa2 Bump maven-surefire-plugin.version from 3.2.5 to 3.3.1 add 0c4d66430 Merge pull request #994 from apache/dependabot/maven/maven-surefire-plugin.version-3.3.1 add 56c1291d2 WW-5440 Deprecate AnnotationParameterFilterInterceptor add 10edbce8d WW-5440 Fix MultipleFileUploadUsingArrayAction add f9953938f WW-5440 Add missing annotations add 8b4c188d0 WW-5440 Fix Showcase App allowlist configuration add cb62cb4e9 WW-5440 Fix OGNL allowlist compat with Convention plugin add 27e4d0d47 WW-5440 Fix inconsistent indenting add cec46792c Merge branch 'master' into WW-5440-convention add 9195990b5 Merge pull request #986 from apache/WW-5440-convention add d6e30b45d [maven-release-plugin] prepare release STRUTS_6_6_0 add f977f0c0e [maven-release-plugin] prepare for next development iteration add 7e5e49e81 Bump org.apache.commons:commons-lang3 from 3.14.0 to 3.15.0 add e3e854a67 Merge pull request #1000 from apache/dependabot/maven/org.apache.commons-commons-lang3-3.15.0 add 479a9d86e WW-5451 Fixes NPE when iterator starts with null add 935868c75 Merge pull request #1008 from apache/feature/WW-5451-null-iterator add 0d3358b03 Bump github/codeql-action from 2.22.11 to 3.25.15 add adbfab8cf Merge pull request #1011 from apache/dependabot/github_actions/github/codeql-action-3.25.15 add b8da13c23 Bump actions/upload-artifact from 4.3.4 to 4.3.5 add 9280a478c Merge pull request #1012 from apache/dependabot/github_actions/actions/upload-artifact-4.3.5 add dbd74ae3a Bump org.apache.maven.plugins:maven-project-info-reports-plugin add e7cce1bcd Merge pull request #997 from apache/dependabot/maven/org.apache.maven.plugins-maven-project-info-reports-plugin-3.6.2 add 8c10a303d Bump org.owasp:dependency-check-maven from 9.2.0 to 10.0.3 add 932eed204 Merge pull request #998 from apache/dependabot/maven/org.owasp-dependency-check-maven-10.0.3 add eeb1d8e0c Bump ossf/scorecard-action from 2.3.3 to 2.4.0 add a4464099d Merge pull request #1006 from apache/dependabot/github_actions/ossf/scorecard-action-2.4.0 add 6caa932ff WW-4062 Cache OgnlException thrown on compilation add 663dd3a50 Merge pull request #1013 from apache/WW-4062-ognl-exc-cache add 1536a7e04 Bump actions/upload-artifact from 4.3.5 to 4.3.6 add 90fca1356 Merge pull request #1014 from apache/dependabot/github_actions/actions/upload-artifact-4.3.6 add 107810dce Bump github/codeql-action from 3.25.15 to 3.26.0 add 8bbe215b6 Merge pull request #1015 from apache/dependabot/github_actions/github/codeql-action-3.26.0 add 89154e047 Bump commons-logging:commons-logging from 1.3.0 to 1.3.3 add 9948258fc Merge pull request #1016 from apache/dependabot/maven/commons-logging-commons-logging-1.3.3 add acd6ebeb6 Bump org.apache.maven.plugins:maven-wrapper-plugin from 3.2.0 to 3.3.2 add ea9d4774d Merge pull request #1017 from apache/dependabot/maven/org.apache.maven.plugins-maven-wrapper-plugin-3.3.2 add c067e25b2 Bump org.codehaus.mojo:versions-maven-plugin from 2.16.2 to 2.17.1 add d42e530c8 Merge pull request #1018 from apache/dependabot/maven/org.codehaus.mojo-versions-maven-plugin-2.17.1 add dc03a83f6 Bump org.apache.maven.plugins:maven-failsafe-plugin from 3.3.0 to 3.3.1 add 8d07694be Merge pull request #1019 from apache/dependabot/maven/org.apache.maven.plugins-maven-failsafe-plugin-3.3.1 add 0fd85517e WW-4062 Further optimisation of OgnlException caching add 9b259ae43 Merge pull request #1021 from apache/WW-4062-ognl-exc-cache add 9765edf2e Bump github/codeql-action from 3.26.0 to 3.26.2 add bdace9bba Merge pull request #1026 from apache/dependabot/github_actions/github/codeql-action-3.26.2 add 0d84319db Bump maven-surefire-plugin.version from 3.3.1 to 3.4.0 add 6f135ea4d Merge pull request #1022 from apache/dependabot/maven/maven-surefire-plugin.version-3.4.0 add d2d222e05 Bump org.easymock:easymock from 5.2.0 to 5.4.0 add 64a3d0c32 Merge pull request #1020 from apache/dependabot/maven/org.easymock-easymock-5.4.0 add e81adc11e Bump org.apache.maven.plugins:maven-release-plugin from 3.0.1 to 3.1.1 add 5b68d4bd5 Merge pull request #1025 from apache/dependabot/maven/org.apache.maven.plugins-maven-release-plugin-3.1.1 add 5a50bd312 Bump slf4j.version from 2.0.13 to 2.0.16 add f6a60fc66 Merge pull request #1028 from apache/dependabot/maven/slf4j.version-2.0.16 add ad7f3e352 Bump org.apache.commons:commons-compress from 1.26.2 to 1.27.1 add f05a4d1c8 Merge pull request #1031 from apache/dependabot/maven/org.apache.commons-commons-compress-1.27.1 add 8c7c39424 Bump actions/upload-artifact from 4.3.6 to 4.4.0 add 93c985652 Merge pull request #1037 from apache/dependabot/github_actions/actions/upload-artifact-4.4.0 add 00f094244 Bump github/codeql-action from 3.26.2 to 3.26.6 add e74d21bef Merge pull request #1038 from apache/dependabot/github_actions/github/codeql-action-3.26.6 add e4872ecf8 Bump spring.platformVersion from 5.3.37 to 5.3.39 add f388f6a67 Merge pull request #1030 from apache/dependabot/maven/spring.platformVersion-5.3.39 add 735d1bc88 WW-5461 Extends UploadedFile with inputName field add b04ad6b41 Merge pull request #1040 from apache/fix/WW-5461-input-name add 4c95983ab Bump org.jfree:jfreechart from 1.5.4 to 1.5.5 add 9a06e7c98 Merge pull request #1049 from apache/dependabot/maven/org.jfree-jfreechart-1.5.5 add 0c69993cd Bump maven-surefire-plugin.version from 3.4.0 to 3.5.0 add 3d155048d Merge pull request #1046 from apache/dependabot/maven/maven-surefire-plugin.version-3.5.0 add efab3fc6f Bump org.assertj:assertj-core from 3.25.3 to 3.26.3 add c352fb59c Merge pull request #1047 from apache/dependabot/maven/org.assertj-assertj-core-3.26.3 add 3111c4b86 Bump org.apache.maven.plugins:maven-dependency-plugin add 0f83b8397 Merge pull request #1048 from apache/dependabot/maven/org.apache.maven.plugins-maven-dependency-plugin-3.8.0 add 280c3e4f5 Bump org.awaitility:awaitility from 4.2.1 to 4.2.2 add 90f984ca8 Merge pull request #1050 from apache/dependabot/maven/org.awaitility-awaitility-4.2.2 add f03d36c46 Bump org.apache.maven.plugins:maven-site-plugin from 3.12.1 to 3.20.0 add 292420822 Merge pull request #1053 from apache/dependabot/maven/org.apache.maven.plugins-maven-site-plugin-3.20.0 add fda2c546b Bump org.owasp:dependency-check-maven from 10.0.3 to 10.0.4 add 0ce2c7b5d Merge pull request #1054 from apache/dependabot/maven/org.owasp-dependency-check-maven-10.0.4 add d7626ed7d Bump org.codehaus.mojo:exec-maven-plugin from 3.3.0 to 3.4.1 add 40b439580 Merge pull request #1057 from apache/dependabot/maven/org.codehaus.mojo-exec-maven-plugin-3.4.1 add 3c71b2ed8 Bump github/codeql-action from 3.26.6 to 3.26.8 add 48c4e3b6a Merge pull request #1058 from apache/dependabot/github_actions/github/codeql-action-3.26.8 add 0bd4266d2 WW-5297 Fixes checking nonce of invalidated session add 75cc664fd Merge pull request #1060 from apache/fix/WW-5297-invalid-session add c81245029 [maven-release-plugin] prepare release STRUTS_6_6_1 add d33be1d43 [maven-release-plugin] prepare for next development iteration add 3e04197ba Bump github/codeql-action from 3.26.8 to 3.26.12 add b3629460e Merge pull request #1073 from apache/dependabot/github_actions/github/codeql-action-3.26.12 add 3528b8832 Bump actions/upload-artifact from 4.4.0 to 4.4.3 add 2eff2da4f Merge pull request #1074 from apache/dependabot/github_actions/actions/upload-artifact-4.4.3 add 7473b4cef Bump commons-logging:commons-logging from 1.3.3 to 1.3.4 add cd7f1097e Merge pull request #1061 from apache/dependabot/maven/commons-logging-commons-logging-1.3.4 add 9d903ddf9 Bump org.apache.maven.plugins:maven-project-info-reports-plugin add fbab5d4df Merge pull request #1065 from apache/dependabot/maven/org.apache.maven.plugins-maven-project-info-reports-plugin-3.7.0 add 4ccde0087 Bump log4j2.version from 2.23.1 to 2.24.1 add b115a510a Merge pull request #1064 from apache/dependabot/maven/log4j2.version-2.24.1 add 1bcadd468 Bump jackson.version from 2.17.2 to 2.18.0 add 78451db87 Merge pull request #1062 from apache/dependabot/maven/jackson.version-2.18.0 add 49ddf6130 WW-5471 Marks Sitemesh plugin as deprecated add 9f2770b2c Merge pull request #1075 from apache/feature/WW-5471-deprecate-sitemesh add 09eb28602 Initial Commit: - Fix for boundary condition bug in JakartaMultipartRequest that results in a NPE when struts.multipart.maxStringLength is not explicitly set, and normal fields are processed along with a file upload. - Additional unit tests for file upload interceptors to confirm functionality with-or-without max parameters being set when a file upload is processed alone as well as with normal fields. add b359da551 Merge pull request #1068 from JCgH4164838Gh792C124B5/localS2_66_JakartaMulipartRequestFix1 add 7deb48129 WW-3714 Deprecate and migrate Action, Interceptor, Result add 8da6a7992 WW-3714 Deprecate and migrate ActionContext add ae9dc42da WW-3714 Deprecate and migrate ConditionalInterceptor add efa447af2 Merge pull request #1079 from apache/kusal-depr-apis add d1695f7a4 Bump github/codeql-action from 3.26.12 to 3.26.13 add a28f22605 Merge pull request #1090 from apache/dependabot/github_actions/github/codeql-action-3.26.13 add 28c8f1503 Bump maven-surefire-plugin.version from 3.5.0 to 3.5.1 add 117e84f24 Merge pull request #1092 from apache/dependabot/maven/maven-surefire-plugin.version-3.5.1 add cf6cbf381 Bump org.apache.maven.plugins:maven-failsafe-plugin from 3.3.1 to 3.5.1 add 9b87e88bb Merge pull request #1095 from apache/dependabot/maven/org.apache.maven.plugins-maven-failsafe-plugin-3.5.1 add b18fbda1f Bump org.apache.maven.doxia:doxia-core from 1.12.0 to 2.0.0 add 144010c3b Merge pull request #1093 from apache/dependabot/maven/org.apache.maven.doxia-doxia-core-2.0.0 add 60095a693 WW-3714 Deprecate and migrate ActionInvocation add 272c2e7bb WW-3714 Deprecate and migrate PreResultListener add e3fbe8835 WW-3714 Update new ActionContext with new ActionInvocation add b488c80aa Merge pull request #1081 from apache/kusal-depr-apis-3 add 36a890ba6 WW-3714 Add factory support for new Interceptor, Result interfaces add b622e5d72 WW-3714 Ensure ReflectionExceptionHandler, WithLazyParams, ParamNameAwareResult marker interfaces respected add 323267fa8 Merge pull request #1087 from apache/kusal-depr-apis-3.5 add bbca2717f WW-3714 Deprecate and migrate ActionEventListener add 14bd4b80c WW-3714 Deprecate and migrate ActionProxy add 266cd1333 Merge pull request #1082 from apache/kusal-depr-apis-4 add 8ba8ee5fe WW-3714 Deprecate and migrate ValueStack add 111bc2565 WW-3714 Deprecate and migrate assorted marker interfaces add dfd07190b WW-3714 Update new ActionContext with new ValueStack add 7ce8f484e WW-3714 Shortcut adapters add ebedd7391 WW-3714 Marker interface migration follow-up add 2757c2357 WW-3714 Fix replacement ValidationAware marker not recognised add 5b81ec085 Merge pull request #1083 from apache/kusal-depr-apis-5 add a623842bc WW-3714 Deprecate and migrate ActionSupport add 9e23fbe66 WW-3714 Deprecate and migrate AbstractInterceptor and MethodFilterInterceptor add f95f9a7cd WW-3714 Add alternative constructors in InterceptorMapping add deb6c09bc WW-3714 Replace deprecated APIs in new ActionSupport add 67ee1b2d6 Merge pull request #1084 from apache/kusal-depr-apis-6 add 45a1f5efc WW-3714 Deprecate and migrate assorted Interceptors add 243244997 WW-3714 Update StrutsResultSupport to allow overriding new signature add 89bcbecc7 Merge pull request #1085 from apache/kusal-depr-apis-7 add 48ee44bbc Bump org.apache.commons:commons-lang3 from 3.15.0 to 3.17.0 add d9d580ae3 Merge pull request #1094 from apache/dependabot/maven/org.apache.commons-commons-lang3-3.17.0 add 3f7492309 Bump github/codeql-action from 3.26.13 to 3.27.0 add b15dc458c Merge pull request #1102 from apache/dependabot/github_actions/github/codeql-action-3.27.0 add 5b2f63fa7 Bump asm.version from 9.7 to 9.7.1 add c75ddbbf3 Merge pull request #1098 from apache/dependabot/maven/asm.version-9.7.1 add 67e047799 WW-5476 Deprecates tag's parameters as replaced with attributes add 8566c1464 Merge pull request #1096 from apache/feature/WW-5476-deprecate add 7cdcd84b8 Merge pull request #1072 from apache/fix/WW-5468-modeldriven-2 add a0dc19c4b Merge pull request #1104 from apache/WW-5468-modeldriven-strutsparameter-fix add fe46ad9f4 WW-5478 Deprecate DefaultResultFactory add c17639092 WW-5478 Fix ActionContext equals/hashCode contract add 1908cbab8 Merge pull request #1105 from apache/WW-5476-defaultresultfactory add ced44650e WW-5480 Warn against potential templating bug add 22036174c Merge pull request #1108 from apache/WW-5480-templating-warning add d351843ec WW-3714 Move new Result class into result package add 2beac8eba Merge pull request #1109 from apache/WW-3714-result-repackage add b001c61f8 WW-5459 Move new Action class into action package add 570bf46a7 Merge pull request #1115 from apache/WW-5459-repkg-action-chain add b0a4c4f41 WW-5459 Deprecate and repackage ActionChainResult add 8d6ecee84 Merge pull request #1116 from apache/WW-5459-repkg-action-chain-2 add 6fbd9e532 WW-3714 Ensure correct delegation of new Result API add be82a7240 WW-3714 Ensure correct delegation of new Interceptor API add 1e2517b59 Merge pull request #1117 from apache/WW-3714-overriding-behaviour add cb08d18b5 Bump github/codeql-action from 3.27.0 to 3.27.1 add 6b2e5ecd9 Merge pull request #1125 from apache/dependabot/github_actions/github/codeql-action-3.27.1 add 8a2f494c1 WW-5484 Marks the DWR plugin as deprecated add 1903e0ef3 Merge pull request #1126 from apache/feature/WW-5484-dwr add 1f5305c24 [maven-release-plugin] prepare release STRUTS_6_7_0 add 085f50d45 [maven-release-plugin] prepare for next development iteration add 8b9d61cdd Add .gitattributes in case people don't have core.autocrlf set add c8ab6ff64 Upgrade maven to 3.9.9 and wrapper to 3.3.2 add 3b7a4d828 Merge pull request #1129 from sepe81/feature/Upgrade-maven-to-3.9.9-and-wrapper-to-3.3.2 add b6d9dc9ec Bump github/codeql-action from 3.27.1 to 3.27.4 add 780280aae Merge pull request #1128 from apache/dependabot/github_actions/github/codeql-action-3.27.4 new 2e431df6b Always run Sonar scan against the master branch 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 (47215ba42) \ N -- N -- N refs/heads/fix/sonar (2e431df6b) 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. 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. Summary of changes: .asf.yaml | 5 +- .gitattributes | 5 + .github/workflows/codeql.yml | 6 +- .github/workflows/scorecards-analysis.yaml | 6 +- .mvn/wrapper/maven-wrapper.properties | 5 +- apps/pom.xml | 2 +- apps/rest-showcase/pom.xml | 4 +- .../org/demo/rest/example/OrdersController.java | 24 +- .../java/org/demo/rest/example/OrdersService.java | 7 +- apps/showcase/pom.xml | 10 +- .../struts2/showcase/DynamicTreeSelectAction.java | 3 +- .../showcase/LotsOfOptiontransferselectAction.java | 17 +- .../showcase/LotsOfRichtexteditorAction.java | 7 +- .../apache/struts2/showcase/MoreSelectsAction.java | 10 +- .../showcase/ShowAjaxDynamicTreeAction.java | 2 + .../org/apache/struts2/showcase/UITagExample.java | 8 + .../showcase/action/AbstractCRUDAction.java | 101 ++--- .../struts2/showcase/action/EmployeeAction.java | 5 +- .../struts2/showcase/action/ExampleAction.java | 10 +- .../struts2/showcase/action/JSPEvalAction.java | 8 +- .../struts2/showcase/action/SkillAction.java | 2 + .../showcase/actionchaining/ActionChain1.java | 3 + .../showcase/actionchaining/ActionChain2.java | 5 +- .../showcase/actionchaining/ActionChain3.java | 8 +- .../struts2/showcase/ajax/AjaxTestAction.java | 3 +- .../showcase/ajax/AutocompleterExampleAction.java | 5 +- .../showcase/ajax/Example4ShowPanelAction.java | 3 + .../struts2/showcase/ajax/Example5Action.java | 3 + .../struts2/showcase/ajax/tree/GetCategory.java | 3 + .../apache/struts2/showcase/ajax/tree/Toggle.java | 2 + .../struts2/showcase/async/ChatRoomAction.java | 13 +- .../struts2/showcase/chat/ChatLoginAction.java | 5 +- .../struts2/showcase/chat/CrudRoomAction.java | 3 + .../struts2/showcase/chat/EnterRoomAction.java | 5 +- .../struts2/showcase/chat/ExitRoomAction.java | 5 +- .../chat/MessagesAvailableInRoomAction.java | 6 +- .../showcase/chat/SendMessageToRoomAction.java | 10 +- .../showcase/chat/UsersAvailableInRoomAction.java | 7 +- .../showcase/conversion/OperationsEnumAction.java | 3 +- .../showcase/fileupload/FileUploadAction.java | 6 + .../MultipleFileUploadUsingArrayAction.java | 6 +- .../showcase/freemarker/StandardTagsAction.java | 6 +- .../showcase/hangman/GuessCharacterAction.java | 6 +- .../showcase/modelDriven/ModelDrivenAction.java | 6 +- .../showcase/modelDriven/{ => model}/Gangster.java | 2 +- .../struts2/showcase/person/EditPersonAction.java | 6 +- .../struts2/showcase/person/ListPeopleAction.java | 3 +- .../struts2/showcase/person/NewPersonAction.java | 3 + .../struts2/showcase/source/ViewSourceAction.java | 12 +- .../tag/nonui/actionPrefix/SubmitAction.java | 3 + .../tag/nonui/debugtag/DebugTagAction.java | 3 +- .../nonui/iteratortag/AppendIteratorTagDemo.java | 7 +- .../iteratortag/IteratorGeneratorTagDemo.java | 9 +- .../nonui/iteratortag/MergeIteratorTagDemo.java | 9 +- .../nonui/iteratortag/SubsetIteratorTagDemo.java | 13 +- .../apache/struts2/showcase/token/TokenAction.java | 2 + .../AbstractValidationActionSupport.java | 1 + .../showcase/validation/AjaxFormSubmitAction.java | 31 +- .../validation/BeanValidationExampleAction.java | 13 +- .../NonFieldValidatorsExampleAction.java | 5 + .../struts2/showcase/validation/QuizAction.java | 4 + .../showcase/validation/SubmitApplication.java | 3 + .../validation/VisitorValidatorsExampleAction.java | 3 + .../apache/struts2/showcase/xslt/JVMAction.java | 6 +- .../src/main/resources/struts-fileupload.xml | 4 +- apps/showcase/src/main/resources/struts.xml | 9 + .../webapp/WEB-INF/fileupload/upload-success.jsp | 3 +- .../apache/struts2/showcase/ConventionTest.java | 88 ++++ .../apache/struts2/showcase/FileUploadTest.java | 32 +- assembly/pom.xml | 4 +- bom/pom.xml | 6 +- bundles/admin/pom.xml | 2 +- .../struts2/osgi/admin/actions/BundlesAction.java | 9 +- .../struts2/osgi/admin/actions/ShellAction.java | 15 +- bundles/demo/pom.xml | 2 +- .../src/main/java/actions/osgi/BundlesAction.java | 1 + .../main/java/actions/osgi/HelloWorldAction.java | 4 +- bundles/pom.xml | 2 +- core/pom.xml | 8 +- .../main/java/com/opensymphony/xwork2/Action.java | 70 +-- .../com/opensymphony/xwork2/ActionChainResult.java | 254 +---------- .../com/opensymphony/xwork2/ActionContext.java | 474 +++++---------------- .../opensymphony/xwork2/ActionEventListener.java | 64 ++- .../com/opensymphony/xwork2/ActionInvocation.java | 249 +++++------ .../java/com/opensymphony/xwork2/ActionProxy.java | 151 +++---- .../com/opensymphony/xwork2/ActionSupport.java | 332 +-------------- .../xwork2/DefaultActionInvocation.java | 12 +- .../opensymphony/xwork2/DefaultLocaleProvider.java | 18 +- .../com/opensymphony/xwork2/LocaleProvider.java | 16 + .../java/com/opensymphony/xwork2/ModelDriven.java | 16 +- .../java/com/opensymphony/xwork2/Preparable.java | 17 +- .../main/java/com/opensymphony/xwork2/Result.java | 54 +-- .../java/com/opensymphony/xwork2/Unchainable.java | 7 +- .../java/com/opensymphony/xwork2/Validateable.java | 15 +- .../xwork2/ValidationAwareSupport.java | 15 +- .../xwork2/config/ConfigurationUtil.java | 13 +- .../xwork2/config/entities/InterceptorMapping.java | 10 +- .../xwork2/config/entities/ResultConfig.java | 6 +- .../xwork2/config/impl/DefaultConfiguration.java | 4 +- .../config/providers/EnvsValueSubstitutor.java | 4 +- .../providers/XmlDocConfigurationProvider.java | 17 +- .../xwork2/factory/DefaultInterceptorFactory.java | 13 +- .../xwork2/factory/DefaultResultFactory.java | 23 +- .../xwork2/interceptor/AbstractInterceptor.java | 37 +- .../xwork2/interceptor/AliasInterceptor.java | 12 +- .../xwork2/interceptor/ChainingInterceptor.java | 22 +- .../xwork2/interceptor/ConditionalInterceptor.java | 44 +- .../interceptor/ConversionErrorInterceptor.java | 8 +- .../interceptor/DefaultWorkflowInterceptor.java | 8 +- .../interceptor/ExceptionMappingInterceptor.java | 5 +- .../xwork2/interceptor/Interceptor.java | 237 ++--------- .../xwork2/interceptor/LoggingInterceptor.java | 3 + .../interceptor/MethodFilterInterceptor.java | 45 +- .../interceptor/MethodFilterInterceptorUtil.java | 128 +----- .../xwork2/interceptor/ModelDrivenInterceptor.java | 7 +- .../interceptor/ParameterRemoverInterceptor.java | 3 + .../xwork2/interceptor/PreResultListener.java | 43 +- .../interceptor/PrefixMethodInvocationUtil.java | 51 +-- .../xwork2/interceptor/PrepareInterceptor.java | 7 +- .../xwork2/interceptor/ScopedModelDriven.java | 21 +- .../interceptor/ScopedModelDrivenInterceptor.java | 26 +- .../interceptor/StaticParametersInterceptor.java | 6 +- .../xwork2/interceptor/ValidationAware.java | 183 ++++---- .../xwork2/interceptor/ValidationErrorAware.java | 20 +- .../interceptor/ValidationWorkflowAware.java | 10 +- .../xwork2/interceptor/WithLazyParams.java | 5 +- .../xwork2/interceptor/annotations/Allowed.java | 2 + .../AnnotationParameterFilterInterceptor.java | 7 +- .../interceptor/annotations/BlockByDefault.java | 2 + .../xwork2/interceptor/annotations/Blocked.java | 2 + .../xwork2/ognl/ErrorMessageBuilder.java | 4 +- .../com/opensymphony/xwork2/ognl/OgnlUtil.java | 77 ++-- .../xwork2/ognl/SecurityMemberAccess.java | 119 ++++-- .../com/opensymphony/xwork2/util/DebugUtils.java} | 40 +- .../com/opensymphony/xwork2/util/ProxyUtil.java | 33 ++ .../xwork2/util/StrutsLocalizedTextProvider.java | 6 +- .../com/opensymphony/xwork2/util/ValueStack.java | 257 ++++++----- .../xwork2/validator/ActionValidatorManager.java | 4 +- .../validator/DefaultActionValidatorManager.java | 18 +- .../validator/DelegatingValidatorContext.java | 30 +- .../xwork2/validator/ValidationInterceptor.java | 52 +-- .../apache/struts2}/ActionContext.java | 28 +- .../apache/struts2}/ActionEventListener.java | 20 +- .../apache/struts2}/ActionInvocation.java | 17 +- .../xwork2 => org/apache/struts2}/ActionProxy.java | 11 +- .../apache/struts2}/ActionSupport.java | 33 +- .../xwork2 => org/apache/struts2}/ModelDriven.java | 8 +- .../xwork2 => org/apache/struts2}/Preparable.java | 4 +- .../xwork2 => org/apache/struts2}/Unchainable.java | 2 +- .../apache/struts2}/Validateable.java | 4 +- .../apache/struts2/action}/Action.java | 14 +- .../apache/struts2/components/ActionComponent.java | 4 +- .../org/apache/struts2/components/Component.java | 27 +- .../struts2/components/DoubleListUIBean.java | 4 +- .../apache/struts2/components/DoubleSelect.java | 2 +- .../java/org/apache/struts2/components/File.java | 4 +- .../java/org/apache/struts2/components/Form.java | 10 +- .../org/apache/struts2/components/FormButton.java | 6 +- .../org/apache/struts2/components/Include.java | 8 +- .../struts2/components/InputTransferSelect.java | 8 +- .../struts2/components/IteratorComponent.java | 5 +- .../java/org/apache/struts2/components/Label.java | 2 +- .../org/apache/struts2/components/ListUIBean.java | 2 +- .../org/apache/struts2/components/OptGroup.java | 4 +- .../struts2/components/OptionTransferSelect.java | 16 +- .../struts2/components/ServletUrlRenderer.java | 20 +- .../java/org/apache/struts2/components/Set.java | 12 +- .../java/org/apache/struts2/components/Token.java | 2 +- .../java/org/apache/struts2/components/UIBean.java | 37 +- .../java/org/apache/struts2/components/URL.java | 2 +- .../apache/struts2/components/UpDownSelect.java | 8 +- .../struts2/dispatcher/DefaultActionSupport.java | 10 +- .../org/apache/struts2/dispatcher/Dispatcher.java | 2 +- .../multipart/JakartaMultiPartRequest.java | 3 +- .../multipart/JakartaStreamMultiPartRequest.java | 15 +- .../dispatcher/multipart/StrutsUploadedFile.java | 19 +- .../struts2/dispatcher/multipart/UploadedFile.java | 9 + .../struts2/factory/StrutsResultFactory.java | 40 +- .../interceptor/AbstractFileUploadInterceptor.java | 1 - .../struts2}/interceptor/AbstractInterceptor.java | 4 +- .../interceptor/ActionFileUploadInterceptor.java | 1 - .../struts2}/interceptor/AliasInterceptor.java | 19 +- .../struts2}/interceptor/ChainingInterceptor.java | 29 +- .../interceptor/ConditionalInterceptor.java | 4 +- .../interceptor/ConversionErrorInterceptor.java | 14 +- .../interceptor/DefaultWorkflowInterceptor.java | 12 +- .../interceptor/ExceptionMappingInterceptor.java | 9 +- .../struts2/interceptor/I18nInterceptor.java | 25 +- .../apache/struts2}/interceptor/Interceptor.java | 6 +- .../struts2}/interceptor/LoggingInterceptor.java | 4 +- .../interceptor/MessageStoreInterceptor.java | 5 +- .../interceptor/MessageStorePreResultListener.java | 1 - .../interceptor/MethodFilterInterceptor.java | 50 +-- .../interceptor/MethodFilterInterceptorUtil.java | 38 +- .../interceptor/ModelDrivenInterceptor.java | 11 +- .../interceptor/ParameterRemoverInterceptor.java | 8 +- .../struts2}/interceptor/PreResultListener.java | 4 +- .../struts2}/interceptor/PrepareInterceptor.java | 13 +- .../struts2}/interceptor/ScopedModelDriven.java | 8 +- .../interceptor/ScopedModelDrivenInterceptor.java | 32 +- .../interceptor/StaticParametersInterceptor.java | 15 +- .../struts2/interceptor/TokenInterceptor.java | 1 - .../interceptor/TokenSessionStoreInterceptor.java | 16 +- .../struts2}/interceptor/ValidationAware.java | 8 +- .../struts2}/interceptor/ValidationErrorAware.java | 2 +- .../interceptor/ValidationWorkflowAware.java | 2 +- .../struts2/interceptor/csp/CspInterceptor.java | 53 ++- .../struts2/interceptor/csp/CspSettings.java | 8 + .../interceptor/csp/DefaultCspSettings.java | 34 +- .../interceptor/exec/StrutsBackgroundProcess.java | 20 +- .../parameter/ParametersInterceptor.java | 92 ++-- .../org/apache/struts2/ognl/ProviderAllowlist.java | 35 +- .../apache/struts2/result}/ActionChainResult.java | 9 +- .../apache/struts2/result}/Result.java | 5 +- .../apache/struts2/result/StrutsResultSupport.java | 25 +- .../apache/struts2}/util/ValueStack.java | 7 +- .../views/freemarker/FreemarkerManager.java | 26 +- .../struts2/views/freemarker/ScopesHashModel.java | 27 +- .../src/main/resources/struts-excluded-classes.xml | 2 + .../com/opensymphony/xwork2/ActionSupportTest.java | 7 +- .../xwork2/DefaultLocaleProviderTest.java | 174 ++++++++ .../opensymphony/xwork2/LocaleProviderTest.java} | 70 +-- .../com/opensymphony/xwork2/ModelDrivenAction.java | 9 +- .../xwork2/ModelDrivenAnnotationAction.java | 9 +- .../opensymphony/xwork2/ProxyInvocationAction.java | 2 + .../java/com/opensymphony/xwork2/SimpleAction.java | 26 +- .../xwork2/SimpleAnnotationAction.java | 32 +- .../opensymphony/xwork2/ValidationOrderAction.java | 36 +- .../ConfigurationProviderOgnlAllowlistTest.java | 32 +- .../ChainingInterceptorWithConfigTest.java | 7 +- .../interceptor/ModelDrivenInterceptorTest.java | 10 +- .../ScopedModelDrivenInterceptorTest.java | 10 + .../annotations/AllowingByDefaultAction.java | 9 +- .../annotations/BlockingByDefaultAction.java | 9 +- .../com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 52 ++- .../xwork2/ognl/OgnlValueStackTest.java | 8 +- .../xwork2/ognl/SecurityMemberAccessTest.java | 83 +++- .../xwork2/test/ModelDrivenAction2.java | 4 +- .../xwork2/test/ModelDrivenAnnotationAction2.java | 4 +- .../opensymphony/xwork2/test/SimpleAction2.java | 3 +- .../opensymphony/xwork2/test/SimpleAction3.java | 8 +- .../xwork2/test/SimpleAnnotationAction2.java | 2 + .../xwork2/test/SimpleAnnotationAction3.java | 8 +- .../ValidateAnnotatedMethodOnlyAction.java | 3 + .../xwork2/test/subtest/NullModelDrivenAction.java | 3 +- .../java/com/opensymphony/xwork2/util/Bar.java | 5 +- .../util/StrutsLocalizedTextProviderTest.java | 10 +- .../validator/ActionValidatorManagerTest.java | 5 +- .../validator/AnnotationValidationAction.java | 1 + .../validator/AnnotationValidationExpAction.java | 1 + .../DefaultActionValidatorManagerTest.java | 358 ++++++++-------- .../validator/StringLengthFieldValidatorTest.java | 7 + .../validator/VisitorFieldValidatorTest.java | 11 + .../validator/VisitorValidatorModelAction.java | 4 +- .../validator/VisitorValidatorTestAction.java | 18 +- .../apache/struts2/ExecutionCountTestAction.java | 3 +- .../org/apache/struts2/HttpMethodsTestAction.java | 2 + .../test/java/org/apache/struts2/TestAction.java | 1 + .../apache/struts2/components/FormButtonTest.java | 22 +- .../org/apache/struts2/components/FormTest.java | 6 +- .../struts2/components/IteratorComponentTest.java | 36 ++ .../org/apache/struts2/components/UIBeanTest.java | 137 ++++-- .../ActionFileUploadInterceptorTest.java | 156 +++++++ .../struts2/interceptor/CookieInterceptorTest.java | 9 + .../struts2/interceptor/CspInterceptorTest.java | 116 ++++- .../interceptor/FileUploadInterceptorTest.java | 190 ++++++++- .../struts2/interceptor/I18nInterceptorTest.java | 20 + .../exec/StrutsBackgroundProcessTest.java | 60 ++- .../parameter/ParametersInterceptorTest.java | 61 +-- .../parameter/StrutsParameterAnnotationTest.java | 36 +- .../apache/struts2/ognl/ProviderAllowlistTest.java | 27 +- .../apache/struts2/result/StreamResultTest.java | 6 +- .../struts2/url/StrutsQueryStringParserTest.java | 8 + .../apache/struts2/views/jsp/ActionTagTest.java | 6 +- .../views/jsp/IteratorGeneratorTagTest.java | 13 +- .../apache/struts2/views/jsp/IteratorTagTest.java | 36 +- .../org/apache/struts2/views/jsp/SetTagTest.java | 58 ++- .../struts2/views/jsp/SortIteratorTagTest.java | 22 +- .../struts2/views/jsp/SubsetIteratorTagTest.java | 29 +- .../org/apache/struts2/views/jsp/URLTagTest.java | 48 ++- .../views/jsp/ui/DoubleValidationAction.java | 2 + .../struts2/views/jsp/ui/FieldErrorTagTest.java | 13 +- .../apache/struts2/views/jsp/ui/FormTagTest.java | 8 +- .../struts2/views/jsp/ui/IntValidationAction.java | 2 + .../VisitorValidatorTestAction-validation.xml | 8 + mvnw | 435 +++++++++---------- mvnw.cmd | 304 ++++++------- plugins/async/pom.xml | 2 +- plugins/bean-validation/pom.xml | 2 +- .../interceptor/BeanValidationInterceptor.java | 2 +- .../struts/beanvalidation/actions/FieldAction.java | 2 + .../beanvalidation/actions/FieldMatchAction.java | 5 + .../beanvalidation/actions/ModelDrivenAction.java | 3 +- .../actions/ValidateGroupAction.java | 5 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- .../struts2/config_browser/ActionNamesAction.java | 5 +- .../config_browser/ListValidatorsAction.java | 8 +- .../struts2/config_browser/ShowBeansAction.java | 2 + .../struts2/config_browser/ShowConfigAction.java | 25 +- .../config_browser/ShowValidatorAction.java | 24 +- plugins/convention/pom.xml | 2 +- .../convention/ClasspathConfigurationProvider.java | 11 +- .../convention/ClasspathPackageProvider.java | 11 +- .../PackageBasedActionConfigBuilder.java | 61 ++- .../src/test/java/actions/MessageAction.java | 2 +- .../PackageBasedActionConfigBuilderTest.java | 56 ++- plugins/dwr/README.md | 4 + plugins/dwr/pom.xml | 4 +- .../apache/struts2/validators/DWRValidator.java | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 4 +- plugins/javatemplates/pom.xml | 2 +- .../struts2/views/java/simple/SelectHandler.java | 8 +- .../java/simple/AbstractCommonAttributesTest.java | 6 +- .../struts2/views/java/simple/AbstractTest.java | 11 + .../struts2/views/java/simple/ActionErrorTest.java | 6 +- .../views/java/simple/ActionMessageTest.java | 6 +- .../struts2/views/java/simple/AnchorTest.java | 8 +- .../struts2/views/java/simple/CheckboxTest.java | 6 +- .../views/java/simple/DateTextFieldTest.java | 6 +- .../struts2/views/java/simple/FieldErrorTest.java | 10 +- .../apache/struts2/views/java/simple/FileTest.java | 2 +- .../apache/struts2/views/java/simple/FormTest.java | 4 +- .../apache/struts2/views/java/simple/HeadTest.java | 4 +- .../struts2/views/java/simple/HiddenTest.java | 2 +- .../struts2/views/java/simple/LabelTest.java | 2 +- .../apache/struts2/views/java/simple/LinkTest.java | 22 +- .../struts2/views/java/simple/PasswordTest.java | 4 +- .../struts2/views/java/simple/ResetTest.java | 4 +- .../struts2/views/java/simple/ScriptTest.java | 14 +- .../struts2/views/java/simple/SelectTest.java | 10 +- .../struts2/views/java/simple/SubmitTest.java | 16 +- .../struts2/views/java/simple/TextAreaTest.java | 4 +- .../struts2/views/java/simple/TextFieldTest.java | 2 +- .../struts2/views/java/simple/TokenTest.java | 2 +- plugins/jfreechart/pom.xml | 4 +- plugins/json/pom.xml | 2 +- .../java/org/apache/struts2/json/JSONResult.java | 2 +- .../struts2/json/JSONValidationInterceptor.java | 8 +- .../json/JSONValidationInterceptorTest.java | 5 + plugins/junit/pom.xml | 2 +- .../apache/struts2/junit/StrutsJUnit4TestCase.java | 2 +- .../apache/struts2/junit/StrutsRestTestCase.java | 3 +- .../org/apache/struts2/junit/JUnitTestAction.java | 2 + .../struts2/junit/session/SessionGetAction.java | 1 + .../struts2/junit/session/SessionSetAction.java | 1 + plugins/osgi/pom.xml | 2 +- plugins/oval/pom.xml | 2 +- .../interceptor/OValValidationInterceptor.java | 3 +- .../oval/interceptor/FieldsWithProfiles.java | 4 + .../struts2/oval/interceptor/MemberObject.java | 8 +- .../oval/interceptor/ModelDrivenAction.java | 11 +- .../struts2/oval/interceptor/SimpleField.java | 5 +- .../struts2/oval/interceptor/SimpleFieldI18n.java | 2 + .../interceptor/SimpleFieldI18nDefaultKey.java | 4 +- .../interceptor/SimpleFieldJPAAnnotations.java | 2 + .../interceptor/SimpleFieldOGNLExpression.java | 4 +- .../struts2/oval/interceptor/SimpleFieldsXML.java | 4 +- .../oval/interceptor/SimpleFieldsXMLChild.java | 3 + .../struts2/oval/interceptor/SimpleMethod.java | 4 +- plugins/pell-multipart/pom.xml | 2 +- .../dispatcher/multipart/PellMultiPartRequest.java | 1 + plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-junit/pom.xml | 2 +- plugins/portlet-mocks/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- .../struts2/components/PortletUrlRenderer.java | 2 +- plugins/rest/pom.xml | 2 +- .../struts2/rest/ContentTypeInterceptor.java | 2 +- .../apache/struts2/rest/RestActionInvocation.java | 16 +- .../struts2/rest/RestWorkflowInterceptor.java | 2 +- .../struts2/rest/handler/XStreamHandler.java | 2 +- .../struts2/rest/RestActionInvocationTest.java | 419 +++++++++--------- plugins/sitemesh/pom.xml | 4 +- .../sitemesh/FreemarkerDecoratorServlet.java | 4 + .../struts2/sitemesh/VelocityDecoratorServlet.java | 4 + plugins/spring/pom.xml | 2 +- .../com/opensymphony/xwork2/ModelDrivenAction.java | 9 +- .../xwork2/ognl/SecurityMemberAccessProxyTest.java | 92 ++-- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 14 +- .../struts2/tiles/StrutsTilesContainerFactory.java | 16 +- .../StrutsWildcardServletApplicationContext.java | 9 +- .../tiles/StrutsTilesContainerFactoryTest.java | 9 +- ...trutsWildcardServletApplicationContextTest.java | 79 ++++ plugins/tiles/src/test/resources/WEB-INF/tiles.xml | 39 ++ .../core/config/{defs1.xml => tiles_defs1.xml} | 0 plugins/velocity/pom.xml | 2 +- plugins/xslt/pom.xml | 2 +- pom.xml | 65 +-- 394 files changed, 5213 insertions(+), 4261 deletions(-) create mode 100644 .gitattributes rename apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/{ => model}/Gangster.java (96%) create mode 100644 apps/showcase/src/test/java/it/org/apache/struts2/showcase/ConventionTest.java copy core/src/{test/java/org/apache/struts2/ExecutionCountTestAction.java => main/java/com/opensymphony/xwork2/util/DebugUtils.java} (54%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ActionContext.java (95%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ActionEventListener.java (75%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ActionInvocation.java (92%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ActionProxy.java (94%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ActionSupport.java (91%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ModelDriven.java (79%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/Preparable.java (97%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/Unchainable.java (96%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/Validateable.java (93%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2/action}/Action.java (89%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/AbstractInterceptor.java (95%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/AliasInterceptor.java (97%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ChainingInterceptor.java (94%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ConditionalInterceptor.java (93%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ConversionErrorInterceptor.java (95%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/DefaultWorkflowInterceptor.java (96%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ExceptionMappingInterceptor.java (98%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/Interceptor.java (97%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/LoggingInterceptor.java (97%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/MethodFilterInterceptor.java (90%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/MethodFilterInterceptorUtil.java (92%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ModelDrivenInterceptor.java (95%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ParameterRemoverInterceptor.java (95%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/PreResultListener.java (94%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/PrepareInterceptor.java (94%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ScopedModelDriven.java (92%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ScopedModelDrivenInterceptor.java (92%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/StaticParametersInterceptor.java (96%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ValidationAware.java (96%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ValidationErrorAware.java (97%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ValidationWorkflowAware.java (96%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2/result}/ActionChainResult.java (97%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2/result}/Result.java (93%) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/ValueStack.java (97%) create mode 100644 core/src/test/java/com/opensymphony/xwork2/DefaultLocaleProviderTest.java copy core/src/{main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java => test/java/com/opensymphony/xwork2/LocaleProviderTest.java} (50%) create mode 100644 plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContextTest.java create mode 100644 plugins/tiles/src/test/resources/WEB-INF/tiles.xml copy plugins/tiles/src/test/resources/org/apache/tiles/core/config/{defs1.xml => tiles_defs1.xml} (100%)