date:20241031

(struts) 04/05: Merge branch 'master' into 7.0.x/merge-master-2024-11-01

2024-10-31 Thread kusal

This is an automated email from the ASF dual-hosted git repository.

kusal pushed a commit to branch 7.0.x/merge-master-2024-11-01
in repository https://gitbox.apache.org/repos/asf/struts.git

commit f55c404d21a89b1178a798aa2112243563584962
Merge: a34bffdf3 8566c1464
Author: Kusal Kithul-Godage 
AuthorDate: Fri Nov 1 15:55:35 2024 +1100

Merge branch 'master' into 7.0.x/merge-master-2024-11-01

 .github/workflows/codeql.yml   |   6 +-
 .github/workflows/scorecards-analysis.yaml |   2 +-
 apps/showcase/pom.xml  |   2 +-
 .../struts2/views/freemarker/ScopesHashModel.java  |  12 +-
 .../ActionFileUploadInterceptorTest.java   | 152 +
 pom.xml|   8 +-
 6 files changed, 167 insertions(+), 15 deletions(-)

diff --cc .github/workflows/codeql.yml
index 97a4ed500,0846bfe9f..5794f8746
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@@ -45,14 -43,8 +45,14 @@@ jobs
  steps:
  - name: Checkout repository
uses: actions/checkout@v4
 +- name: Setup Java JDK
 +  uses: actions/setup-java@v3
 +  with:
 +distribution: temurin
 +java-version: 17
 +cache: 'maven'
  - name: Initialize CodeQL
-   uses: github/codeql-action/init@v3.26.12
+   uses: github/codeql-action/init@v3.27.0
with:
  languages: ${{ matrix.language }}
  - name: Autobuild
