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 273eb1f6a Merge pull request #833 from
apache/merge-master-to-7xx-2024-01-04
add fb7fec355 Stops cleaning nightlies to allow to coexist different
versions
add 9a0df704a Merge pull request #834 from apache/fix/do-not-clean
add 32584c355 WW-5382 Fix StrutsInternalTestCase
add 15acd72d2 WW-5382 Fix stale injections in Dispatcher
add 2024d8317 WW-5382 Fix stale bootstrap context on ActionContext
add 6f1e1222b WW-5382 Rework existing Dispatcher tests and base test
classes
add fa5b46c78 WW-5382 Add test for Dispatcher reinjection
add ae71c464a WW-5382 Delete redundant code
add 946737c81 WW-5382 Rework Dispatcher injections
add 3d25caa0a WW-5382 Update Dispatcher#getContainer JavaDoc
add 3b078995a Merge pull request #826 from apache/WW-5382-stale-config
add c322abacb WW-5381 Introduce extension point for MethodAccessor
add 573dbbcea WW-5381 Revert bean removal for backwards compatibility
add d4a0b3b85 WW-5381 Reimplement ability to register additional
MethodAccessors
add 78e97a42e Merge branch 'master' into WW-5381-method-accessor
add 503c8daa1 WW-5381 Remove unnecessary/confusing parameters
add 3b76678c0 Merge pull request #825 from apache/WW-5381-method-accessor
add 8a245e865 WW-5352 Refactor ParametersInterceptor
add aa4398ee2 WW-5352 Do not use setter notation for helper methods
add 199ea0db6 WW-5352 Rename acceptable name/value methods
add ecd02de8b Merge pull request #831 from
apache/WW-5352-parameter-annotation-2
add b9d072d18 Bump org.apache.maven.plugins:maven-release-plugin
add 07cecbf63 Merge pull request #837 from
apache/dependabot/maven/org.apache.maven.plugins-maven-release-plugin-3.0.1
add 5b020eb57 Reduces log level to debug to reduce noise in the logs
add f5a7c31f2 Merge pull request #838 from apache/fix/debug-level
add 55ca7a5b3 WW-5365 Reverts changes introduced in WW-5192 to allow
evaluate the value attribute
add d8dc720d4 Merge pull request #835 from apache/fix/WW-5365-radio-value
add 686189c1b Bump actions/upload-artifact from 4.0.0 to 4.1.0
add 0a94b50bc Merge pull request #842 from
apache/dependabot/github_actions/actions/upload-artifact-4.1.0
add 3c8fff46d WW-5352 Clean up OgnlValueStackTest
add 9b5cb2d7b WW-5352 Move method to XWorkTestCase
add bdcedc55b Merge pull request #841 from apache/WW-5352-ognlvaluestack
add 96618ebbd Bump org.apache.commons:commons-compress from 1.23.0 to
1.25.0
add d0ac76b9a Merge pull request #820 from
apache/dependabot/maven/org.apache.commons-commons-compress-1.25.0
add e9738698a WW-5387 Fixes remove() signature
add fdd996c68 Merge pull request #844 from apache/fix/WW-5387-remove
add 72f551f40 WW-5369 Re-define minimal library set
add 5ee381182 Merge pull request #847 from apache/fix/WW-5369-min-lib
add dc96c257d WW-5374 Allows to prepend reportUri with Servlet context
add d5932f82f WW-5374 Uses @code instead of <tt/>
add 790c663dd WW-5374 Adds additional test case to cover disabling
prepending context
add 3a1a89a54 Merge pull request #845 from apache/fix/WW-5374-context
add 9a6411c8c Extends sleep period to avoid breaking a build
add dd0f0b05a Merge pull request #849 from apache/fix/longer-sleep
add 3ec313aa0 WW-5357 Adds support for disabled attribute to anchor tag
add a763071d2 Merge pull request #848 from apache/fix/WW-5357-disabled
add 13bf91bf3 Merge remote-tracking branch 'origin/master' into
merge-master-to-7xx-2024-01-20
add 95ba165ff Merge pull request #850 from
apache/merge-master-to-7xx-2024-01-20
No new revisions were added by this update.
Summary of changes:
.github/workflows/scorecards-analysis.yaml | 2 +-
Jenkinsfile | 23 +-
assembly/src/main/assembly/min-lib.xml | 2 +
.../opensymphony/xwork2/XWorkJUnit4TestCase.java | 4 -
.../com/opensymphony/xwork2/XWorkTestCase.java | 14 +-
.../xwork2/config/impl/DefaultConfiguration.java | 11 +-
.../StrutsDefaultConfigurationProvider.java | 4 -
.../xwork2/ognl/OgnlValueStackFactory.java | 75 +++-
.../xwork2/security/AcceptedPatternsChecker.java | 12 +-
.../xwork2/security/ExcludedPatternsChecker.java | 12 +-
.../java/org/apache/struts2/StrutsConstants.java | 3 +
.../java/org/apache/struts2/components/Radio.java | 8 -
.../config/StrutsBeanSelectionProvider.java | 2 +
.../apache/struts2/dispatcher/ApplicationMap.java | 9 +-
.../apache/struts2/dispatcher/ContainerHolder.java | 12 +-
.../org/apache/struts2/dispatcher/Dispatcher.java | 159 ++++---
.../struts2/dispatcher/ExecuteOperations.java | 4 +-
.../apache/struts2/dispatcher/InitOperations.java | 2 +-
.../apache/struts2/dispatcher/MockDispatcher.java | 1 -
.../org/apache/struts2/dispatcher/Parameter.java | 8 +-
.../struts2/dispatcher/PrepareOperations.java | 8 +-
.../org/apache/struts2/dispatcher/RequestMap.java | 9 +-
.../ActionMappingParametersInterceptor.java | 6 +-
.../struts2/interceptor/csp/CspInterceptor.java | 43 +-
.../parameter/ParametersInterceptor.java | 274 ++++++------
.../apache/struts2/util/StrutsTestCaseHelper.java | 26 +-
core/src/main/resources/struts-beans.xml | 5 +
.../src/main/resources/template/simple/a-close.ftl | 3 +
.../xwork2/ognl/OgnlValueStackTest.java | 115 ++---
.../org/apache/struts2/StrutsInternalTestCase.java | 28 +-
.../struts2/StrutsJUnit4InternalTestCase.java | 61 ++-
.../test/java/org/apache/struts2/TestAction.java | 9 +
.../org/apache/struts2/config/SettingsTest.java | 2 +-
.../apache/struts2/dispatcher/DispatcherTest.java | 483 ++++++++++-----------
.../struts2/interceptor/CspInterceptorTest.java | 51 ++-
.../exec/StrutsBackgroundProcessTest.java | 2 +-
.../parameter/ParametersInterceptorTest.java | 2 +-
.../apache/struts2/views/jsp/AbstractTagTest.java | 6 +-
.../apache/struts2/views/jsp/ui/AnchorTest.java | 17 +
.../org/apache/struts2/views/jsp/ui/RadioTest.java | 37 +-
.../org/apache/struts2/views/jsp/ui/Radio-11.txt | 4 +
.../org/apache/struts2/views/jsp/ui/href-6.txt | 1 +
core/src/test/resources/struts.properties | 2 +-
.../apache/struts2/junit/StrutsJUnit4TestCase.java | 10 +-
.../org/apache/struts2/junit/StrutsTestCase.java | 11 +-
.../sitemesh/OldDecorator2NewStrutsDecorator.java | 403 ++++++++---------
.../org/apache/struts2/testng/StrutsTestCase.java | 12 +-
pom.xml | 6 +-
48 files changed, 1089 insertions(+), 914 deletions(-)
copy
plugins/testng/src/main/java/org/apache/struts2/testng/StrutsTestCase.java =>
core/src/test/java/org/apache/struts2/StrutsJUnit4InternalTestCase.java (50%)
create mode 100644
core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-11.txt
create mode 100644
core/src/test/resources/org/apache/struts2/views/jsp/ui/href-6.txt
