This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch release/struts-7-0-x
in repository https://gitbox.apache.org/repos/asf/struts.git
from 62eac8f58 Merge pull request #954 from apache/fix/WW-5423-query-params
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 28ea6d01c Merge branch 'master' into merge/master-2024-06-10
add d1d02c150 Merge pull request #963 from apache/merge/master-2024-06-10
No new revisions were added by this update.
Summary of changes:
.asf.yaml | 5 +-
.github/workflows/scorecards-analysis.yaml | 4 +-
apps/showcase/pom.xml | 2 +-
assembly/pom.xml | 2 +-
core/pom.xml | 6 +
.../com/opensymphony/xwork2/ActionSupport.java | 5 +
.../opensymphony/xwork2/DefaultLocaleProvider.java | 18 +-
.../com/opensymphony/xwork2/LocaleProvider.java | 16 +
.../xwork2/ognl/SecurityMemberAccess.java | 7 +-
.../xwork2/validator/ActionValidatorManager.java | 4 +-
.../validator/DefaultActionValidatorManager.java | 18 +-
.../validator/DelegatingValidatorContext.java | 12 +-
.../java/org/apache/struts2/components/Set.java | 12 +-
.../struts2/interceptor/I18nInterceptor.java | 25 +-
.../struts2/interceptor/csp/CspInterceptor.java | 53 ++-
.../struts2/interceptor/csp/CspSettings.java | 8 +
.../interceptor/csp/DefaultCspSettings.java | 34 +-
.../interceptor/exec/StrutsBackgroundProcess.java | 20 +-
.../xwork2/DefaultLocaleProviderTest.java | 174 ++++++++++
.../opensymphony/xwork2/LocaleProviderTest.java} | 70 ++--
.../DefaultActionValidatorManagerTest.java | 358 ++++++++++-----------
.../validator/VisitorFieldValidatorTest.java | 11 +
.../validator/VisitorValidatorTestAction.java | 11 +-
.../struts2/interceptor/CspInterceptorTest.java | 116 ++++++-
.../struts2/interceptor/I18nInterceptorTest.java | 20 ++
.../exec/StrutsBackgroundProcessTest.java | 60 +++-
.../org/apache/struts2/views/jsp/SetTagTest.java | 58 +++-
.../VisitorValidatorTestAction-validation.xml | 8 +
plugins/tiles/pom.xml | 12 +-
.../struts2/tiles/StrutsTilesContainerFactory.java | 16 +-
.../StrutsWildcardServletApplicationContext.java | 9 +-
.../tiles/StrutsTilesContainerFactoryTest.java | 8 +-
...trutsWildcardServletApplicationContextTest.java | 78 +++++
.../tiles-defs-2.1_it.xml => WEB-INF/tiles.xml} | 22 +-
.../core/config/{defs1.xml => tiles_defs1.xml} | 0
pom.xml | 31 +-
36 files changed, 972 insertions(+), 341 deletions(-)
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
copy
plugins/tiles/src/test/resources/{org/apache/tiles/core/config/tiles-defs-2.1_it.xml
=> WEB-INF/tiles.xml} (56%)
copy plugins/tiles/src/test/resources/org/apache/tiles/core/config/{defs1.xml
=> tiles_defs1.xml} (100%)