diff --cc 
core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java
index b2c27497c,33be31466..ac49c8326
--- 
a/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java
+++ 
b/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java
@@@ -50,18 -49,21 +50,18 @@@ import java.util.Map
   */
  public class ScopesHashModel extends SimpleHash implements TemplateModel {
  
 +private static final Logger LOG = 
LogManager.getLogger(ScopesHashModel.class);
 +
 +@Serial
  private static final long serialVersionUID = 5551686380141886764L;
  
 -private static final Logger LOG = 
LogManager.getLogger(ScopesHashModel.class);
  private static final String TAG_ATTRIBUTES = "attributes";
 -/**
 - * @deprecated since 6.7.0, use {@link #TAG_ATTRIBUTES} instead
 - */
 -@Deprecated
 -private static final String TAG_PARAMETERS = "parameters";
  
 -private HttpServletRequest request;
 -private ServletContext servletContext;
 +private final HttpServletRequest request;
 +private final ServletContext servletContext;
  private ValueStack stack;
  private final Map unlistedModels = new HashMap<>();
- private volatile Object parametersCache;
+ private volatile Object attributesCache;
  
  public ScopesHashModel(ObjectWrapper objectWrapper, ServletContext 
context, HttpServletRequest request, ValueStack stack) {
  super(objectWrapper);
@@@ -154,13 -156,13 +154,13 @@@
  }
  
  private Object findValueOnStack(final String key) {
 -if (TAG_ATTRIBUTES.equals(key) || TAG_PARAMETERS.equals(key)) {
 +if (TAG_ATTRIBUTES.equals(key)) {
- if (parametersCache != null) {
- return parametersCache;
+ if (attributesCache != null) {
+ return attributesCache;
  }
- Object parametersLocal = stack.findValue(key);
- parametersCache = parametersLocal;
- return parametersLocal;
+ Object attributesLocal = stack.findValue(key);
+ attributesCache = attributesLocal;
+ return attributesLocal;
  }
  return stack.findValue(key);
  }
diff --cc 
core/src/test/java/org/apache/struts2/interceptor/ActionFileUploadInterceptorTest.java
index 178d6bfc0,81aa122ed..876aec960
--- 
a/core/src/test/java/org/apache/struts2/interceptor/ActionFileUploadInterceptorTest.java
+++ 
b/core/src/test/java/org/apache/struts2/interceptor/ActionFileUploadInterceptorTest.java
@@@ -25,9 -25,8 +25,10 @@@ import com.opensymphony.xwork2.Validati
  import com.opensymphony.xwork2.mock.MockActionInvocation;
  import com.opensymphony.xwork2.mock.MockActionProxy;
  import com.opensymphony.xwork2.util.ClassLoaderUtil;
 -import org.apache.commons.fileupload.servlet.ServletFileUpload;
 -import org.apache.struts2.ServletActionContext;
++import jakarta.servlet.http.HttpServletRequest;
 +import jakarta.servlet.http.HttpServletRequestWrapper;
 +import 
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletDiskFileUpload;
 +import 
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload;
  import org.apache.struts2.StrutsInternalTestCase;
  import org.apache.struts2.action.UploadedFilesAware;
  import org.apache.struts2.dispatcher.multipart.JakartaMultiPartRequest;
@@@ -324,8 -324,150 +325,150 @@@ public class ActionFileUploadIntercepto
  assertNotNull("deleteme.txt", files.get(0).getOriginalName());
  }

(struts) 02/05: Merge branch 'kusal-depr-apis-5' into 7.0.x/merge-master-2024-11-01

2024-10-31 Thread kusal

This is an automated email from the ASF dual-hosted git repository.

kusal pushed a commit to branch 7.0.x/merge-master-2024-11-01
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 56004a10a291b4f3d3210e0fb8ccdddf77931a00
Merge: 91154f0ec 2757c2357
Author: Kusal Kithul-Godage 
AuthorDate: Fri Nov 1 15:32:30 2024 +1100

Merge branch 'kusal-depr-apis-5' into 7.0.x/merge-master-2024-11-01

# Conflicts:
#   core/src/main/java/com/opensymphony/xwork2/ActionEventListener.java
#   core/src/main/java/com/opensymphony/xwork2/ModelDriven.java
#   
core/src/main/java/com/opensymphony/xwork2/interceptor/AliasInterceptor.java
#   
core/src/main/java/com/opensymphony/xwork2/interceptor/PrepareInterceptor.java
#   
core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
#   
core/src/main/java/org/apache/struts2/interceptor/ActionFileUploadInterceptor.java
#   
plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
#   
plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java

 .../com/opensymphony/xwork2/ActionContext.java |  13 +-
 .../opensymphony/xwork2/ActionEventListener.java   |  58 +++--
 .../com/opensymphony/xwork2/ActionInvocation.java  |  27 ++-
 .../java/com/opensymphony/xwork2/ActionProxy.java  | 151 ++--
 .../java/com/opensymphony/xwork2/ModelDriven.java  |  22 +-
 .../java/com/opensymphony/xwork2/Preparable.java   |  17 +-
 .../main/java/com/opensymphony/xwork2/Result.java  |   3 +
 .../java/com/opensymphony/xwork2/Unchainable.java  |   7 +-
 .../java/com/opensymphony/xwork2/Validateable.java |  15 +-
 .../xwork2/interceptor/AliasInterceptor.java   |   1 +
 .../xwork2/interceptor/ChainingInterceptor.java|   2 +-
 .../interceptor/ConversionErrorInterceptor.java|   1 +
 .../interceptor/DefaultWorkflowInterceptor.java|   3 +
 .../xwork2/interceptor/ModelDrivenInterceptor.java |   2 +-
 .../xwork2/interceptor/PreResultListener.java  |   3 +
 .../xwork2/interceptor/PrepareInterceptor.java |   2 +-
 .../xwork2/interceptor/ScopedModelDriven.java  |  21 +-
 .../interceptor/ScopedModelDrivenInterceptor.java  |   1 +
 .../interceptor/StaticParametersInterceptor.java   |   1 +
 .../xwork2/interceptor/ValidationAware.java| 179 ++
 .../xwork2/interceptor/ValidationErrorAware.java   |  20 +-
 .../interceptor/ValidationWorkflowAware.java   |  10 +-
 .../com/opensymphony/xwork2/util/DebugUtils.java   |   2 +-
 .../xwork2/util/StrutsLocalizedTextProvider.java   |   2 +-
 .../com/opensymphony/xwork2/util/ValueStack.java   | 257 ++---
 .../validator/DelegatingValidatorContext.java  |   4 +-
 .../xwork2/validator/ValidationInterceptor.java|  52 ++---
 .../java/org/apache/struts2/ActionContext.java |   2 +-
 .../apache/struts2}/ActionEventListener.java   |   8 +-
 .../java/org/apache/struts2/ActionInvocation.java  |   6 +-
 .../xwork2 => org/apache/struts2}/ActionProxy.java |  11 +-
 .../xwork2 => org/apache/struts2}/ModelDriven.java |   5 +-
 .../xwork2 => org/apache/struts2}/Preparable.java  |   4 +-
 .../xwork2 => org/apache/struts2}/Unchainable.java |   2 +-
 .../apache/struts2}/Validateable.java  |   4 +-
 .../interceptor/AbstractFileUploadInterceptor.java |   1 -
 .../interceptor/ActionFileUploadInterceptor.java   |   1 -
 .../interceptor/MessageStorePreResultListener.java |   1 -
 .../struts2}/interceptor/ScopedModelDriven.java|   8 +-
 .../struts2/interceptor/TokenInterceptor.java  |   1 -
 .../struts2}/interceptor/ValidationAware.java  |   2 +-
 .../struts2}/interceptor/ValidationErrorAware.java |   2 +-
 .../interceptor/ValidationWorkflowAware.java   |   2 +-
 .../apache/struts2}/util/ValueStack.java   |   7 +-
 .../ConfigurationProviderOgnlAllowlistTest.java|  12 +-
 .../interceptor/BeanValidationInterceptor.java |   2 +-
 .../java/org/apache/struts2/json/JSONResult.java   |   2 +-
 .../struts2/json/JSONValidationInterceptor.java|   8 +-
 .../apache/struts2/junit/StrutsJUnit4TestCase.java |   2 +-
 .../struts2/rest/ContentTypeInterceptor.java   |   2 +-
 .../apache/struts2/rest/RestActionInvocation.java  |  12 +-
 .../struts2/rest/RestWorkflowInterceptor.java  |   2 +-
 .../struts2/rest/handler/XStreamHandler.java   |   2 +-
 53 files changed, 464 insertions(+), 523 deletions(-)

