You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ku...@apache.org on 2024/01/08 09:50:01 UTC
(struts) 06/07: Merge branch 'WW-5379-directives-valuestack' into temp/6.3
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch temp/6.3
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 10cab4497cdf4dfb29a93c484800249724ec533a
Merge: 09d31407a c5cf3fc28
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Mon Jan 8 20:48:48 2024 +1100
Merge branch 'WW-5379-directives-valuestack' into temp/6.3
# Conflicts:
# pom.xml
Jenkinsfile | 3 +-
.../xwork2/ognl/OgnlValueStackFactory.java | 70 +++++-
.../xwork2/security/AcceptedPatternsChecker.java | 12 +-
.../xwork2/security/ExcludedPatternsChecker.java | 12 +-
.../org/apache/struts2/dispatcher/Parameter.java | 8 +-
.../ActionMappingParametersInterceptor.java | 6 +-
.../parameter/ParametersInterceptor.java | 274 ++++++++++++---------
.../parameter/ParametersInterceptorTest.java | 2 +-
.../velocity/components/AbstractDirective.java | 20 +-
pom.xml | 2 +-
10 files changed, 253 insertions(+), 156 deletions(-)
diff --cc plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
index 34e06aad7,c662bf5a9..91fcd6182
--- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
+++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
@@@ -18,11 -18,9 +18,12 @@@
*/
package org.apache.struts2.views.velocity.components;
+ import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.components.Component;
import org.apache.struts2.util.ValueStackProvider;
diff --cc pom.xml
index e3858bb21,679be8216..7b69f78c3
--- a/pom.xml
+++ b/pom.xml
@@@ -374,10 -389,7 +374,10 @@@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<!-- See https://issues.apache.org/jira/browse/MRELEASE-1029 -->
- <version>3.0.0-M1</version>
+ <version>3.0.1</version>
+ <configuration>
+ <arguments>-Dmaven.test.skip -Dgpg.skip</arguments>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>