diff --cc 
core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
index 118811a59,05749ae19..f3fd6fecd
--- 
a/core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
+++ 
b/core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
@@@ -25,9 -25,10 +25,12 @@@ import org.apache.commons.lang3.StringU
  import org.apache.commons.lang3.reflect.MethodUtils;
  import org.apache.logging.log4j.LogManager;
  import org.apache.logg

(struts) 01/05: Merge branch 'kusal-depr-apis-3.5' into 7.0.x/merge-master-2024-11-01

2024-10-31 Thread kusal

This is an automated email from the ASF dual-hosted git repository.

kusal pushed a commit to branch 7.0.x/merge-master-2024-11-01
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 91154f0ec886833251061a0158a15572cb0576ff
Merge: 9130e3165 b622e5d72
Author: Kusal Kithul-Godage 
AuthorDate: Fri Nov 1 15:21:57 2024 +1100

Merge branch 'kusal-depr-apis-3.5' into 7.0.x/merge-master-2024-11-01

# Conflicts:
#   core/src/main/java/com/opensymphony/xwork2/Action.java
#   core/src/main/java/com/opensymphony/xwork2/ActionContext.java
#   
core/src/main/java/com/opensymphony/xwork2/factory/DefaultInterceptorFactory.java
#   
core/src/main/java/com/opensymphony/xwork2/interceptor/Interceptor.java
#   jakarta/pom.xml
#   
plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java
#   
plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java

 .../main/java/com/opensymphony/xwork2/Action.java  |  70 +--
 .../com/opensymphony/xwork2/ActionContext.java | 471 +
 .../com/opensymphony/xwork2/ActionInvocation.java  | 234 --
 .../xwork2/DefaultActionInvocation.java|   3 +
 .../main/java/com/opensymphony/xwork2/Result.java  |  51 +--
 .../xwork2/factory/DefaultInterceptorFactory.java  |  14 +-
 .../xwork2/factory/DefaultResultFactory.java   |  19 +-
 .../xwork2/interceptor/ConditionalInterceptor.java |  44 +-
 .../xwork2/interceptor/Interceptor.java| 237 ++-
 .../xwork2/interceptor/PreResultListener.java  |  40 +-
 .../xwork2/interceptor/WithLazyParams.java |   5 +-
 .../xwork2 => org/apache/struts2}/Action.java  |   2 +-
 .../apache/struts2}/ActionContext.java |  28 +-
 .../apache/struts2}/ActionInvocation.java  |   9 +-
 .../xwork2 => org/apache/struts2}/Result.java  |   2 +-
 .../struts2/factory/StrutsResultFactory.java   |  38 +-
 .../interceptor/ConditionalInterceptor.java|   4 +-
 .../apache/struts2}/interceptor/Interceptor.java   |  12 +-
 .../struts2}/interceptor/PreResultListener.java|  10 +-
 .../ConfigurationProviderOgnlAllowlistTest.java|  18 +-
 .../apache/struts2/views/jsp/ActionTagTest.java|   6 +-
 21 files changed, 448 insertions(+), 869 deletions(-)

diff --cc core/src/main/java/com/opensymphony/xwork2/ActionContext.java
index 629c65c80,c7864571f..73d885757
--- a/core/src/main/java/com/opensymphony/xwork2/ActionContext.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ActionContext.java
@@@ -24,14 -24,10 +24,10 @@@ import com.opensymphony.xwork2.util.Val
  import org.apache.struts2.dispatcher.HttpParameters;
  import org.apache.struts2.dispatcher.mapper.ActionMapping;
  
 -import javax.servlet.ServletContext;
 -import javax.servlet.http.HttpServletRequest;
 -import javax.servlet.http.HttpServletResponse;
 -import javax.servlet.jsp.PageContext;
 +import jakarta.servlet.ServletContext;
 +import jakarta.servlet.http.HttpServletRequest;
 +import jakarta.servlet.http.HttpServletResponse;
 +import jakarta.servlet.jsp.PageContext;
- import java.io.Serializable;
- import java.util.HashMap;
  import java.util.Locale;
  import java.util.Map;
  
diff --cc core/src/main/java/org/apache/struts2/ActionInvocation.java
index 472f23ea7,8b789f50d..1ad744b5e
--- a/core/src/main/java/org/apache/struts2/ActionInvocation.java
+++ b/core/src/main/java/org/apache/struts2/ActionInvocation.java
@@@ -16,18 -16,21 +16,21 @@@
   * specific language governing permissions and limitations
   * under the License.
   */
- package com.opensymphony.xwork2;
+ package org.apache.struts2;
  
- import com.opensymphony.xwork2.interceptor.PreResultListener;
+ import com.opensymphony.xwork2.ActionChainResult;
+ import com.opensymphony.xwork2.ActionEventListener;
+ import com.opensymphony.xwork2.ActionProxy;
  import com.opensymphony.xwork2.util.ValueStack;
+ import org.apache.struts2.interceptor.PreResultListener;
  
  /**
 - * An {@link ActionInvocation} represents the execution state of an {@link 
com.opensymphony.xwork2.Action}. It holds the Interceptors and the Action 
instance.
 + * An {@link ActionInvocation} represents the execution state of an {@link 
Action}. It holds the Interceptors and the Action instance.
   * By repeated re-entrant execution of the invoke() method, 
initially by the {@link ActionProxy}, then by the Interceptors, the
 - * Interceptors are all executed, and then the {@link Action} and the {@link 
com.opensymphony.xwork2.Result}.
 + * Interceptors are all executed, and then the {@link Action} and the {@link 
Result}.
   *
   * @author Jason Carreira
-  * @see com.opensymphony.xwork2.ActionProxy
+  * @see ActionProxy
   */
  public interface ActionInvocation {
  
diff --cc core/src/main/java/org/apache/struts2/interceptor/Interceptor.java
index eb7f6850e,7eabb85a8..58beef284
--- a/core/src/main/java/org/apache/struts2/interceptor/Interceptor.ja

(struts) branch 7.0.x/merge-master-2024-11-01 created (now eab6d9ef8)

2024-10-31 Thread kusal

This is an automated email from the ASF dual-hosted git repository.

kusal pushed a change to branch 7.0.x/merge-master-2024-11-01
in repository https://gitbox.apache.org/repos/asf/struts.git


  at eab6d9ef8 Fix merge errors

This branch includes the following new commits:

 new 91154f0ec Merge branch 'kusal-depr-apis-3.5' into 
7.0.x/merge-master-2024-11-01
 new 56004a10a Merge branch 'kusal-depr-apis-5' into 
7.0.x/merge-master-2024-11-01
 new a34bffdf3 Merge branch 'kusal-depr-apis-7' into 
7.0.x/merge-master-2024-11-01
 new f55c404d2 Merge branch 'master' into 7.0.x/merge-master-2024-11-01
 new eab6d9ef8 Fix merge errors

The 5 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.

(struts) 03/05: Merge branch 'kusal-depr-apis-7' into 7.0.x/merge-master-2024-11-01

2024-10-31 Thread kusal

This is an automated email from the ASF dual-hosted git repository.

kusal pushed a commit to branch 7.0.x/merge-master-2024-11-01
in repository https://gitbox.apache.org/repos/asf/struts.git

commit a34bffdf355e6cd6daec0b3746a0a3ba839638e6
Merge: 56004a10a 243244997
Author: Kusal Kithul-Godage 
AuthorDate: Fri Nov 1 15:38:54 2024 +1100

Merge branch 'kusal-depr-apis-7' into 7.0.x/merge-master-2024-11-01

# Conflicts:
#   core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
#   
core/src/main/java/com/opensymphony/xwork2/interceptor/AbstractInterceptor.java
#   
core/src/main/java/com/opensymphony/xwork2/interceptor/MethodFilterInterceptorUtil.java
#   
core/src/main/java/com/opensymphony/xwork2/interceptor/PrefixMethodInvocationUtil.java

 .../com/opensymphony/xwork2/ActionSupport.java | 341 +
 .../xwork2/config/entities/InterceptorMapping.java |  10 +-
 .../xwork2/interceptor/AbstractInterceptor.java|  35 +--
 .../xwork2/interceptor/AliasInterceptor.java   |   3 +
 .../xwork2/interceptor/ChainingInterceptor.java|   3 +
 .../interceptor/ConversionErrorInterceptor.java|   3 +
 .../interceptor/DefaultWorkflowInterceptor.java|   3 +
 .../interceptor/ExceptionMappingInterceptor.java   |   3 +
 .../xwork2/interceptor/LoggingInterceptor.java |   3 +
 .../interceptor/MethodFilterInterceptor.java   |  45 +--
 .../interceptor/MethodFilterInterceptorUtil.java   | 124 +---
 .../xwork2/interceptor/ModelDrivenInterceptor.java |   3 +
 .../interceptor/ParameterRemoverInterceptor.java   |   3 +
 .../interceptor/PrefixMethodInvocationUtil.java|   5 +-
 .../xwork2/interceptor/PrepareInterceptor.java |   3 +
 .../interceptor/ScopedModelDrivenInterceptor.java  |   3 +
 .../interceptor/StaticParametersInterceptor.java   |   3 +
 .../apache/struts2}/ActionSupport.java |  20 +-
 .../struts2}/interceptor/AbstractInterceptor.java  |   4 +-
 .../struts2}/interceptor/AliasInterceptor.java |  17 +-
 .../struts2}/interceptor/ChainingInterceptor.java  |  14 +-
 .../interceptor/ConversionErrorInterceptor.java|  24 +-
 .../interceptor/DefaultWorkflowInterceptor.java|  19 +-
 .../interceptor/ExceptionMappingInterceptor.java   |  14 +-
 .../struts2}/interceptor/LoggingInterceptor.java   |   6 +-
 .../interceptor/MethodFilterInterceptor.java   |  50 +--
 .../interceptor/MethodFilterInterceptorUtil.java   |   8 +-
 .../interceptor/ModelDrivenInterceptor.java|  15 +-
 .../interceptor/ParameterRemoverInterceptor.java   |   8 +-
 .../struts2}/interceptor/PrepareInterceptor.java   |  11 +-
 .../interceptor/ScopedModelDrivenInterceptor.java  |  16 +-
 .../interceptor/StaticParametersInterceptor.java   |  18 +-
 .../apache/struts2/result/StrutsResultSupport.java |  25 +-
 .../ConfigurationProviderOgnlAllowlistTest.java|   6 +
 34 files changed, 230 insertions(+), 638 deletions(-)

diff --cc 
core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorMapping.java
index e90cd1014,6625bc7a1..1c0a9d01f
--- 
a/core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorMapping.java
+++ 
b/core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorMapping.java
@@@ -33,12 -32,20 +33,20 @@@ import java.util.Objects
   */
  public class InterceptorMapping implements Serializable {
  
 -private String name;
 -private Interceptor interceptor;
 +private final String name;
 +private final Interceptor interceptor;
  private final Map params;
  
+ public InterceptorMapping(String name, 
org.apache.struts2.interceptor.Interceptor interceptor) {
+ this(name, Interceptor.adapt(interceptor));
+ }
+ 
+ public InterceptorMapping(String name, 
org.apache.struts2.interceptor.Interceptor interceptor, Map 
params) {
+ this(name, Interceptor.adapt(interceptor), params);
+ }
+ 
  public InterceptorMapping(String name, Interceptor interceptor) {
- this(name, interceptor, new HashMap());
+ this(name, interceptor, new HashMap<>());
  }
  
  public InterceptorMapping(String name, Interceptor interceptor, 
Map params) {
diff --cc 
core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
index f3fd6fecd,d238e1ceb..b590ca4af
--- 
a/core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
+++ 
b/core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
@@@ -134,10 -132,12 +134,13 @@@ import java.io.Serial
   * @author Alexandru 
Popescu
   * @author Philip Luppens
   * @author tm_jee
+  *
+  * @deprecated since 6.7.0, use {@link 
org.apache.struts2.interceptor.DefaultWorkflowInterceptor} instead.
   */
+ @Deprecated
  public class DefaultWorkflowInterceptor extends MethodFilterInterceptor {
  
 +@Serial
  private static final long serialVersionUID = 7563014655616490865L;
  
  private static final Logger LOG = 
LogMan

(struts) 05/05: Fix merge errors

2024-10-31 Thread kusal

This is an automated email from the ASF dual-hosted git repository.

kusal pushed a commit to branch 7.0.x/merge-master-2024-11-01
in repository https://gitbox.apache.org/repos/asf/struts.git

commit eab6d9ef89e9f522e9b6c290fbd103c870d8db73
Author: Kusal Kithul-Godage 
AuthorDate: Fri Nov 1 16:01:19 2024 +1100

Fix merge errors
---
 .../java/org/apache/struts2/ActionContext.java |  8 ++--
 .../struts2/interceptor/AliasInterceptor.java  |  2 +-
 .../interceptor/StaticParametersInterceptor.java   |  2 +-
 .../ActionFileUploadInterceptorTest.java   | 46 ++
 4 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/core/src/main/java/org/apache/struts2/ActionContext.java 
b/core/src/main/java/org/apache/struts2/ActionContext.java
index 79f7552d5..c17ff43e4 100644
--- a/core/src/main/java/org/apache/struts2/ActionContext.java
+++ b/core/src/main/java/org/apache/struts2/ActionContext.java
@@ -20,14 +20,14 @@ package org.apache.struts2;
 
 import com.opensymphony.xwork2.conversion.impl.ConversionData;
 import com.opensymphony.xwork2.inject.Container;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.PageContext;
 import org.apache.struts2.dispatcher.HttpParameters;
 import org.apache.struts2.dispatcher.mapper.ActionMapping;
 import org.apache.struts2.util.ValueStack;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.PageContext;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Locale;
diff --git 
a/core/src/main/java/org/apache/struts2/interceptor/AliasInterceptor.java 
b/core/src/main/java/org/apache/struts2/interceptor/AliasInterceptor.java
index c5aa9fb3c..58c50e404 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/AliasInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/AliasInterceptor.java
@@ -21,7 +21,6 @@ package org.apache.struts2.interceptor;
 import com.opensymphony.xwork2.LocalizedTextProvider;
 import com.opensymphony.xwork2.config.entities.ActionConfig;
 import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.interceptor.ParametersInterceptor;
 import com.opensymphony.xwork2.security.AcceptedPatternsChecker;
 import com.opensymphony.xwork2.security.ExcludedPatternsChecker;
 import com.opensymphony.xwork2.util.ClearableValueStack;
@@ -35,6 +34,7 @@ import org.apache.struts2.ActionInvocation;
 import org.apache.struts2.StrutsConstants;
 import org.apache.struts2.dispatcher.HttpParameters;
 import org.apache.struts2.dispatcher.Parameter;
+import org.apache.struts2.interceptor.parameter.ParametersInterceptor;
 import org.apache.struts2.util.ValueStack;
 
 import java.util.Map;
diff --git 
a/core/src/main/java/org/apache/struts2/interceptor/StaticParametersInterceptor.java
 
b/core/src/main/java/org/apache/struts2/interceptor/StaticParametersInterceptor.java
index 5b00ffca6..2f7ccac37 100644
--- 
a/core/src/main/java/org/apache/struts2/interceptor/StaticParametersInterceptor.java
+++ 
b/core/src/main/java/org/apache/struts2/interceptor/StaticParametersInterceptor.java
@@ -22,7 +22,6 @@ import com.opensymphony.xwork2.LocalizedTextProvider;
 import com.opensymphony.xwork2.config.entities.ActionConfig;
 import com.opensymphony.xwork2.config.entities.Parameterizable;
 import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.interceptor.ParametersInterceptor;
 import com.opensymphony.xwork2.util.ClearableValueStack;
 import com.opensymphony.xwork2.util.TextParseUtil;
 import com.opensymphony.xwork2.util.ValueStackFactory;
@@ -34,6 +33,7 @@ import org.apache.struts2.ActionContext;
 import org.apache.struts2.ActionInvocation;
 import org.apache.struts2.StrutsConstants;
 import org.apache.struts2.dispatcher.HttpParameters;
+import org.apache.struts2.interceptor.parameter.ParametersInterceptor;
 import org.apache.struts2.util.ValueStack;
 
 import java.util.Collections;
diff --git 
a/core/src/test/java/org/apache/struts2/interceptor/ActionFileUploadInterceptorTest.java
 
b/core/src/test/java/org/apache/struts2/interceptor/ActionFileUploadInterceptorTest.java
index 876aec960..8e9e7bd4d 100644
--- 
a/core/src/test/java/org/apache/struts2/interceptor/ActionFileUploadInterceptorTest.java
+++ 
b/core/src/test/java/org/apache/struts2/interceptor/ActionFileUploadInterceptorTest.java
@@ -269,12 +269,10 @@ public class ActionFileUploadInterceptorTest extends 
StrutsInternalTestCase {
 }
 
 public void testNoContentMultipartRequest() throws Exception {
-MockHttpServletRequest req = new MockHttpServletRequest();
-
-req.setCharacterEncoding(StandardCharsets.UTF_8.name());
-req.setMethod("post");
-req.addHeader("Content-type", "multipart/form-data");
-req.setContent(null); // there is no content
+req

Build failed in Jenkins: Struts » Struts-master-JDK8-dependency-check #210

2024-10-31 Thread Apache Jenkins Server

See 


Changes:

[git] WW-3714 Deprecate and migrate ActionInvocation

[git] WW-3714 Deprecate and migrate PreResultListener

[git] WW-3714 Update new ActionContext with new ActionInvocation

[git] WW-3714 Add factory support for new Interceptor, Result interfaces

[github] Bump github/codeql-action from 3.26.12 to 3.26.13

[github] Bump maven-surefire-plugin.version from 3.5.0 to 3.5.1

[github] Bump org.apache.maven.doxia:doxia-core from 1.12.0 to 2.0.0

[github] Bump org.apache.commons:commons-lang3 from 3.15.0 to 3.17.0

[github] Bump org.apache.maven.plugins:maven-failsafe-plugin from 3.3.1 to 3.5.1

[git] WW-3714 Ensure ReflectionExceptionHandler, WithLazyParams, 
ParamNameAwareResult marker interfaces respected

[git] WW-3714 Deprecate and migrate ActionEventListener

[git] WW-3714 Deprecate and migrate ActionProxy

[git] WW-3714 Deprecate and migrate ValueStack

[git] WW-3714 Deprecate and migrate assorted marker interfaces

[git] WW-3714 Update new ActionContext with new ValueStack

[git] WW-3714 Shortcut adapters

[git] WW-3714 Marker interface migration follow-up

[git] WW-3714 Fix replacement ValidationAware marker not recognised

[git] WW-3714 Deprecate and migrate ActionSupport

[git] WW-3714 Deprecate and migrate AbstractInterceptor and 
MethodFilterInterceptor

[git] WW-3714 Add alternative constructors in InterceptorMapping

[git] WW-3714 Replace deprecated APIs in new ActionSupport

[git] WW-3714 Deprecate and migrate assorted Interceptors

[git] WW-3714 Update StrutsResultSupport to allow overriding new signature

[Lukasz Lenart] WW-5476 Deprecates tag's parameters as replaced with attributes

[github] Bump asm.version from 9.7 to 9.7.1

[github] Bump github/codeql-action from 3.26.13 to 3.27.0


--
[...truncated 759.50 KB...]
[INFO] 
[INFO] -< org.apache.struts:struts2-velocity-plugin >--
[INFO] Building Struts 2 Velocity Plugin 6.7.0-SNAPSHOT [10/39]
[INFO]   from plugins/velocity/pom.xml
[INFO] [ jar ]-
[WARNING] Parameter 'relativizeDecorationLinks' is unknown for plugin 
'maven-site-plugin:3.20.0:attach-descriptor (attach-descriptor)'
[INFO] 
[INFO] --- enforcer:3.5.0:enforce (enforce) @ struts2-velocity-plugin ---
[INFO] Rule 0: org.apache.maven.enforcer.rules.dependency.DependencyConvergence 
passed
[INFO] 
[INFO] --- enforcer:3.5.0:enforce (enforce-maven-version) @ 
struts2-velocity-plugin ---
[INFO] 
[INFO] --- enforcer:3.5.0:enforce (enforce-java-version) @ 
struts2-velocity-plugin ---
[INFO] 
[INFO] --- remote-resources:3.1.0:process (process-resource-bundles) @ 
struts2-velocity-plugin ---
[INFO] Preparing remote bundle 
org.apache.apache.resources:apache-jar-resource-bundle:1.5
[INFO] Copying 3 resources from 1 bundle.
[INFO] 
[INFO] --- resources:3.3.1:resources (default-resources) @ 
struts2-velocity-plugin ---
[INFO] Copying 2 resources from src/main/resources to target/classes
[INFO] Copying 3 resources from target/maven-shared-archive-resources to 
target/classes
[INFO] 
[INFO] --- compiler:3.11.0:compile (default-compile) @ struts2-velocity-plugin 
---
[INFO] Changes detected - recompiling the module! :dependency
[INFO] Compiling 48 source files with javac [debug target 1.8] to target/classes
[INFO] 
:
 Some input files use or override a deprecated API.
[INFO] 
:
 Recompile with -Xlint:deprecation for details.
[INFO] 
:
 

 uses unchecked or unsafe operations.
[INFO] 
:
 Recompile with -Xlint:unchecked for details.
[INFO] 
[INFO] --- bundle:5.1.9:manifest (bundle-manifest) @ struts2-velocity-plugin ---
[INFO] No MANIFEST.MF file found, generating manifest.
[INFO] Writing manifest: 

[INFO] 
[INFO] --- resources:3.3.1:testResources (default-testResources) @ 
struts2-velocity-plugin ---
[INFO]

(struts) branch release/struts-7-0-x updated (9130e3165 -> 08d54d2b6)

2024-10-31 Thread kusal

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 9130e3165 Merge pull request #1088 from 
apache/feature/WW-5427-incompatible-improvements
 add 49ddf6130 WW-5471 Marks Sitemesh plugin as deprecated
 add 9f2770b2c Merge pull request #1075 from 
apache/feature/WW-5471-deprecate-sitemesh
 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 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 36a890ba6 WW-3714 Add factory support for new Interceptor, Result 
interfaces
 add b622e5d72 WW-3714 Ensure ReflectionExceptionHandler, WithLazyParams, 
ParamNameAwareResult marker interfaces respected
 add 91154f0ec Merge branch 'kusal-depr-apis-3.5' into 
7.0.x/merge-master-2024-11-01
 add bbca2717f WW-3714 Deprecate and migrate ActionEventListener
 add 14bd4b80c WW-3714 Deprecate and migrate ActionProxy
 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 56004a10a Merge branch 'kusal-depr-apis-5' into 
7.0.x/merge-master-2024-11-01
 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 45a1f5efc WW-3714 Deprecate and migrate assorted Interceptors
 add 243244997 WW-3714 Update StrutsResultSupport to allow overriding new 
signature
 add a34bffdf3 Merge branch 'kusal-depr-apis-7' into 
7.0.x/merge-master-2024-11-01
 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 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 b488c80aa Merge pull request #1081 from apache/kusal-depr-apis-3
 add 323267fa8 Merge pull request #1087 from apache/kusal-depr-apis-3.5
 add 266cd1333 Merge pull request #1082 from apache/kusal-depr-apis-4
 add 5b81ec085 Merge pull request #1083 from apache/kusal-depr-apis-5
 add 67ee1b2d6 Merge pull request #1084 from apache/kusal-depr-apis-6
 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 f55c404d2 Merge branch 'master' into 7.0.x/merge-master-2024-11-01
 add eab6d9ef8 Fix merge errors
 add 08d54d2b6 Merge

(struts) branch 7.0.x/merge-master-2024-11-01 deleted (was eab6d9ef8)

2024-10-31 Thread kusal

This is an automated email from the ASF dual-hosted git repository.

kusal pushed a change to branch 7.0.x/merge-master-2024-11-01
in repository https://gitbox.apache.org/repos/asf/struts.git


 was eab6d9ef8 Fix merge errors

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

(struts) branch feature/WW-3714-rename updated (a0819ad18 -> cdcf1396b)

2024-10-31 Thread lukaszlenart

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch feature/WW-3714-rename
in repository https://gitbox.apache.org/repos/asf/struts.git


omit a0819ad18 WW-3714 Moves all classes from com.opensymphony.xwork2 into 
org.apache.struts2
 add 15fb28f2d WW-5473 Fixes examining multiple HttpServletWrappers to find 
MultiPartRequestWrapper
 add 5132f09bb Merge pull request #1078 from 
apache/fix/WW-5473-multipart-wraper
 add 00f979e9c WW-5465 Renames tag parameters to attributes
 add b17d7f6ff WW-5465 Short-circuits attributes processing if not found in 
ValueStack
 add 3a08c1094 Merge pull request #1067 from 
apache/feature/WW-5465-attributes
 add ce71dab1d WW-5472 Removes Struts Sitemesh plugin
 add 954453b66 Merge pull request #1077 from 
apache/feature/WW-5472-remove-sitemesh
 add ad9224512 WW-5209 Upgrade to Jakarta Bean Validation 3.1.0
 add 3d255ca81 Merge pull request #1089 from 
apache/feature/WW-5209-bean-validation
 add c3e0b9c90 WW-5427 Upgrades Freemarker incompatible_improvements to 
version 2.3.33
 add 9130e3165 Merge pull request #1088 from 
apache/feature/WW-5427-incompatible-improvements
 add cdcf1396b WW-3714 Moves all classes from com.opensymphony.xwork2 into 
org.apache.struts2

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   (a0819ad18)
\
 N -- N -- N   refs/heads/feature/WW-3714-rename (cdcf1396b)

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.

No new revisions were added by this update.

Summary of changes:
 apps/showcase/pom.xml  |  34 ++-
 .../myTemplateDir/myTheme/myAnotherTemplate.ftl|   2 +-
 .../template/ajaxErrorContainers/actionerror.ftl   |  16 +-
 .../template/ajaxErrorContainers/controlfooter.ftl |  10 +-
 .../ajaxErrorContainers/controlheader-core.ftl |  34 +--
 .../src/main/webapp/WEB-INF/decorators.xml |  36 ---
 .../src/main/webapp/WEB-INF/decorators/main.jsp|   9 +-
 .../src/main/webapp/WEB-INF/sitemesh-decorator.tld |  99 --
 .../src/main/webapp/WEB-INF/sitemesh-page.tld  | 115 ---
 apps/showcase/src/main/webapp/WEB-INF/sitemesh.xml |  75 -
 .../showcase/src/main/webapp/WEB-INF/sitemesh3.xml |  17 +-
 .../webapp/WEB-INF/tags/ui/componentTagExample.jsp | 110 +++
 apps/showcase/src/main/webapp/WEB-INF/web.xml  |  11 +-
 .../customTheme/ftlCustomTemplate.ftl  |   2 +-
 .../customTheme/jspCustomTemplate.jsp  |   4 +-
 .../src/main/webapp/template/xhtml/mytemplate.jsp  |   2 +-
 assembly/pom.xml   |   5 +-
 assembly/src/main/assembly/all.xml |  11 -
 assembly/src/main/assembly/apps.xml|   7 -
 assembly/src/main/assembly/docs.xml|   4 -
 assembly/src/main/assembly/lib.xml |   7 -
 bom/pom.xml|   5 -
 .../apache/struts2/components/ActionComponent.java |  10 +-
 .../java/org/apache/struts2/components/Anchor.java |  12 +-
 .../apache/struts2/components/AppendIterator.java  |  44 ++-
 .../org/apache/struts2/components/Component.java   |  36 +--
 .../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 +-
 .../apache/struts2/components/GenericUIBean.java   |  12 +-
 .../org/apache/struts2/components/Include.java |   8 +-
 .../struts2/components/InputTransferSelect.java|   8 +-
 .../java/org/apache/struts2/components/Label.java  |   2 +-
 .../org/apache/struts2/components/ListUIBean.java  |   2 +-
 .../apache/struts2/components/MergeIterator.java   |  49 ++-
 .../org/apache/struts2/components/OptGroup.java|   2 +-
 .../struts2/components/OptionTransferSelect.java   |  16 +-
 .../struts2/components/ServletUrlRenderer.java |   2 +-
 .../java/org/apache/struts2/components/Token.java  |   2 +-
 .../java/org/apache/struts2/components/UIBean.java |  26 +-
 .../java/org/apache/struts2/components/URL.java|   2 +-
 .../apache/struts2/components/UpDownSelect.java|   6 +-
 .../interceptor/ActionFileUploadInterceptor.java   |  32 +-
 .../apache/struts2/util/AppendIteratorFilter.java  |  18 +-
 .../views/freemarker/FreemarkerManager.java|   2 +-
 .../struts2/view

(struts) 04/05: Merge branch 'master' into 7.0.x/merge-master-2024-11-01

(struts) 02/05: Merge branch 'kusal-depr-apis-5' into 7.0.x/merge-master-2024-11-01

(struts) 01/05: Merge branch 'kusal-depr-apis-3.5' into 7.0.x/merge-master-2024-11-01

(struts) branch 7.0.x/merge-master-2024-11-01 created (now eab6d9ef8)

(struts) 03/05: Merge branch 'kusal-depr-apis-7' into 7.0.x/merge-master-2024-11-01

(struts) 05/05: Fix merge errors

Build failed in Jenkins: Struts » Struts-master-JDK8-dependency-check #210

(struts) branch release/struts-7-0-x updated (9130e3165 -> 08d54d2b6)

(struts) branch 7.0.x/merge-master-2024-11-01 deleted (was eab6d9ef8)

(struts) branch feature/WW-3714-rename updated (a0819ad18 -> cdcf1396b)

10 matches

Site Navigation

Mail list logo

Footer information