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 2025/02/04 23:52:15 UTC
(struts) branch issue-85/CONFSRVDEV-37138-merge-upstream created (now df5ad6914)
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a change to branch issue-85/CONFSRVDEV-37138-merge-upstream
in repository https://gitbox.apache.org/repos/asf/struts.git
at df5ad6914 Merge remote-tracking branch 'origin/release/struts-6-7-x' into issue-85/CONFSRVDEV-37138-merge-upstream
This branch includes the following new commits:
new 5e7c00afb [maven-release-plugin] prepare release struts2-parent-6.4.0-atlassian-1
new 62b9871a6 [maven-release-plugin] prepare for next development iteration
new 9ce0a4893 Merge remote-tracking branch 'origin/master' into fork/6.6
new b1a8797c9 [maven-release-plugin] prepare release struts2-parent-6.6.0-atlassian-1
new 183352bc4 [maven-release-plugin] prepare for next development iteration
new 91ef86894 Merge remote-tracking branch 'origin/master' into fork/6.6
new 7113ff8f5 Update SNAPSHOT version
new 90fa39363 [maven-release-plugin] prepare release struts2-parent-6.6.1-atlassian-1
new 7969e5932 [maven-release-plugin] prepare for next development iteration
new dc88606ce CONFSRVDEV-34293 Fix Struts 6.6 build
new c2c35251a CONFSRVDEV-34293 Add Bamboo build note to README
new 7fa08d053 Merge remote-tracking branch 'origin/master' into release/6.7
new 28cc851ab [maven-release-plugin] prepare release struts2-parent-6.7.0-atlassian-1
new 7ee62ea6c [maven-release-plugin] prepare for next development iteration
new 98348790e CONFSRVDEV-37099 Backport of CVE-2024-53677 fix from 7.0
new ca04a99d3 Pull request #28: CONFSRVDEV-37099 Backport of CVE-2024-53677 fix from 7.0
new ec1a70e56 [maven-release-plugin] prepare release struts2-parent-6.7.0-atlassian-2
new f50587ade [maven-release-plugin] prepare for next development iteration
new df5ad6914 Merge remote-tracking branch 'origin/release/struts-6-7-x' into issue-85/CONFSRVDEV-37138-merge-upstream
The 19 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) 13/19: [maven-release-plugin] prepare release struts2-parent-6.7.0-atlassian-1
Posted by ku...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch issue-85/CONFSRVDEV-37138-merge-upstream
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 28cc851ab224b90559663dbe86b86975433f03f5
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Mon Nov 18 17:28:50 2024 +1100
[maven-release-plugin] prepare release struts2-parent-6.7.0-atlassian-1
---
core/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/velocity/pom.xml | 2 +-
pom.xml | 6 +++---
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index b4e8daaf7..7654e329d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.7.0-atlassian-1-SNAPSHOT</version>
+ <version>6.7.0-atlassian-1</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 74ca31c43..3054f3547 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.7.0-atlassian-1-SNAPSHOT</version>
+ <version>6.7.0-atlassian-1</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index c86944fae..5a43c5827 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.7.0-atlassian-1-SNAPSHOT</version>
+ <version>6.7.0-atlassian-1</version>
</parent>
<artifactId>struts2-plugins</artifactId>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index a7edf859b..1b8d50ec7 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.7.0-atlassian-1-SNAPSHOT</version>
+ <version>6.7.0-atlassian-1</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index 9c45ebc6b..7735505c9 100644
--- a/plugins/velocity/pom.xml
+++ b/plugins/velocity/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.7.0-atlassian-1-SNAPSHOT</version>
+ <version>6.7.0-atlassian-1</version>
</parent>
<artifactId>struts2-velocity-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index c1c70f163..ba3252044 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>6.7.0-atlassian-1-SNAPSHOT</version>
+ <version>6.7.0-atlassian-1</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>https://struts.apache.org/</url>
@@ -51,7 +51,7 @@
<connection>scm:git:ssh://git@stash.atlassian.com:7997/bam/struts2-atlassian.git</connection>
<developerConnection>scm:git:ssh://git@stash.atlassian.com:7997/bam/struts2-atlassian.git</developerConnection>
<url>https://stash.atlassian.com/projects/BAM/repos/struts2-atlassian/browse</url>
- <tag>HEAD</tag>
+ <tag>struts2-parent-6.7.0-atlassian-1</tag>
</scm>
<issueManagement>
@@ -107,7 +107,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.build.outputTimestamp>2024-11-17T09:57:20Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2024-11-18T06:28:35Z</project.build.outputTimestamp>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
(struts) 05/19: [maven-release-plugin] prepare for next development iteration
Posted by ku...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch issue-85/CONFSRVDEV-37138-merge-upstream
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 183352bc421d853a705162dae99b0334bc0fdf61
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Mon Jul 22 16:07:15 2024 +1000
[maven-release-plugin] prepare for next development iteration
---
core/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/velocity/pom.xml | 2 +-
pom.xml | 6 +++---
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 709ee5fa4..23f4f925b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.6.0-atlassian-1</version>
+ <version>6.6.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index f700c0ae9..47466089d 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.6.0-atlassian-1</version>
+ <version>6.6.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 0a6de8326..08dc65788 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.6.0-atlassian-1</version>
+ <version>6.6.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-plugins</artifactId>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 7f4a0e60e..cb009b588 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.6.0-atlassian-1</version>
+ <version>6.6.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index 48fd6a3a4..6b5886e45 100644
--- a/plugins/velocity/pom.xml
+++ b/plugins/velocity/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.6.0-atlassian-1</version>
+ <version>6.6.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-velocity-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 6d25879b9..bad45abe4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>6.6.0-atlassian-1</version>
+ <version>6.6.0-atlassian-2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>https://struts.apache.org/</url>
@@ -51,7 +51,7 @@
<connection>scm:git:ssh://git@stash.atlassian.com:7997/bam/struts2-atlassian.git</connection>
<developerConnection>scm:git:ssh://git@stash.atlassian.com:7997/bam/struts2-atlassian.git</developerConnection>
<url>https://stash.atlassian.com/projects/BAM/repos/struts2-atlassian/browse</url>
- <tag>struts2-parent-6.6.0-atlassian-1</tag>
+ <tag>HEAD</tag>
</scm>
<issueManagement>
@@ -107,7 +107,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.build.outputTimestamp>2024-07-22T06:06:34Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2024-07-22T06:07:14Z</project.build.outputTimestamp>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
(struts) 15/19: CONFSRVDEV-37099 Backport of CVE-2024-53677 fix from 7.0
Posted by ku...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch issue-85/CONFSRVDEV-37138-merge-upstream
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 98348790e54c3855190879a303677d248a974878
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Mon Feb 3 11:10:13 2025 +1100
CONFSRVDEV-37099 Backport of CVE-2024-53677 fix from 7.0
---
.../struts2/interceptor/FileUploadInterceptor.java | 263 -------
core/src/main/resources/struts-default.xml | 9 -
.../interceptor/FileUploadInterceptorTest.java | 806 ---------------------
3 files changed, 1078 deletions(-)
diff --git a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
deleted file mode 100644
index 86f8a64be..000000000
--- a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.struts2.interceptor;
-
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.interceptor.ValidationAware;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.struts2.dispatcher.Parameter;
-import org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper;
-import org.apache.struts2.dispatcher.multipart.UploadedFile;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <!-- START SNIPPET: description -->
- * <p>
- * Interceptor that is based off of {@link MultiPartRequestWrapper}, which is automatically applied for any request that
- * includes a file. It adds the following parameters, where [File Name] is the name given to the file uploaded by the
- * HTML form:
- * </p>
- * <ul>
- *
- * <li>[File Name] : File - the actual File</li>
- *
- * <li>[File Name]ContentType : String - the content type of the file</li>
- *
- * <li>[File Name]FileName : String - the actual name of the file uploaded (not the HTML name)</li>
- *
- * </ul>
- *
- * <p>You can get access to these files by merely providing setters in your action that correspond to any of the three
- * patterns above, such as setDocument(File document), setDocumentContentType(String contentType), etc.
- * <br>See the example code section.
- * </p>
- *
- * <p> This interceptor will add several field errors, assuming that the action implements {@link ValidationAware}.
- * These error messages are based on several i18n values stored in struts-messages.properties, a default i18n file
- * processed for all i18n requests. You can override the text of these messages by providing text for the following
- * keys:
- * </p>
- *
- * <ul>
- *
- * <li>struts.messages.error.uploading - a general error that occurs when the file could not be uploaded</li>
- *
- * <li>struts.messages.error.file.too.large - occurs when the uploaded file is too large</li>
- *
- * <li>struts.messages.error.content.type.not.allowed - occurs when the uploaded file does not match the expected
- * content types specified</li>
- *
- * <li>struts.messages.error.file.extension.not.allowed - occurs when the uploaded file does not match the expected
- * file extensions specified</li>
- *
- * </ul>
- * <p>
- * <!-- END SNIPPET: description -->
- *
- * <p><u>Interceptor parameters:</u></p>
- * <p>
- * <!-- START SNIPPET: parameters -->
- *
- * <ul>
- *
- * <li>maximumSize (optional) - the maximum size (in bytes) that the interceptor will allow a file reference to be set
- * on the action. Note, this is <b>not</b> related to the various properties found in struts.properties.
- * Default to approximately 2MB.</li>
- *
- * <li>allowedTypes (optional) - a comma separated list of content types (ie: text/html) that the interceptor will allow
- * a file reference to be set on the action. If none is specified allow all types to be uploaded.</li>
- *
- * <li>allowedExtensions (optional) - a comma separated list of file extensions (ie: .html) that the interceptor will allow
- * a file reference to be set on the action. If none is specified allow all extensions to be uploaded.</li>
- * </ul>
- * <p>
- * <p>
- * <!-- END SNIPPET: parameters -->
- *
- * <p><u>Extending the interceptor:</u></p>
- * <p>
- * <p>
- * <p>
- * <!-- START SNIPPET: extending -->
- * <p>
- * You can extend this interceptor and override the acceptFile method to provide more control over which files
- * are supported and which are not.
- * </p>
- * <!-- END SNIPPET: extending -->
- *
- * <p><u>Example code:</u></p>
- *
- * <pre>
- * <!-- START SNIPPET: example-configuration -->
- * <action name="doUpload" class="com.example.UploadAction">
- * <interceptor-ref name="fileUpload"/>
- * <interceptor-ref name="basicStack"/>
- * <result name="success">good_result.jsp</result>
- * </action>
- * <!-- END SNIPPET: example-configuration -->
- * </pre>
- * <p>
- * <!-- START SNIPPET: multipart-note -->
- * <p>
- * You must set the encoding to <code>multipart/form-data</code> in the form where the user selects the file to upload.
- * </p>
- * <!-- END SNIPPET: multipart-note -->
- *
- * <pre>
- * <!-- START SNIPPET: example-form -->
- * <s:form action="doUpload" method="post" enctype="multipart/form-data">
- * <s:file name="upload" label="File"/>
- * <s:submit/>
- * </s:form>
- * <!-- END SNIPPET: example-form -->
- * </pre>
- * <p>
- * And then in your action code you'll have access to the File object if you provide setters according to the
- * naming convention documented in the start.
- * </p>
- *
- * <pre>
- * <!-- START SNIPPET: example-action -->
- * package com.example;
- *
- * import java.io.File;
- * import com.opensymphony.xwork2.ActionSupport;
- *
- * public UploadAction extends ActionSupport {
- * private File file;
- * private String contentType;
- * private String filename;
- *
- * public void setUpload(File file) {
- * this.file = file;
- * }
- *
- * public void setUploadContentType(String contentType) {
- * this.contentType = contentType;
- * }
- *
- * public void setUploadFileName(String filename) {
- * this.filename = filename;
- * }
- *
- * public String execute() {
- * //...
- * return SUCCESS;
- * }
- * }
- * <!-- END SNIPPET: example-action -->
- * </pre>
- *
- * @deprecated since Struts 6.4.0, use {@link ActionFileUploadInterceptor} instead
- */
-@Deprecated
-public class FileUploadInterceptor extends AbstractFileUploadInterceptor {
-
- private static final long serialVersionUID = -4764627478894962478L;
-
- protected static final Logger LOG = LogManager.getLogger(FileUploadInterceptor.class);
-
- /* (non-Javadoc)
- * @see com.opensymphony.xwork2.interceptor.Interceptor#intercept(com.opensymphony.xwork2.ActionInvocation)
- */
-
- public String intercept(ActionInvocation invocation) throws Exception {
- ActionContext ac = invocation.getInvocationContext();
-
- HttpServletRequest request = ac.getServletRequest();
-
- if (!(request instanceof MultiPartRequestWrapper)) {
- if (LOG.isDebugEnabled()) {
- ActionProxy proxy = invocation.getProxy();
- LOG.debug(getTextMessage(STRUTS_MESSAGES_BYPASS_REQUEST_KEY, new String[]{proxy.getNamespace(), proxy.getActionName()}));
- }
-
- return invocation.invoke();
- }
-
- Object action = invocation.getAction();
- MultiPartRequestWrapper multiWrapper = (MultiPartRequestWrapper) request;
-
- applyValidation(action, multiWrapper);
-
- // bind allowed Files
- Enumeration<String> fileParameterNames = multiWrapper.getFileParameterNames();
- while (fileParameterNames != null && fileParameterNames.hasMoreElements()) {
- // get the value of this input tag
- String inputName = fileParameterNames.nextElement();
-
- // get the content type
- String[] contentType = multiWrapper.getContentTypes(inputName);
-
- if (isNonEmpty(contentType)) {
- // get the name of the file from the input tag
- String[] fileName = multiWrapper.getFileNames(inputName);
-
- if (isNonEmpty(fileName)) {
- // get a File object for the uploaded File
- UploadedFile[] files = multiWrapper.getFiles(inputName);
- if (files != null && files.length > 0) {
- List<UploadedFile> acceptedFiles = new ArrayList<>(files.length);
- List<String> acceptedContentTypes = new ArrayList<>(files.length);
- List<String> acceptedFileNames = new ArrayList<>(files.length);
- String contentTypeName = inputName + "ContentType";
- String fileNameName = inputName + "FileName";
-
- for (int index = 0; index < files.length; index++) {
- if (acceptFile(action, files[index], fileName[index], contentType[index], inputName)) {
- acceptedFiles.add(files[index]);
- acceptedContentTypes.add(contentType[index]);
- acceptedFileNames.add(fileName[index]);
- }
- }
-
- if (!acceptedFiles.isEmpty()) {
- Map<String, Parameter> newParams = new HashMap<>();
- newParams.put(inputName, new Parameter.File(inputName, acceptedFiles.toArray(new UploadedFile[0])));
- newParams.put(contentTypeName, new Parameter.File(contentTypeName, acceptedContentTypes.toArray(new String[0])));
- newParams.put(fileNameName, new Parameter.File(fileNameName, acceptedFileNames.toArray(new String[0])));
- ac.getParameters().appendAll(newParams);
- }
- }
- } else {
- if (LOG.isWarnEnabled()) {
- LOG.warn(getTextMessage(action, STRUTS_MESSAGES_INVALID_FILE_KEY, new String[]{inputName}));
- }
- }
- } else {
- if (LOG.isWarnEnabled()) {
- LOG.warn(getTextMessage(action, STRUTS_MESSAGES_INVALID_CONTENT_TYPE_KEY, new String[]{inputName}));
- }
- }
- }
-
- // invoke action
- return invocation.invoke();
- }
-
-}
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index 326477bc4..19fda0237 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -57,7 +57,6 @@
<interceptor name="debugging" class="org.apache.struts2.interceptor.debugging.DebuggingInterceptor"/>
<interceptor name="execAndWait" class="org.apache.struts2.interceptor.ExecuteAndWaitInterceptor"/>
<interceptor name="exception" class="com.opensymphony.xwork2.interceptor.ExceptionMappingInterceptor"/>
- <interceptor name="fileUpload" class="org.apache.struts2.interceptor.FileUploadInterceptor"/>
<interceptor name="actionFileUpload" class="org.apache.struts2.interceptor.ActionFileUploadInterceptor"/>
<interceptor name="i18n" class="org.apache.struts2.interceptor.I18nInterceptor"/>
<interceptor name="logger" class="com.opensymphony.xwork2.interceptor.LoggingInterceptor"/>
@@ -116,12 +115,6 @@
<interceptor-ref name="workflow"/>
</interceptor-stack>
- <!-- Sample file upload stack -->
- <interceptor-stack name="fileUploadStack">
- <interceptor-ref name="fileUpload"/>
- <interceptor-ref name="basicStack"/>
- </interceptor-stack>
-
<!-- Action based file upload stack -->
<interceptor-stack name="actionFileUploadStack">
<interceptor-ref name="actionFileUpload"/>
@@ -171,7 +164,6 @@
<interceptor-ref name="prepare"/>
<interceptor-ref name="chain"/>
<interceptor-ref name="modelDriven"/>
- <interceptor-ref name="fileUpload"/>
<interceptor-ref name="actionFileUpload"/>
<interceptor-ref name="staticParams"/>
<interceptor-ref name="actionMappingParams"/>
@@ -210,7 +202,6 @@
<interceptor-ref name="chain"/>
<interceptor-ref name="scopedModelDriven"/>
<interceptor-ref name="modelDriven"/>
- <interceptor-ref name="fileUpload"/>
<interceptor-ref name="actionFileUpload"/>
<interceptor-ref name="checkbox"/>
<interceptor-ref name="datetime"/>
diff --git a/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
deleted file mode 100644
index 36fad5847..000000000
--- a/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
+++ /dev/null
@@ -1,806 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.struts2.interceptor;
-
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.DefaultLocaleProvider;
-import com.opensymphony.xwork2.ValidationAwareSupport;
-import com.opensymphony.xwork2.mock.MockActionInvocation;
-import com.opensymphony.xwork2.util.ClassLoaderUtil;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.StrutsInternalTestCase;
-import org.apache.struts2.dispatcher.HttpParameters;
-import org.apache.struts2.dispatcher.multipart.JakartaMultiPartRequest;
-import org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper;
-import org.apache.struts2.dispatcher.multipart.StrutsUploadedFile;
-import org.apache.struts2.dispatcher.multipart.UploadedFile;
-import org.springframework.mock.web.MockHttpServletRequest;
-
-import javax.servlet.http.HttpServletRequest;
-import java.io.File;
-import java.net.URI;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-
-/**
- * Test case for FileUploadInterceptor.
- */
-public class FileUploadInterceptorTest extends StrutsInternalTestCase {
-
- public static final UploadedFile EMPTY_FILE = new UploadedFile() {
- @Override
- public Long length() {
- return 0L;
- }
-
- @Override
- public String getName() {
- return "";
- }
-
- @Override
- public boolean isFile() {
- return false;
- }
-
- @Override
- public boolean delete() {
- return false;
- }
-
- @Override
- public String getAbsolutePath() {
- return null;
- }
-
- @Override
- public byte[] getContent() {
- return new byte[0];
- }
-
- @Override
- public String getOriginalName() {
- return null;
- }
-
- @Override
- public String getContentType() {
- return null;
- }
-
- @Override
- public String getInputName() {
- return null;
- }
- };
-
- private FileUploadInterceptor interceptor;
- private File tempDir;
-
- public void testAcceptFileWithEmptyAllowedTypesAndExtensions() {
- // when allowed type is empty
- ValidationAwareSupport validation = new ValidationAwareSupport();
- boolean ok = interceptor.acceptFile(validation, EMPTY_FILE, "filename", "text/plain", "inputName");
-
- assertTrue(ok);
- assertTrue(validation.getFieldErrors().isEmpty());
- assertFalse(validation.hasErrors());
- }
-
- public void testAcceptFileWithoutEmptyTypes() {
- interceptor.setAllowedTypes("text/plain");
-
- // when file is of allowed types
- ValidationAwareSupport validation = new ValidationAwareSupport();
- boolean ok = interceptor.acceptFile(validation, EMPTY_FILE, "filename.txt", "text/plain", "inputName");
-
- assertTrue(ok);
- assertTrue(validation.getFieldErrors().isEmpty());
- assertFalse(validation.hasErrors());
-
- // when file is not of allowed types
- validation = new ValidationAwareSupport();
- boolean notOk = interceptor.acceptFile(validation, EMPTY_FILE, "filename.html", "text/html", "inputName");
-
- assertFalse(notOk);
- assertFalse(validation.getFieldErrors().isEmpty());
- assertTrue(validation.hasErrors());
- }
-
-
- public void testAcceptFileWithWildcardContent() {
- interceptor.setAllowedTypes("text/*");
-
- ValidationAwareSupport validation = new ValidationAwareSupport();
- boolean ok = interceptor.acceptFile(validation, EMPTY_FILE, "filename.txt", "text/plain", "inputName");
-
- assertTrue(ok);
- assertTrue(validation.getFieldErrors().isEmpty());
- assertFalse(validation.hasErrors());
-
- interceptor.setAllowedTypes("text/h*");
- validation = new ValidationAwareSupport();
- boolean notOk = interceptor.acceptFile(validation, EMPTY_FILE, "filename.html", "text/plain", "inputName");
-
- assertFalse(notOk);
- assertFalse(validation.getFieldErrors().isEmpty());
- assertTrue(validation.hasErrors());
- }
-
- public void testAcceptFileWithoutEmptyExtensions() {
- interceptor.setAllowedExtensions(".txt");
-
- // when file is of allowed extensions
- ValidationAwareSupport validation = new ValidationAwareSupport();
- boolean ok = interceptor.acceptFile(validation, EMPTY_FILE, "filename.txt", "text/plain", "inputName");
-
- assertTrue(ok);
- assertTrue(validation.getFieldErrors().isEmpty());
- assertFalse(validation.hasErrors());
-
- // when file is not of allowed extensions
- validation = new ValidationAwareSupport();
- boolean notOk = interceptor.acceptFile(validation, EMPTY_FILE, "filename.html", "text/html", "inputName");
-
- assertFalse(notOk);
- assertFalse(validation.getFieldErrors().isEmpty());
- assertTrue(validation.hasErrors());
-
- //test with multiple extensions
- interceptor.setAllowedExtensions(".txt,.lol");
- validation = new ValidationAwareSupport();
- ok = interceptor.acceptFile(validation, EMPTY_FILE, "filename.lol", "text/plain", "inputName");
-
- assertTrue(ok);
- assertTrue(validation.getFieldErrors().isEmpty());
- assertFalse(validation.hasErrors());
- }
-
- public void testAcceptFileWithNoFile() {
- FileUploadInterceptor interceptor = new FileUploadInterceptor();
- interceptor.setContainer(container);
-
- interceptor.setAllowedTypes("text/plain");
-
- // when file is not of allowed types
- ValidationAwareSupport validation = new ValidationAwareSupport();
- boolean notOk = interceptor.acceptFile(validation, null, "filename.html", "text/html", "inputName");
-
- assertFalse(notOk);
- assertFalse(validation.getFieldErrors().isEmpty());
- assertTrue(validation.hasErrors());
- List<String> errors = validation.getFieldErrors().get("inputName");
- assertEquals(1, errors.size());
- String msg = errors.get(0);
- assertTrue(msg.startsWith("Error uploading:"));
- assertTrue(msg.indexOf("inputName") > 0);
- }
-
- public void testAcceptFileWithMaxSize() throws Exception {
- interceptor.setMaximumSize(10L);
-
- // when file is not of allowed types
- ValidationAwareSupport validation = new ValidationAwareSupport();
-
- URL url = ClassLoaderUtil.getResource("log4j2.xml", FileUploadInterceptorTest.class);
- File file = new File(new URI(url.toString()));
- assertTrue("log4j2.xml should be in src/test folder", file.exists());
- UploadedFile uploadedFile = StrutsUploadedFile.Builder.create(file).withContentType("text/html").withOriginalName("filename").build();
- boolean notOk = interceptor.acceptFile(validation, uploadedFile, "filename", "text/html", "inputName");
-
- assertFalse(notOk);
- assertFalse(validation.getFieldErrors().isEmpty());
- assertTrue(validation.hasErrors());
- List<String> errors = validation.getFieldErrors().get("inputName");
- assertEquals(1, errors.size());
- String msg = errors.get(0);
- // the error message should contain at least this test
- assertThat(msg).contains(
- "The file is too large to be uploaded",
- "inputName",
- "log4j2.xml",
- "allowed mx size is 10"
- );
- }
-
- public void testNoMultipartRequest() throws Exception {
- MyFileupAction action = new MyFileupAction();
-
- MockActionInvocation mai = new MockActionInvocation();
- mai.setAction(action);
- mai.setResultCode("NoMultipart");
- mai.setInvocationContext(ActionContext.getContext());
-
- // if no multipart request it will bypass and execute it
- assertEquals("NoMultipart", interceptor.intercept(mai));
- }
-
- public void testInvalidContentTypeMultipartRequest() throws Exception {
- MockHttpServletRequest req = new MockHttpServletRequest();
-
- req.setContentType("multipart/form-data"); // not a multipart contentype
- req.setMethod("post");
-
- MyFileupAction action = container.inject(MyFileupAction.class);
- MockActionInvocation mai = new MockActionInvocation();
- mai.setAction(action);
- mai.setResultCode("success");
- mai.setInvocationContext(ActionContext.getContext());
-
- ActionContext.getContext().withParameters(HttpParameters.create().build());
- ActionContext.getContext().put(ServletActionContext.HTTP_REQUEST, createMultipartRequestMaxSize(req, 2000));
-
- interceptor.intercept(mai);
-
- assertTrue(action.hasErrors());
- }
-
- 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
-
- MyFileupAction action = container.inject(MyFileupAction.class);
- MockActionInvocation mai = new MockActionInvocation();
- mai.setAction(action);
- mai.setResultCode("success");
- mai.setInvocationContext(ActionContext.getContext());
-
- ActionContext.getContext().withParameters(HttpParameters.create().build());
- ActionContext.getContext().put(ServletActionContext.HTTP_REQUEST, createMultipartRequestMaxSize(req, 2000));
-
- interceptor.intercept(mai);
-
- assertTrue(action.hasErrors());
- }
-
- public void testSuccessUploadOfATextFileMultipartRequest() throws Exception {
- MockHttpServletRequest req = new MockHttpServletRequest();
- req.setCharacterEncoding(StandardCharsets.UTF_8.name());
- req.setMethod("post");
- req.addHeader("Content-type", "multipart/form-data; boundary=---1234");
-
- // inspired by the unit tests for jakarta commons fileupload
- String content = ("-----1234\r\n" +
- "Content-Disposition: form-data; name=\"file\"; filename=\"deleteme.txt\"\r\n" +
- "Content-Type: text/html\r\n" +
- "\r\n" +
- "Unit test of FileUploadInterceptor" +
- "\r\n" +
- "-----1234--\r\n");
- req.setContent(content.getBytes(StandardCharsets.US_ASCII));
-
- MyFileupAction action = new MyFileupAction();
-
- MockActionInvocation mai = new MockActionInvocation();
- mai.setAction(action);
- mai.setResultCode("success");
- mai.setInvocationContext(ActionContext.getContext());
- Map<String, Object> param = new HashMap<>();
- ActionContext.getContext().withParameters(HttpParameters.create(param).build());
- ActionContext.getContext().put(ServletActionContext.HTTP_REQUEST, createMultipartRequestMaxSize(req, 2000));
-
- interceptor.intercept(mai);
-
- assertFalse(action.hasErrors());
-
- HttpParameters parameters = mai.getInvocationContext().getParameters();
- assertEquals(3, parameters.keySet().size());
- UploadedFile[] files = (UploadedFile[]) parameters.get("file").getObject();
- String[] fileContentTypes = parameters.get("fileContentType").getMultipleValues();
- String[] fileRealFilenames = parameters.get("fileFileName").getMultipleValues();
-
- assertNotNull(files);
- assertNotNull(fileContentTypes);
- assertNotNull(fileRealFilenames);
- assertEquals(1, files.length);
- assertEquals(1, fileContentTypes.length);
- assertEquals(1, fileRealFilenames.length);
- assertEquals("text/html", fileContentTypes[0]);
- assertNotNull("deleteme.txt", fileRealFilenames[0]);
- }
-
- public void testSuccessUploadOfATextFileMultipartRequestNoMaxParamsSet() throws Exception {
- MockHttpServletRequest req = new MockHttpServletRequest();
- req.setCharacterEncoding(StandardCharsets.UTF_8.name());
- req.setMethod("post");
- req.addHeader("Content-type", "multipart/form-data; boundary=---1234");
-
- // inspired by the unit tests for jakarta commons fileupload
- String content = ("-----1234\r\n" +
- "Content-Disposition: form-data; name=\"file\"; filename=\"deleteme.txt\"\r\n" +
- "Content-Type: text/html\r\n" +
- "\r\n" +
- "Unit test of FileUploadInterceptor" +
- "\r\n" +
- "-----1234--\r\n");
- req.setContent(content.getBytes(StandardCharsets.US_ASCII));
-
- MyFileupAction action = new MyFileupAction();
-
- MockActionInvocation mai = new MockActionInvocation();
- mai.setAction(action);
- mai.setResultCode("success");
- mai.setInvocationContext(ActionContext.getContext());
- Map<String, Object> param = new HashMap<>();
- ActionContext.getContext().withParameters(HttpParameters.create(param).build());
- ActionContext.getContext().withServletRequest(createMultipartRequestNoMaxParamsSet(req));
-
- interceptor.intercept(mai);
-
- assertFalse(action.hasErrors());
-
- HttpParameters parameters = mai.getInvocationContext().getParameters();
- assertEquals(3, parameters.keySet().size());
- UploadedFile[] files = (UploadedFile[]) parameters.get("file").getObject();
- String[] fileContentTypes = parameters.get("fileContentType").getMultipleValues();
- String[] fileRealFilenames = parameters.get("fileFileName").getMultipleValues();
-
- assertNotNull(files);
- assertNotNull(fileContentTypes);
- assertNotNull(fileRealFilenames);
- assertEquals(1, files.length);
- assertEquals(1, fileContentTypes.length);
- assertEquals(1, fileRealFilenames.length);
- assertEquals("text/html", fileContentTypes[0]);
- assertNotNull("deleteme.txt", fileRealFilenames[0]);
- }
-
- public void testSuccessUploadOfATextFileMultipartRequestWithNormalFieldsMaxParamsSet() throws Exception {
- MockHttpServletRequest req = new MockHttpServletRequest();
- req.setCharacterEncoding(StandardCharsets.UTF_8.name());
- req.setMethod("post");
- req.addHeader("Content-type", "multipart/form-data; boundary=---1234");
-
- // inspired by the unit tests for jakarta commons fileupload
- String content = ("-----1234\r\n" +
- "Content-Disposition: form-data; name=\"file\"; filename=\"deleteme.txt\"\r\n" +
- "Content-Type: text/html\r\n" +
- "\r\n" +
- "Unit test of FileUploadInterceptor" +
- "\r\n" +
- "-----1234\r\n" +
- "Content-Disposition: form-data; name=\"normalFormField1\"\r\n" +
- "\r\n" +
- "normal field 1" +
- "\r\n" +
- "-----1234\r\n" +
- "Content-Disposition: form-data; name=\"normalFormField2\"\r\n" +
- "\r\n" +
- "normal field 2" +
- "\r\n" +
- "-----1234--\r\n");
- req.setContent(content.getBytes(StandardCharsets.US_ASCII));
-
- MyFileupAction action = new MyFileupAction();
-
- MockActionInvocation mai = new MockActionInvocation();
- mai.setAction(action);
- mai.setResultCode("success");
- mai.setInvocationContext(ActionContext.getContext());
- Map<String, Object> param = new HashMap<>();
- ActionContext.getContext().withParameters(HttpParameters.create(param).build());
- ActionContext.getContext().withServletRequest(createMultipartRequest(req, 2000, 2000, 5, 100));
-
- interceptor.intercept(mai);
-
- assertFalse(action.hasErrors());
-
- HttpParameters parameters = mai.getInvocationContext().getParameters();
- assertEquals(3, parameters.keySet().size());
- UploadedFile[] files = (UploadedFile[]) parameters.get("file").getObject();
- String[] fileContentTypes = parameters.get("fileContentType").getMultipleValues();
- String[] fileRealFilenames = parameters.get("fileFileName").getMultipleValues();
-
- assertNotNull(files);
- assertNotNull(fileContentTypes);
- assertNotNull(fileRealFilenames);
- assertEquals(1, files.length);
- assertEquals(1, fileContentTypes.length);
- assertEquals(1, fileRealFilenames.length);
- assertEquals("text/html", fileContentTypes[0]);
- assertNotNull("deleteme.txt", fileRealFilenames[0]);
-
- // Confirm normalFormField1, normalFormField2 were processed by the MultiPartRequestWrapper.
- HttpServletRequest invocationServletRequest = mai.getInvocationContext().getServletRequest();
- assertTrue("invocation servelt request is not a MultiPartRequestWrapper ?", invocationServletRequest instanceof MultiPartRequestWrapper);
- MultiPartRequestWrapper multipartRequestWrapper = (MultiPartRequestWrapper) invocationServletRequest;
- assertNotNull("normalFormField1 missing from MultiPartRequestWrapper parameters ?", multipartRequestWrapper.getParameter("normalFormField1"));
- assertNotNull("normalFormField2 missing from MultiPartRequestWrapper parameters ?", multipartRequestWrapper.getParameter("normalFormField2"));
- }
-
- public void testSuccessUploadOfATextFileMultipartRequestWithNormalFieldsNoMaxParamsSet() throws Exception {
- MockHttpServletRequest req = new MockHttpServletRequest();
- req.setCharacterEncoding(StandardCharsets.UTF_8.name());
- req.setMethod("post");
- req.addHeader("Content-type", "multipart/form-data; boundary=---1234");
-
- // inspired by the unit tests for jakarta commons fileupload
- String content = ("-----1234\r\n" +
- "Content-Disposition: form-data; name=\"file\"; filename=\"deleteme.txt\"\r\n" +
- "Content-Type: text/html\r\n" +
- "\r\n" +
- "Unit test of FileUploadInterceptor" +
- "\r\n" +
- "-----1234\r\n" +
- "Content-Disposition: form-data; name=\"normalFormField1\"\r\n" +
- "\r\n" +
- "normal field 1 with no max parameters set" +
- "\r\n" +
- "-----1234\r\n" +
- "Content-Disposition: form-data; name=\"normalFormField2\"\r\n" +
- "\r\n" +
- "normal field 2 with no max parameters set" +
- "\r\n" +
- "-----1234--\r\n");
- req.setContent(content.getBytes(StandardCharsets.US_ASCII));
-
- MyFileupAction action = new MyFileupAction();
-
- MockActionInvocation mai = new MockActionInvocation();
- mai.setAction(action);
- mai.setResultCode("success");
- mai.setInvocationContext(ActionContext.getContext());
- Map<String, Object> param = new HashMap<>();
- ActionContext.getContext().withParameters(HttpParameters.create(param).build());
- ActionContext.getContext().withServletRequest(createMultipartRequestNoMaxParamsSet(req));
-
- interceptor.intercept(mai);
-
- assertFalse(action.hasErrors());
-
- HttpParameters parameters = mai.getInvocationContext().getParameters();
- assertEquals(3, parameters.keySet().size());
- UploadedFile[] files = (UploadedFile[]) parameters.get("file").getObject();
- String[] fileContentTypes = parameters.get("fileContentType").getMultipleValues();
- String[] fileRealFilenames = parameters.get("fileFileName").getMultipleValues();
-
- assertNotNull(files);
- assertNotNull(fileContentTypes);
- assertNotNull(fileRealFilenames);
- assertEquals(1, files.length);
- assertEquals(1, fileContentTypes.length);
- assertEquals(1, fileRealFilenames.length);
- assertEquals("text/html", fileContentTypes[0]);
- assertNotNull("deleteme.txt", fileRealFilenames[0]);
-
- // Confirm normalFormField1, normalFormField2 were processed by the MultiPartRequestWrapper.
- HttpServletRequest invocationServletRequest = mai.getInvocationContext().getServletRequest();
- assertTrue("invocation servelt request is not a MultiPartRequestWrapper ?", invocationServletRequest instanceof MultiPartRequestWrapper);
- MultiPartRequestWrapper multipartRequestWrapper = (MultiPartRequestWrapper) invocationServletRequest;
- assertNotNull("normalFormField1 missing from MultiPartRequestWrapper parameters ?", multipartRequestWrapper.getParameter("normalFormField1"));
- assertNotNull("normalFormField2 missing from MultiPartRequestWrapper parameters ?", multipartRequestWrapper.getParameter("normalFormField2"));
- }
-
- /**
- * tests whether with multiple files sent with the same name, the ones with forbiddenTypes (see
- * FileUploadInterceptor.setAllowedTypes(...) ) are sorted out.
- */
- public void testMultipleAccept() throws Exception {
- final String htmlContent = "<html><head></head><body>html content</body></html>";
- final String plainContent = "plain content";
- final String bondary = "simple boundary";
- final String endline = "\r\n";
-
- MockHttpServletRequest req = new MockHttpServletRequest();
- req.setCharacterEncoding(StandardCharsets.UTF_8.name());
- req.setMethod("POST");
- req.addHeader("Content-type", "multipart/form-data; boundary=" + bondary);
- String content = encodeTextFile("test.html", "text/plain", plainContent) +
- encodeTextFile("test1.html", "text/html", htmlContent) +
- encodeTextFile("test2.html", "text/html", htmlContent) +
- endline +
- endline +
- endline +
- "--" +
- bondary +
- "--" +
- endline;
- req.setContent(content.getBytes());
-
- assertTrue(ServletFileUpload.isMultipartContent(req));
-
- MyFileupAction action = new MyFileupAction();
- container.inject(action);
- MockActionInvocation mai = new MockActionInvocation();
- mai.setAction(action);
- mai.setResultCode("success");
- mai.setInvocationContext(ActionContext.getContext());
- Map<String, Object> param = new HashMap<>();
- ActionContext.getContext().withParameters(HttpParameters.create(param).build());
- ActionContext.getContext().put(ServletActionContext.HTTP_REQUEST, createMultipartRequestMaxSize(req, 2000));
-
- interceptor.setAllowedTypes("text/html");
- interceptor.intercept(mai);
-
- HttpParameters parameters = mai.getInvocationContext().getParameters();
- assertEquals(3, parameters.keySet().size());
- UploadedFile[] files = (UploadedFile[]) parameters.get("file").getObject();
- String[] fileContentTypes = parameters.get("fileContentType").getMultipleValues();
- String[] fileRealFilenames = parameters.get("fileFileName").getMultipleValues();
-
- assertNotNull(files);
- assertNotNull(fileContentTypes);
- assertNotNull(fileRealFilenames);
- assertEquals("files accepted ", 2, files.length);
- assertEquals(2, fileContentTypes.length);
- assertEquals(2, fileRealFilenames.length);
- assertEquals("text/html", fileContentTypes[0]);
- assertNotNull("test1.html", fileRealFilenames[0]);
- }
-
- public void testUnacceptedNumberOfFiles() throws Exception {
- final String htmlContent = "<html><head></head><body>html content</body></html>";
- final String plainContent = "plain content";
- final String boundary = "simple boundary";
- final String endline = "\r\n";
-
- MockHttpServletRequest req = new MockHttpServletRequest();
- req.setCharacterEncoding(StandardCharsets.UTF_8.name());
- req.setMethod("POST");
- req.addHeader("Content-type", "multipart/form-data; boundary=" + boundary);
- String content = encodeTextFile("test.html", "text/plain", plainContent) +
- encodeTextFile("test1.html", "text/html", htmlContent) +
- encodeTextFile("test2.html", "text/html", htmlContent) +
- encodeTextFile("test3.html", "text/html", htmlContent) +
- endline +
- "--" +
- boundary +
- "--" +
- endline;
- req.setContent(content.getBytes());
-
- assertTrue(ServletFileUpload.isMultipartContent(req));
-
- MyFileupAction action = new MyFileupAction();
- container.inject(action);
- MockActionInvocation mai = new MockActionInvocation();
- mai.setAction(action);
- mai.setResultCode("success");
- mai.setInvocationContext(ActionContext.getContext());
- Map<String, Object> param = new HashMap<>();
- ActionContext.getContext().withParameters(HttpParameters.create(param).build());
- ActionContext.getContext().put(ServletActionContext.HTTP_REQUEST, createMultipartRequestMaxFiles(req));
-
- interceptor.setAllowedTypes("text/html");
- interceptor.intercept(mai);
-
- HttpParameters parameters = mai.getInvocationContext().getParameters();
- assertEquals(0, parameters.keySet().size());
- assertEquals(1, action.getActionErrors().size());
- assertEquals("Request exceeded allowed number of files! Max allowed files number is: 3!", action.getActionErrors().iterator().next());
- }
-
- public void testMultipartRequestMaxFileSize() throws Exception {
- MockHttpServletRequest req = new MockHttpServletRequest();
- req.setCharacterEncoding(StandardCharsets.UTF_8.name());
- req.setMethod("post");
- req.addHeader("Content-type", "multipart/form-data; boundary=---1234");
-
- // inspired by the unit tests for jakarta commons fileupload
- String content = ("-----1234\r\n" +
- "Content-Disposition: form-data; name=\"file\"; filename=\"deleteme.txt\"\r\n" +
- "Content-Type: text/html\r\n" +
- "\r\n" +
- "Unit test of FileUploadInterceptor" +
- "\r\n" +
- "-----1234--\r\n");
- req.setContent(content.getBytes(StandardCharsets.US_ASCII));
-
- MyFileupAction action = container.inject(MyFileupAction.class);
-
- MockActionInvocation mai = new MockActionInvocation();
- mai.setAction(action);
- mai.setResultCode("success");
- mai.setInvocationContext(ActionContext.getContext());
- Map<String, Object> param = new HashMap<>();
- ActionContext.getContext()
- .withParameters(HttpParameters.create(param).build())
- .withServletRequest(createMultipartRequestMaxFileSize(req));
-
- interceptor.intercept(mai);
-
- assertTrue(action.hasActionErrors());
-
- Collection<String> errors = action.getActionErrors();
- assertEquals(1, errors.size());
- String msg = errors.iterator().next();
- assertEquals(
- "File in request exceeded allowed file size limit! Max file size allowed is: 10 but file deleteme.txt was: 34!",
- msg);
- }
-
- public void testMultipartRequestMaxStringLength() throws Exception {
- MockHttpServletRequest req = new MockHttpServletRequest();
- req.setCharacterEncoding(StandardCharsets.UTF_8.name());
- req.setMethod("post");
- req.addHeader("Content-type", "multipart/form-data; boundary=---1234");
-
- // inspired by the unit tests for jakarta commons fileupload
- String content = ("-----1234\r\n" +
- "Content-Disposition: form-data; name=\"file\"; filename=\"deleteme.txt\"\r\n" +
- "Content-Type: text/html\r\n" +
- "\r\n" +
- "Unit test of FileUploadInterceptor" +
- "\r\n" +
- "-----1234\r\n" +
- "Content-Disposition: form-data; name=\"normalFormField1\"\r\n" +
- "\r\n" +
- "it works" +
- "\r\n" +
- "-----1234\r\n" +
- "Content-Disposition: form-data; name=\"normalFormField2\"\r\n" +
- "\r\n" +
- "long string should not work" +
- "\r\n" +
- "-----1234--\r\n");
- req.setContent(content.getBytes(StandardCharsets.US_ASCII));
-
- MyFileupAction action = container.inject(MyFileupAction.class);
-
- MockActionInvocation mai = new MockActionInvocation();
- mai.setAction(action);
- mai.setResultCode("success");
- mai.setInvocationContext(ActionContext.getContext());
- Map<String, Object> param = new HashMap<>();
- ActionContext.getContext()
- .withParameters(HttpParameters.create(param).build())
- .withServletRequest(createMultipartRequestMaxStringLength(req));
-
- interceptor.intercept(mai);
-
- assertTrue(action.hasActionErrors());
-
- Collection<String> errors = action.getActionErrors();
- assertEquals(1, errors.size());
- String msg = errors.iterator().next();
- assertEquals(
- "The request parameter \"normalFormField2\" was too long. Max length allowed is 20, but found 27!",
- msg);
- }
-
- public void testMultipartRequestLocalizedError() throws Exception {
- MockHttpServletRequest req = new MockHttpServletRequest();
- req.setCharacterEncoding(StandardCharsets.UTF_8.name());
- req.setMethod("post");
- req.addHeader("Content-type", "multipart/form-data; boundary=---1234");
-
- // inspired by the unit tests for jakarta commons fileupload
- String content = ("-----1234\r\n" +
- "Content-Disposition: form-data; name=\"file\"; filename=\"deleteme.txt\"\r\n" +
- "Content-Type: text/html\r\n" +
- "\r\n" +
- "Unit test of FileUploadInterceptor" +
- "\r\n" +
- "-----1234--\r\n");
- req.setContent(content.getBytes(StandardCharsets.US_ASCII));
-
- MyFileupAction action = container.inject(MyFileupAction.class);
-
- MockActionInvocation mai = new MockActionInvocation();
- mai.setAction(action);
- mai.setResultCode("success");
- mai.setInvocationContext(ActionContext.getContext());
- Map<String, Object> param = new HashMap<>();
- ActionContext.getContext()
- .withParameters(HttpParameters.create(param).build())
- .withLocale(Locale.GERMAN)
- .withServletRequest(createMultipartRequestMaxSize(req, 10));
-
- interceptor.intercept(mai);
-
- assertTrue(action.hasActionErrors());
-
- Collection<String> errors = action.getActionErrors();
- assertEquals(1, errors.size());
- String msg = errors.iterator().next();
- // the error message should contain at least this test
- assertTrue(msg.startsWith("Der Request übertraf die maximal erlaubte Größe"));
- }
-
- private String encodeTextFile(String filename, String contentType, String content) {
- return "\r\n" +
- "--" +
- "simple boundary" +
- "\r\n" +
- "Content-Disposition: form-data; name=\"" +
- "file" +
- "\"; filename=\"" +
- filename +
- "\r\n" +
- "Content-Type: " +
- contentType +
- "\r\n" +
- "\r\n" +
- content;
- }
-
- private MultiPartRequestWrapper createMultipartRequestMaxFileSize(HttpServletRequest req) {
- return createMultipartRequest(req, -1, 10, -1, -1);
- }
-
- private MultiPartRequestWrapper createMultipartRequestMaxFiles(HttpServletRequest req) {
- return createMultipartRequest(req, -1, -1, 3, -1);
- }
-
- private MultiPartRequestWrapper createMultipartRequestMaxSize(HttpServletRequest req, int maxsize) {
- return createMultipartRequest(req, maxsize, -1, -1, -1);
- }
-
- private MultiPartRequestWrapper createMultipartRequestMaxStringLength(HttpServletRequest req) {
- return createMultipartRequest(req, -1, -1, -1, 20);
- }
-
- private MultiPartRequestWrapper createMultipartRequest(HttpServletRequest req, int maxsize, int maxfilesize, int maxfiles, int maxStringLength) {
-
- JakartaMultiPartRequest jak = new JakartaMultiPartRequest();
- jak.setMaxSize(String.valueOf(maxsize));
- jak.setMaxFileSize(String.valueOf(maxfilesize));
- jak.setMaxFiles(String.valueOf(maxfiles));
- jak.setMaxStringLength(String.valueOf(maxStringLength));
- return new MultiPartRequestWrapper(jak, req, tempDir.getAbsolutePath(), new DefaultLocaleProvider());
- }
-
- private MultiPartRequestWrapper createMultipartRequestNoMaxParamsSet(HttpServletRequest req) {
-
- JakartaMultiPartRequest jak = new JakartaMultiPartRequest();
- return new MultiPartRequestWrapper(jak, req, tempDir.getAbsolutePath(), new DefaultLocaleProvider());
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
- interceptor = new FileUploadInterceptor();
- container.inject(interceptor);
- tempDir = File.createTempFile("struts", "fileupload");
- tempDir.delete();
- tempDir.mkdirs();
- }
-
- @Override
- protected void tearDown() throws Exception {
- tempDir.delete();
- interceptor.destroy();
- super.tearDown();
- }
-
- public static class MyFileupAction extends ActionSupport {
-
- private static final long serialVersionUID = 6255238895447968889L;
-
- // no methods
- // Note: We do not currently need fields/getters/setters for normalFormField1, normalFormField2 since
- // the upload interceptor only prepares the normal field parameters.
- }
-
-}
(struts) 01/19: [maven-release-plugin] prepare release struts2-parent-6.4.0-atlassian-1
Posted by ku...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch issue-85/CONFSRVDEV-37138-merge-upstream
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 5e7c00afb4e0f1b075bd1f1920b6eb55be61e758
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Tue Apr 23 16:46:32 2024 +1000
[maven-release-plugin] prepare release struts2-parent-6.4.0-atlassian-1
---
core/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/velocity/pom.xml | 2 +-
pom.xml | 6 +++---
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index a9085beeb..f19447948 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.4.0-atlassian-1-SNAPSHOT</version>
+ <version>6.4.0-atlassian-1</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index b76d4ce0e..258c95868 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-atlassian-1-SNAPSHOT</version>
+ <version>6.4.0-atlassian-1</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 9c0e5ed55..fe4932c38 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.4.0-atlassian-1-SNAPSHOT</version>
+ <version>6.4.0-atlassian-1</version>
</parent>
<artifactId>struts2-plugins</artifactId>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 126ea7423..a08f200dd 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-atlassian-1-SNAPSHOT</version>
+ <version>6.4.0-atlassian-1</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index f3c5a46f2..3081be624 100644
--- a/plugins/velocity/pom.xml
+++ b/plugins/velocity/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-atlassian-1-SNAPSHOT</version>
+ <version>6.4.0-atlassian-1</version>
</parent>
<artifactId>struts2-velocity-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 53d90d889..439f1fe43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>6.4.0-atlassian-1-SNAPSHOT</version>
+ <version>6.4.0-atlassian-1</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>https://struts.apache.org/</url>
@@ -51,7 +51,7 @@
<connection>scm:git:ssh://git@stash.atlassian.com:7997/bam/struts2-atlassian.git</connection>
<developerConnection>scm:git:ssh://git@stash.atlassian.com:7997/bam/struts2-atlassian.git</developerConnection>
<url>https://stash.atlassian.com/projects/BAM/repos/struts2-atlassian/browse</url>
- <tag>HEAD</tag>
+ <tag>struts2-parent-6.4.0-atlassian-1</tag>
</scm>
<issueManagement>
@@ -107,7 +107,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.build.outputTimestamp>2024-04-12T07:47:44Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2024-04-23T06:46:09Z</project.build.outputTimestamp>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
(struts) 06/19: Merge remote-tracking branch 'origin/master' into fork/6.6
Posted by ku...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch issue-85/CONFSRVDEV-37138-merge-upstream
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 91ef86894e25acabc29d2d68ed66c8bcafe92306
Merge: 183352bc4 d33be1d43
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Tue Oct 8 16:34:39 2024 +1100
Merge remote-tracking branch 'origin/master' into fork/6.6
.github/workflows/codeql.yml | 6 +--
.github/workflows/scorecards-analysis.yaml | 6 +--
apps/showcase/pom.xml | 2 +-
.../showcase/fileupload/FileUploadAction.java | 6 +++
.../webapp/WEB-INF/fileupload/upload-success.jsp | 3 +-
.../apache/struts2/showcase/FileUploadTest.java | 32 ++++++++++++++--
.../com/opensymphony/xwork2/ognl/OgnlUtil.java | 23 +++++++++++-
.../struts2/components/IteratorComponent.java | 5 ++-
.../java/org/apache/struts2/components/UIBean.java | 8 +++-
.../multipart/JakartaMultiPartRequest.java | 1 +
.../multipart/JakartaStreamMultiPartRequest.java | 15 +++++++-
.../dispatcher/multipart/StrutsUploadedFile.java | 19 +++++++++-
.../struts2/dispatcher/multipart/UploadedFile.java | 9 +++++
.../com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 16 ++++++++
.../struts2/components/IteratorComponentTest.java | 36 ++++++++++++++++++
.../org/apache/struts2/components/UIBeanTest.java | 43 +++++++++++++++++++---
.../ActionFileUploadInterceptorTest.java | 5 +++
.../interceptor/FileUploadInterceptorTest.java | 5 +++
.../apache/struts2/views/jsp/IteratorTagTest.java | 36 +++++++++++++++++-
.../struts2/views/java/simple/AbstractTest.java | 11 ++++++
.../apache/struts2/views/java/simple/HeadTest.java | 2 +-
.../apache/struts2/views/java/simple/LinkTest.java | 18 ++-------
.../struts2/views/java/simple/ScriptTest.java | 12 ------
plugins/jfreechart/pom.xml | 2 +-
.../dispatcher/multipart/PellMultiPartRequest.java | 1 +
plugins/tiles/pom.xml | 2 +-
pom.xml | 34 ++++++++---------
27 files changed, 286 insertions(+), 72 deletions(-)
diff --cc pom.xml
index bad45abe4,294dda0ef..f4e2ce028
--- a/pom.xml
+++ b/pom.xml
@@@ -384,10 -381,7 +384,10 @@@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.1.1</version>
+ <configuration>
+ <arguments>-Dmaven.test.skip -Dgpg.skip</arguments>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
(struts) 12/19: Merge remote-tracking branch 'origin/master' into release/6.7
Posted by ku...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch issue-85/CONFSRVDEV-37138-merge-upstream
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 7fa08d0537f30f0f79088bd4ef601d7f118af178
Merge: c2c35251a 085f50d45
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Mon Nov 18 16:41:05 2024 +1100
Merge remote-tracking branch 'origin/master' into release/6.7
.github/workflows/codeql.yml | 6 +-
.github/workflows/scorecards-analysis.yaml | 4 +-
apps/pom.xml | 2 +-
apps/rest-showcase/pom.xml | 4 +-
apps/showcase/pom.xml | 4 +-
.../showcase/modelDriven/ModelDrivenAction.java | 2 +-
assembly/pom.xml | 2 +-
bom/pom.xml | 6 +-
bundles/admin/pom.xml | 2 +-
bundles/demo/pom.xml | 2 +-
bundles/pom.xml | 2 +-
core/pom.xml | 2 +-
.../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 | 337 +--------------
.../xwork2/DefaultActionInvocation.java | 12 +-
.../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/config/entities/InterceptorMapping.java | 10 +-
.../xwork2/config/entities/ResultConfig.java | 6 +-
.../xwork2/config/impl/DefaultConfiguration.java | 4 +-
.../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 | 179 ++++----
.../xwork2/interceptor/ValidationErrorAware.java | 20 +-
.../interceptor/ValidationWorkflowAware.java | 10 +-
.../xwork2/interceptor/WithLazyParams.java | 5 +-
.../com/opensymphony/xwork2/util/DebugUtils.java | 2 +-
.../xwork2/util/StrutsLocalizedTextProvider.java | 6 +-
.../com/opensymphony/xwork2/util/ValueStack.java | 257 ++++++-----
.../validator/DelegatingValidatorContext.java | 18 +-
.../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 | 28 +-
.../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 +-
.../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 | 2 +-
.../java/org/apache/struts2/components/Token.java | 2 +-
.../java/org/apache/struts2/components/UIBean.java | 29 +-
.../java/org/apache/struts2/components/URL.java | 2 +-
.../apache/struts2/components/UpDownSelect.java | 8 +-
.../org/apache/struts2/dispatcher/Dispatcher.java | 2 +-
.../multipart/JakartaMultiPartRequest.java | 2 +-
.../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 +-
.../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 | 2 +-
.../struts2}/interceptor/ValidationErrorAware.java | 2 +-
.../interceptor/ValidationWorkflowAware.java | 2 +-
.../parameter/ParametersInterceptor.java | 45 +-
.../apache/struts2/result}/ActionChainResult.java | 9 +-
.../apache/struts2/result}/Result.java | 5 +-
.../apache/struts2/result/StrutsResultSupport.java | 25 +-
.../apache/struts2}/util/ValueStack.java | 7 +-
.../struts2/views/freemarker/ScopesHashModel.java | 27 +-
.../com/opensymphony/xwork2/ModelDrivenAction.java | 3 +-
.../xwork2/ModelDrivenAnnotationAction.java | 3 +-
.../ConfigurationProviderOgnlAllowlistTest.java | 32 +-
.../ChainingInterceptorWithConfigTest.java | 7 +-
.../interceptor/ModelDrivenInterceptorTest.java | 2 +-
.../xwork2/test/ModelDrivenAction2.java | 4 +-
.../xwork2/test/ModelDrivenAnnotationAction2.java | 4 +-
.../xwork2/test/subtest/NullModelDrivenAction.java | 3 +-
.../validator/VisitorValidatorModelAction.java | 5 +-
.../apache/struts2/components/FormButtonTest.java | 22 +-
.../org/apache/struts2/components/FormTest.java | 6 +-
.../org/apache/struts2/components/UIBeanTest.java | 96 +++--
.../ActionFileUploadInterceptorTest.java | 151 +++++++
.../interceptor/FileUploadInterceptorTest.java | 181 +++++++-
.../parameter/StrutsParameterAnnotationTest.java | 36 +-
.../apache/struts2/result/StreamResultTest.java | 6 +-
.../apache/struts2/views/jsp/ActionTagTest.java | 6 +-
.../org/apache/struts2/views/jsp/URLTagTest.java | 12 +-
.../apache/struts2/views/jsp/ui/FormTagTest.java | 8 +-
plugins/async/pom.xml | 2 +-
plugins/bean-validation/pom.xml | 2 +-
.../interceptor/BeanValidationInterceptor.java | 2 +-
.../beanvalidation/actions/ModelDrivenAction.java | 2 -
.../actions/ValidateGroupAction.java | 2 -
plugins/cdi/pom.xml | 2 +-
plugins/config-browser/pom.xml | 2 +-
plugins/convention/pom.xml | 2 +-
.../PackageBasedActionConfigBuilderTest.java | 4 +-
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 | 2 +-
plugins/javatemplates/pom.xml | 2 +-
.../struts2/views/java/simple/SelectHandler.java | 8 +-
.../java/simple/AbstractCommonAttributesTest.java | 6 +-
.../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 | 2 +-
.../struts2/views/java/simple/HiddenTest.java | 2 +-
.../struts2/views/java/simple/LabelTest.java | 2 +-
.../apache/struts2/views/java/simple/LinkTest.java | 4 +-
.../struts2/views/java/simple/PasswordTest.java | 4 +-
.../struts2/views/java/simple/ResetTest.java | 4 +-
.../struts2/views/java/simple/ScriptTest.java | 2 +-
.../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 | 2 +-
plugins/json/pom.xml | 2 +-
.../java/org/apache/struts2/json/JSONResult.java | 2 +-
.../struts2/json/JSONValidationInterceptor.java | 8 +-
plugins/junit/pom.xml | 2 +-
.../apache/struts2/junit/StrutsJUnit4TestCase.java | 2 +-
.../apache/struts2/junit/StrutsRestTestCase.java | 3 +-
plugins/osgi/pom.xml | 2 +-
plugins/oval/pom.xml | 2 +-
.../interceptor/OValValidationInterceptor.java | 3 +-
plugins/pell-multipart/pom.xml | 2 +-
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 | 400 +++++++++--------
plugins/sitemesh/pom.xml | 4 +-
.../sitemesh/FreemarkerDecoratorServlet.java | 4 +
.../struts2/sitemesh/VelocityDecoratorServlet.java | 4 +
plugins/spring/pom.xml | 2 +-
.../com/opensymphony/xwork2/ModelDrivenAction.java | 3 +-
plugins/testng/pom.xml | 2 +-
plugins/tiles/pom.xml | 2 +-
plugins/velocity/pom.xml | 2 +-
plugins/xslt/pom.xml | 2 +-
pom.xml | 20 +-
213 files changed, 2225 insertions(+), 2854 deletions(-)
diff --cc core/pom.xml
index cfba29fad,cc71d6319..b4e8daaf7
--- a/core/pom.xml
+++ b/core/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.6.1-atlassian-2-SNAPSHOT</version>
- <version>6.7.1-SNAPSHOT</version>
++ <version>6.7.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
diff --cc core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
index b8b7617e5,e965b178f..8f6281698
--- a/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
+++ b/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
@@@ -186,9 -186,9 +186,9 @@@ public abstract class DoubleListUIBean
Form form = (Form) findAncestor(Form.class);
if (doubleId != null) {
- addParameter("doubleId", findString(doubleId));
+ addParameter("doubleId", legacySyntax ? doubleId : findString(doubleId));
} else if (form != null) {
- addParameter("doubleId", form.getParameters().get("id") + "_" + escape(doubleName != null ? findString(doubleName) : null));
+ addParameter("doubleId", form.getAttributes().get("id") + "_" + escape(doubleName != null ? findString(doubleName) : null));
} else {
addParameter("doubleId", escape(doubleName != null ? findString(doubleName) : null));
}
diff --cc core/src/main/java/org/apache/struts2/components/FormButton.java
index 7051e23a2,e028f546c..badd7076c
--- a/core/src/main/java/org/apache/struts2/components/FormButton.java
+++ b/core/src/main/java/org/apache/struts2/components/FormButton.java
@@@ -99,10 -99,10 +99,10 @@@ public abstract class FormButton extend
String tmpId = "";
if (id != null) {
// this check is needed for backwards compatibility with 2.1.x
- tmpId = findString(id);
+ tmpId = legacySyntax ? id : findString(id);
} else {
- if (form != null && form.getParameters().get("id") != null) {
- tmpId = tmpId + form.getParameters().get("id").toString() + "_";
+ if (form != null && form.getAttributes().get("id") != null) {
+ tmpId = tmpId + form.getAttributes().get("id").toString() + "_";
}
if (name != null) {
tmpId = tmpId + escape(findString(name));
diff --cc plugins/junit/pom.xml
index eea7602af,5bed4b254..74ca31c43
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.6.1-atlassian-2-SNAPSHOT</version>
- <version>6.7.1-SNAPSHOT</version>
++ <version>6.7.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
diff --cc plugins/pom.xml
index 910ad78d6,5d1e1d4f0..c86944fae
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.6.1-atlassian-2-SNAPSHOT</version>
- <version>6.7.1-SNAPSHOT</version>
++ <version>6.7.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-plugins</artifactId>
diff --cc plugins/spring/pom.xml
index 9d9074a01,aa6f5d793..a7edf859b
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.6.1-atlassian-2-SNAPSHOT</version>
- <version>6.7.1-SNAPSHOT</version>
++ <version>6.7.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
diff --cc plugins/velocity/pom.xml
index 1fecacb8e,15f81cefa..9c45ebc6b
--- a/plugins/velocity/pom.xml
+++ b/plugins/velocity/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.6.1-atlassian-2-SNAPSHOT</version>
- <version>6.7.1-SNAPSHOT</version>
++ <version>6.7.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-velocity-plugin</artifactId>
diff --cc pom.xml
index 55dba1374,6d66989ee..c1c70f163
--- a/pom.xml
+++ b/pom.xml
@@@ -29,7 -29,7 +29,7 @@@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>6.6.1-atlassian-2-SNAPSHOT</version>
- <version>6.7.1-SNAPSHOT</version>
++ <version>6.7.0-atlassian-1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>https://struts.apache.org/</url>
(struts) 11/19: CONFSRVDEV-34293 Add Bamboo build note to README
Posted by ku...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch issue-85/CONFSRVDEV-37138-merge-upstream
in repository https://gitbox.apache.org/repos/asf/struts.git
commit c2c35251a026a43dc6d8a7c7cdd993e710247153
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Thu Oct 10 12:09:02 2024 +1100
CONFSRVDEV-34293 Add Bamboo build note to README
---
README.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.md b/README.md
index 39e4e6b36..472046e22 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,8 @@
# This branch is an Atlassian fork of Apache Struts
+## Confluence DC team maintains a build for this branch. Use branch prefix `issue-85` to trigger.
+
The Apache Struts web framework
-------------------------------
(struts) 10/19: CONFSRVDEV-34293 Fix Struts 6.6 build
Posted by ku...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch issue-85/CONFSRVDEV-37138-merge-upstream
in repository https://gitbox.apache.org/repos/asf/struts.git
commit dc88606ce42378dbe4bb246d914c4c0a7a83cd1c
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Wed Oct 9 16:28:18 2024 +1100
CONFSRVDEV-34293 Fix Struts 6.6 build
---
README.md | 31 ----------------------
.../config/providers/EnvsValueSubstitutorTest.java | 8 +++---
...lConfigurationProviderEnvsSubstitutionTest.java | 2 +-
3 files changed, 5 insertions(+), 36 deletions(-)
diff --git a/README.md b/README.md
index d4ad3907a..39e4e6b36 100644
--- a/README.md
+++ b/README.md
@@ -17,37 +17,6 @@
# This branch is an Atlassian fork of Apache Struts
-# This fork/6.4 branch no longer contains Atlassian modifications and is effectively a pre-release version of Struts 6.5.
-
-## Updating this branch fork with upstream master
-
-1. Clone this repo and checkout this branch
-2. Add upstream repo as a remote: `git remote add apache https://github.com/apache/struts.git`
-3. Fetch the upstream repo: `git fetch --all`
-4. Merge upstream master into this branch, eg. `git merge apache/master`
-
-## Updating this branch fork for a new patch release
-
-1. Clone this repo and checkout this branch
-2. Add upstream repo as a remote: `git remote add apache https://github.com/apache/struts.git`
-3. Fetch the upstream tags: `git fetch --tags apache`
-4. Merge latest patch version tag into this branch, eg. `git merge STRUTS_6_4_1`
-
-## Creating a new branch fork for a new major/minor release
-
-1. Clone this repo and checkout this branch
-2. Add upstream repo as a remote: `git remote add apache https://github.com/apache/struts.git`
-3. Fetch the upstream tags: `git fetch --tags apache`
-4. Checkout a new branch from the desired tag, eg. `git checkout -b fork/6.5 STRUTS_6_5_0`
-5. Merge previous forked branch into new branch, eg. `git merge origin/fork/6.4`
-
-## Releasing a new version
-
-1. Ensure correct snapshot version, eg. `mvn versions:set -DnewVersion=6.4.0-atlassian-1-SNAPSHOT`
-2. Ensure that the `scm` and `distributionManagement` sections in `pom.xml` are consistent with previous releases
-3. Grant yourself Artifactory write permission: `atlas packages permission grant`
-4. Commence release: `mvn -B release:clean release:prepare release:perform`
-
The Apache Struts web framework
-------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/config/providers/EnvsValueSubstitutorTest.java b/core/src/test/java/com/opensymphony/xwork2/config/providers/EnvsValueSubstitutorTest.java
index a360c63ea..712a3be85 100644
--- a/core/src/test/java/com/opensymphony/xwork2/config/providers/EnvsValueSubstitutorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/config/providers/EnvsValueSubstitutorTest.java
@@ -18,12 +18,12 @@
*/
package com.opensymphony.xwork2.config.providers;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-
import org.apache.commons.lang3.SystemUtils;
import org.apache.struts2.StrutsInternalTestCase;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+
public class EnvsValueSubstitutorTest extends StrutsInternalTestCase {
private ValueSubstitutor substitutor;
@@ -37,7 +37,7 @@ public class EnvsValueSubstitutorTest extends StrutsInternalTestCase {
public void testEnvSimpleValue() {
if (SystemUtils.IS_OS_WINDOWS) {
assertThat(substitutor.substitute("${env.USERNAME}"), is(System.getenv("USERNAME")));
- } else {
+ } else if (System.getenv("USER") != null) {
assertThat(substitutor.substitute("${env.USER}"), is(System.getenv("USER")));
}
}
diff --git a/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderEnvsSubstitutionTest.java b/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderEnvsSubstitutionTest.java
index 7fb20f0de..7903e7166 100644
--- a/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderEnvsSubstitutionTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderEnvsSubstitutionTest.java
@@ -41,7 +41,7 @@ public class XmlConfigurationProviderEnvsSubstitutionTest extends ConfigurationT
if (SystemUtils.IS_OS_WINDOWS) {
user = container.getInstance(String.class, "username");
assertEquals(System.getenv("USERNAME"), user);
- } else {
+ } else if (System.getenv("USER") != null) {
user = container.getInstance(String.class, "user");
assertEquals(System.getenv("USER"), user);
}
(struts) 18/19: [maven-release-plugin] prepare for next development iteration
Posted by ku...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch issue-85/CONFSRVDEV-37138-merge-upstream
in repository https://gitbox.apache.org/repos/asf/struts.git
commit f50587ade4a721e2f8d655a9c23b176879ffde3c
Author: Automated Release Script <ba...@buildeng.atlassian.com>
AuthorDate: Mon Feb 3 03:06:29 2025 +0000
[maven-release-plugin] prepare for next development iteration
---
core/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/velocity/pom.xml | 2 +-
pom.xml | 6 +++---
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 2b301aca6..aac5d707d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.7.0-atlassian-2</version>
+ <version>6.7.0-atlassian-3-SNAPSHOT</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index c28e4c20b..78238c51c 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.7.0-atlassian-2</version>
+ <version>6.7.0-atlassian-3-SNAPSHOT</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 938273a8a..8f6ca7ddf 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.7.0-atlassian-2</version>
+ <version>6.7.0-atlassian-3-SNAPSHOT</version>
</parent>
<artifactId>struts2-plugins</artifactId>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 950f4aa4c..c27b647bf 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.7.0-atlassian-2</version>
+ <version>6.7.0-atlassian-3-SNAPSHOT</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index e2399afe7..679e4ee49 100644
--- a/plugins/velocity/pom.xml
+++ b/plugins/velocity/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.7.0-atlassian-2</version>
+ <version>6.7.0-atlassian-3-SNAPSHOT</version>
</parent>
<artifactId>struts2-velocity-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 859e2e5bf..81ef61f36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>6.7.0-atlassian-2</version>
+ <version>6.7.0-atlassian-3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>https://struts.apache.org/</url>
@@ -51,7 +51,7 @@
<connection>scm:git:ssh://git@stash.atlassian.com:7997/bam/struts2-atlassian.git</connection>
<developerConnection>scm:git:ssh://git@stash.atlassian.com:7997/bam/struts2-atlassian.git</developerConnection>
<url>https://stash.atlassian.com/projects/BAM/repos/struts2-atlassian/browse</url>
- <tag>struts2-parent-6.7.0-atlassian-2</tag>
+ <tag>HEAD</tag>
</scm>
<issueManagement>
@@ -107,7 +107,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.build.outputTimestamp>2025-02-03T03:06:03Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2025-02-03T03:06:29Z</project.build.outputTimestamp>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
(struts) 02/19: [maven-release-plugin] prepare for next development iteration
Posted by ku...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch issue-85/CONFSRVDEV-37138-merge-upstream
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 62b9871a663d6c32ad8491a82f5b50c575dfee91
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Tue Apr 23 16:46:39 2024 +1000
[maven-release-plugin] prepare for next development iteration
---
core/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/velocity/pom.xml | 2 +-
pom.xml | 6 +++---
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index f19447948..3ced5b437 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.4.0-atlassian-1</version>
+ <version>6.4.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 258c95868..5d365738b 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-atlassian-1</version>
+ <version>6.4.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index fe4932c38..755df8045 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.4.0-atlassian-1</version>
+ <version>6.4.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-plugins</artifactId>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index a08f200dd..0e5776ff4 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-atlassian-1</version>
+ <version>6.4.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index 3081be624..9484028f6 100644
--- a/plugins/velocity/pom.xml
+++ b/plugins/velocity/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-atlassian-1</version>
+ <version>6.4.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-velocity-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 439f1fe43..deefe04b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>6.4.0-atlassian-1</version>
+ <version>6.4.0-atlassian-2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>https://struts.apache.org/</url>
@@ -51,7 +51,7 @@
<connection>scm:git:ssh://git@stash.atlassian.com:7997/bam/struts2-atlassian.git</connection>
<developerConnection>scm:git:ssh://git@stash.atlassian.com:7997/bam/struts2-atlassian.git</developerConnection>
<url>https://stash.atlassian.com/projects/BAM/repos/struts2-atlassian/browse</url>
- <tag>struts2-parent-6.4.0-atlassian-1</tag>
+ <tag>HEAD</tag>
</scm>
<issueManagement>
@@ -107,7 +107,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.build.outputTimestamp>2024-04-23T06:46:09Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2024-04-23T06:46:38Z</project.build.outputTimestamp>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
(struts) 16/19: Pull request #28: CONFSRVDEV-37099 Backport of CVE-2024-53677 fix from 7.0
Posted by ku...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch issue-85/CONFSRVDEV-37138-merge-upstream
in repository https://gitbox.apache.org/repos/asf/struts.git
commit ca04a99d38054449ea5769d6f5e2181cdd729ea4
Merge: 7ee62ea6c 98348790e
Author: Kusal Kithul-Godage <kk...@atlassian.com>
AuthorDate: Mon Feb 3 03:03:09 2025 +0000
Pull request #28: CONFSRVDEV-37099 Backport of CVE-2024-53677 fix from 7.0
Merge in BAM/struts2-atlassian from issue-85/CONFSRVDEV-37099-struts-cve to release/6.7
* commit '98348790e54c3855190879a303677d248a974878':
CONFSRVDEV-37099 Backport of CVE-2024-53677 fix from 7.0
.../struts2/interceptor/FileUploadInterceptor.java | 263 -------
core/src/main/resources/struts-default.xml | 9 -
.../interceptor/FileUploadInterceptorTest.java | 806 ---------------------
3 files changed, 1078 deletions(-)
(struts) 03/19: Merge remote-tracking branch 'origin/master' into fork/6.6
Posted by ku...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch issue-85/CONFSRVDEV-37138-merge-upstream
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 9ce0a4893ab5b67434135d47f7cb4881c505ed6b
Merge: 62b9871a6 f977f0c0e
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Mon Jul 22 15:57:02 2024 +1000
Merge remote-tracking branch 'origin/master' into fork/6.6
.asf.yaml | 5 +-
.github/workflows/scorecards-analysis.yaml | 4 +-
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 +-
.../MultipleFileUploadUsingArrayAction.java | 6 +-
.../showcase/freemarker/StandardTagsAction.java | 6 +-
.../showcase/hangman/GuessCharacterAction.java | 6 +-
.../showcase/modelDriven/ModelDrivenAction.java | 4 +
.../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 +
.../apache/struts2/showcase/ConventionTest.java | 88 +++++
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 +-
.../com/opensymphony/xwork2/ActionSupport.java | 5 +
.../opensymphony/xwork2/DefaultLocaleProvider.java | 18 +-
.../com/opensymphony/xwork2/LocaleProvider.java | 16 +
.../xwork2/ValidationAwareSupport.java | 15 +-
.../xwork2/config/ConfigurationUtil.java | 13 +-
.../config/providers/EnvsValueSubstitutor.java | 4 +-
.../providers/XmlDocConfigurationProvider.java | 17 +-
.../xwork2/interceptor/ValidationAware.java | 6 +-
.../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 | 54 ++--
.../xwork2/ognl/SecurityMemberAccess.java | 103 +++++-
.../com/opensymphony/xwork2/util/DebugUtils.java} | 40 +--
.../com/opensymphony/xwork2/util/ProxyUtil.java | 33 ++
.../xwork2/validator/ActionValidatorManager.java | 4 +-
.../validator/DefaultActionValidatorManager.java | 18 +-
.../validator/DelegatingValidatorContext.java | 12 +-
.../struts2/components/ServletUrlRenderer.java | 18 +-
.../java/org/apache/struts2/components/Set.java | 12 +-
.../struts2/dispatcher/DefaultActionSupport.java | 10 +-
.../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 +-
.../parameter/ParametersInterceptor.java | 51 +--
.../org/apache/struts2/ognl/ProviderAllowlist.java | 35 +-
.../views/freemarker/FreemarkerManager.java | 26 +-
.../com/opensymphony/xwork2/ActionSupportTest.java | 7 +-
.../xwork2/DefaultLocaleProviderTest.java | 174 ++++++++++
.../opensymphony/xwork2/LocaleProviderTest.java} | 70 ++--
.../com/opensymphony/xwork2/ModelDrivenAction.java | 8 +-
.../xwork2/ModelDrivenAnnotationAction.java | 8 +-
.../opensymphony/xwork2/ProxyInvocationAction.java | 2 +
.../java/com/opensymphony/xwork2/SimpleAction.java | 26 +-
.../xwork2/SimpleAnnotationAction.java | 32 +-
.../opensymphony/xwork2/ValidationOrderAction.java | 36 ++-
.../interceptor/ModelDrivenInterceptorTest.java | 8 +-
.../ScopedModelDrivenInterceptorTest.java | 10 +
.../annotations/AllowingByDefaultAction.java | 9 +-
.../annotations/BlockingByDefaultAction.java | 9 +-
.../com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 36 ++-
.../xwork2/ognl/SecurityMemberAccessTest.java | 81 ++++-
.../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 +
.../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 | 3 +
.../validator/VisitorValidatorTestAction.java | 18 +-
.../apache/struts2/ExecutionCountTestAction.java | 3 +-
.../org/apache/struts2/HttpMethodsTestAction.java | 2 +
.../test/java/org/apache/struts2/TestAction.java | 1 +
.../struts2/interceptor/CookieInterceptorTest.java | 9 +
.../struts2/interceptor/CspInterceptorTest.java | 116 ++++++-
.../interceptor/FileUploadInterceptorTest.java | 4 +-
.../struts2/interceptor/I18nInterceptorTest.java | 20 ++
.../exec/StrutsBackgroundProcessTest.java | 60 +++-
.../parameter/ParametersInterceptorTest.java | 61 ++--
.../apache/struts2/ognl/ProviderAllowlistTest.java | 27 +-
.../struts2/url/StrutsQueryStringParserTest.java | 8 +
.../views/jsp/IteratorGeneratorTagTest.java | 13 +-
.../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 | 36 +++
.../views/jsp/ui/DoubleValidationAction.java | 2 +
.../struts2/views/jsp/ui/FieldErrorTagTest.java | 13 +-
.../struts2/views/jsp/ui/IntValidationAction.java | 2 +
.../VisitorValidatorTestAction-validation.xml | 8 +
plugins/async/pom.xml | 2 +-
plugins/bean-validation/pom.xml | 2 +-
.../struts/beanvalidation/actions/FieldAction.java | 2 +
.../beanvalidation/actions/FieldMatchAction.java | 5 +
.../beanvalidation/actions/ModelDrivenAction.java | 5 +-
.../actions/ValidateGroupAction.java | 7 +-
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 | 52 ++-
plugins/dwr/pom.xml | 2 +-
plugins/embeddedjsp/pom.xml | 2 +-
plugins/gxp/pom.xml | 2 +-
plugins/jasperreports/pom.xml | 4 +-
plugins/javatemplates/pom.xml | 2 +-
plugins/jfreechart/pom.xml | 2 +-
plugins/json/pom.xml | 2 +-
.../json/JSONValidationInterceptorTest.java | 5 +
plugins/junit/pom.xml | 2 +-
.../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 +-
.../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 +-
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 +-
plugins/rest/pom.xml | 2 +-
.../struts2/rest/RestActionInvocationTest.java | 65 ++--
plugins/sitemesh/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
.../com/opensymphony/xwork2/ModelDrivenAction.java | 8 +-
.../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 +++
.../org/apache/tiles/core/config/tiles_defs1.xml | 75 +++++
plugins/velocity/pom.xml | 2 +-
plugins/xslt/pom.xml | 2 +-
pom.xml | 47 +--
224 files changed, 2552 insertions(+), 1002 deletions(-)
diff --cc core/pom.xml
index 3ced5b437,e3d9d5d28..23c48639e
--- a/core/pom.xml
+++ b/core/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.4.0-atlassian-2-SNAPSHOT</version>
- <version>6.7.0-SNAPSHOT</version>
++ <version>6.6.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
diff --cc plugins/junit/pom.xml
index 5d365738b,f30858ced..141f48381
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-atlassian-2-SNAPSHOT</version>
- <version>6.7.0-SNAPSHOT</version>
++ <version>6.6.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
diff --cc plugins/pom.xml
index 755df8045,f03266978..bcbb010c5
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.4.0-atlassian-2-SNAPSHOT</version>
- <version>6.7.0-SNAPSHOT</version>
++ <version>6.6.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-plugins</artifactId>
diff --cc plugins/spring/pom.xml
index 0e5776ff4,c42df09f4..451eaa989
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-atlassian-2-SNAPSHOT</version>
- <version>6.7.0-SNAPSHOT</version>
++ <version>6.6.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
diff --cc plugins/velocity/pom.xml
index 9484028f6,34299d922..d7219d731
--- a/plugins/velocity/pom.xml
+++ b/plugins/velocity/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-atlassian-2-SNAPSHOT</version>
- <version>6.7.0-SNAPSHOT</version>
++ <version>6.6.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-velocity-plugin</artifactId>
diff --cc pom.xml
index deefe04b9,123210039..332afb450
--- a/pom.xml
+++ b/pom.xml
@@@ -29,7 -29,7 +29,7 @@@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>6.4.0-atlassian-2-SNAPSHOT</version>
- <version>6.7.0-SNAPSHOT</version>
++ <version>6.6.0-atlassian-1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>https://struts.apache.org/</url>
(struts) 19/19: Merge remote-tracking branch 'origin/release/struts-6-7-x' into issue-85/CONFSRVDEV-37138-merge-upstream
Posted by ku...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch issue-85/CONFSRVDEV-37138-merge-upstream
in repository https://gitbox.apache.org/repos/asf/struts.git
commit df5ad6914e7ba19c0ccad853076508e90e807e72
Merge: f50587ade 7a77c7a82
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Wed Feb 5 10:52:02 2025 +1100
Merge remote-tracking branch 'origin/release/struts-6-7-x' into issue-85/CONFSRVDEV-37138-merge-upstream
.asf.yaml | 12 +-
Jenkinsfile | 65 ++--------
apps/pom.xml | 2 +-
apps/rest-showcase/pom.xml | 4 +-
apps/showcase/pom.xml | 2 +-
assembly/pom.xml | 2 +-
bom/pom.xml | 8 +-
bundles/admin/pom.xml | 2 +-
bundles/demo/pom.xml | 2 +-
bundles/pom.xml | 2 +-
core/pom.xml | 2 +-
.../opensymphony/xwork2/inject/ContainerImpl.java | 54 +++++++-
.../security/DefaultExcludedPatternsChecker.java | 1 +
.../com/opensymphony/xwork2/util/DebugUtils.java | 2 +-
.../apache/struts2/components/ActionComponent.java | 4 +-
.../org/apache/struts2/components/Component.java | 20 +--
.../java/org/apache/struts2/components/Form.java | 2 +-
.../org/apache/struts2/components/Include.java | 9 +-
.../java/org/apache/struts2/components/Label.java | 4 +-
.../org/apache/struts2/components/ListUIBean.java | 2 +-
.../struts2/components/ServletUrlRenderer.java | 2 +-
.../java/org/apache/struts2/components/UIBean.java | 40 ++++--
.../java/org/apache/struts2/components/URL.java | 2 +-
.../apache/struts2/dispatcher/AttributeMap.java | 2 +-
.../org/apache/struts2/dispatcher/Dispatcher.java | 2 +-
.../multipart/AbstractMultiPartRequest.java | 33 ++++-
.../multipart/JakartaMultiPartRequest.java | 38 +++++-
.../multipart/JakartaStreamMultiPartRequest.java | 38 +++++-
.../org/apache/struts2/views/jsp/TagUtils.java | 6 +-
.../src/main/resources/struts-excluded-classes.xml | 11 ++
.../xwork2/inject/ContainerImplTest.java | 142 +++++++++++++++++----
.../DefaultExcludedPatternsCheckerTest.java | 2 +-
.../opensymphony/xwork2/test/StrutsUtilBean.java} | 37 +++---
.../apache/struts2/components/UIBeanTagTest.java | 88 +++++++++++++
.../struts2/dispatcher/AttributeMapTest.java | 24 +++-
.../apache/struts2/dispatcher/DispatcherTest.java | 3 +
.../ActionFileUploadInterceptorTest.java | 69 +++++++++-
.../parameter/ParametersInterceptorTest.java | 10 +-
.../org/apache/struts2/util/StrutsUtilTest.java | 53 ++------
plugins/async/pom.xml | 2 +-
plugins/bean-validation/pom.xml | 2 +-
plugins/cdi/pom.xml | 2 +-
plugins/config-browser/pom.xml | 2 +-
plugins/convention/pom.xml | 2 +-
plugins/dwr/pom.xml | 2 +-
plugins/embeddedjsp/pom.xml | 2 +-
plugins/gxp/pom.xml | 2 +-
plugins/jasperreports/pom.xml | 2 +-
plugins/javatemplates/pom.xml | 2 +-
plugins/jfreechart/pom.xml | 2 +-
plugins/json/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/osgi/pom.xml | 2 +-
plugins/oval/pom.xml | 2 +-
plugins/pell-multipart/pom.xml | 2 +-
.../dispatcher/multipart/PellMultiPartRequest.java | 7 +
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 +-
plugins/rest/pom.xml | 2 +-
plugins/sitemesh/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/testng/pom.xml | 2 +-
plugins/tiles/pom.xml | 2 +-
plugins/velocity/pom.xml | 2 +-
plugins/xslt/pom.xml | 2 +-
pom.xml | 4 +-
70 files changed, 626 insertions(+), 246 deletions(-)
diff --cc core/pom.xml
index aac5d707d,048acd258..73387ae1e
--- a/core/pom.xml
+++ b/core/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.7.0-atlassian-3-SNAPSHOT</version>
- <version>6.7.3-SNAPSHOT</version>
++ <version>6.7.2-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
diff --cc plugins/junit/pom.xml
index 78238c51c,b8d915ade..cf955907e
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.7.0-atlassian-3-SNAPSHOT</version>
- <version>6.7.3-SNAPSHOT</version>
++ <version>6.7.2-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
diff --cc plugins/pom.xml
index 8f6ca7ddf,652db777e..b88992ea0
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.7.0-atlassian-3-SNAPSHOT</version>
- <version>6.7.3-SNAPSHOT</version>
++ <version>6.7.2-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-plugins</artifactId>
diff --cc plugins/spring/pom.xml
index c27b647bf,481fbab32..6a720e303
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.7.0-atlassian-3-SNAPSHOT</version>
- <version>6.7.3-SNAPSHOT</version>
++ <version>6.7.2-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
diff --cc plugins/velocity/pom.xml
index 679e4ee49,373961462..f1fe4346b
--- a/plugins/velocity/pom.xml
+++ b/plugins/velocity/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.7.0-atlassian-3-SNAPSHOT</version>
- <version>6.7.3-SNAPSHOT</version>
++ <version>6.7.2-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-velocity-plugin</artifactId>
diff --cc pom.xml
index 81ef61f36,d0c506711..b2af7bba9
--- a/pom.xml
+++ b/pom.xml
@@@ -29,7 -29,7 +29,7 @@@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>6.7.0-atlassian-3-SNAPSHOT</version>
- <version>6.7.3-SNAPSHOT</version>
++ <version>6.7.2-atlassian-1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>https://struts.apache.org/</url>
(struts) 17/19: [maven-release-plugin] prepare release struts2-parent-6.7.0-atlassian-2
Posted by ku...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch issue-85/CONFSRVDEV-37138-merge-upstream
in repository https://gitbox.apache.org/repos/asf/struts.git
commit ec1a70e5621d11d20dd6e751263aa0b9cc7ce996
Author: Automated Release Script <ba...@buildeng.atlassian.com>
AuthorDate: Mon Feb 3 03:06:27 2025 +0000
[maven-release-plugin] prepare release struts2-parent-6.7.0-atlassian-2
---
core/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/velocity/pom.xml | 2 +-
pom.xml | 6 +++---
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 6dae9212f..2b301aca6 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.7.0-atlassian-2-SNAPSHOT</version>
+ <version>6.7.0-atlassian-2</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 6bbe84814..c28e4c20b 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.7.0-atlassian-2-SNAPSHOT</version>
+ <version>6.7.0-atlassian-2</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 8309a154f..938273a8a 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.7.0-atlassian-2-SNAPSHOT</version>
+ <version>6.7.0-atlassian-2</version>
</parent>
<artifactId>struts2-plugins</artifactId>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index a819396a0..950f4aa4c 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.7.0-atlassian-2-SNAPSHOT</version>
+ <version>6.7.0-atlassian-2</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index d8d738e37..e2399afe7 100644
--- a/plugins/velocity/pom.xml
+++ b/plugins/velocity/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.7.0-atlassian-2-SNAPSHOT</version>
+ <version>6.7.0-atlassian-2</version>
</parent>
<artifactId>struts2-velocity-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index ed52b98d4..859e2e5bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>6.7.0-atlassian-2-SNAPSHOT</version>
+ <version>6.7.0-atlassian-2</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>https://struts.apache.org/</url>
@@ -51,7 +51,7 @@
<connection>scm:git:ssh://git@stash.atlassian.com:7997/bam/struts2-atlassian.git</connection>
<developerConnection>scm:git:ssh://git@stash.atlassian.com:7997/bam/struts2-atlassian.git</developerConnection>
<url>https://stash.atlassian.com/projects/BAM/repos/struts2-atlassian/browse</url>
- <tag>HEAD</tag>
+ <tag>struts2-parent-6.7.0-atlassian-2</tag>
</scm>
<issueManagement>
@@ -107,7 +107,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.build.outputTimestamp>2024-11-18T06:28:56Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2025-02-03T03:06:03Z</project.build.outputTimestamp>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
(struts) 14/19: [maven-release-plugin] prepare for next development iteration
Posted by ku...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch issue-85/CONFSRVDEV-37138-merge-upstream
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 7ee62ea6cd254fda9b3529ac605504d774563c6d
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Mon Nov 18 17:28:56 2024 +1100
[maven-release-plugin] prepare for next development iteration
---
core/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/velocity/pom.xml | 2 +-
pom.xml | 6 +++---
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 7654e329d..6dae9212f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.7.0-atlassian-1</version>
+ <version>6.7.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 3054f3547..6bbe84814 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.7.0-atlassian-1</version>
+ <version>6.7.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 5a43c5827..8309a154f 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.7.0-atlassian-1</version>
+ <version>6.7.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-plugins</artifactId>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 1b8d50ec7..a819396a0 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.7.0-atlassian-1</version>
+ <version>6.7.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index 7735505c9..d8d738e37 100644
--- a/plugins/velocity/pom.xml
+++ b/plugins/velocity/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.7.0-atlassian-1</version>
+ <version>6.7.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-velocity-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index ba3252044..ed52b98d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>6.7.0-atlassian-1</version>
+ <version>6.7.0-atlassian-2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>https://struts.apache.org/</url>
@@ -51,7 +51,7 @@
<connection>scm:git:ssh://git@stash.atlassian.com:7997/bam/struts2-atlassian.git</connection>
<developerConnection>scm:git:ssh://git@stash.atlassian.com:7997/bam/struts2-atlassian.git</developerConnection>
<url>https://stash.atlassian.com/projects/BAM/repos/struts2-atlassian/browse</url>
- <tag>struts2-parent-6.7.0-atlassian-1</tag>
+ <tag>HEAD</tag>
</scm>
<issueManagement>
@@ -107,7 +107,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.build.outputTimestamp>2024-11-18T06:28:35Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2024-11-18T06:28:56Z</project.build.outputTimestamp>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
(struts) 04/19: [maven-release-plugin] prepare release struts2-parent-6.6.0-atlassian-1
Posted by ku...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch issue-85/CONFSRVDEV-37138-merge-upstream
in repository https://gitbox.apache.org/repos/asf/struts.git
commit b1a8797c9a8629bfc0cf481c15c0b05d89bd8be7
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Mon Jul 22 16:07:07 2024 +1000
[maven-release-plugin] prepare release struts2-parent-6.6.0-atlassian-1
---
core/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/velocity/pom.xml | 2 +-
pom.xml | 6 +++---
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 23c48639e..709ee5fa4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.6.0-atlassian-1-SNAPSHOT</version>
+ <version>6.6.0-atlassian-1</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 141f48381..f700c0ae9 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.6.0-atlassian-1-SNAPSHOT</version>
+ <version>6.6.0-atlassian-1</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index bcbb010c5..0a6de8326 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.6.0-atlassian-1-SNAPSHOT</version>
+ <version>6.6.0-atlassian-1</version>
</parent>
<artifactId>struts2-plugins</artifactId>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 451eaa989..7f4a0e60e 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.6.0-atlassian-1-SNAPSHOT</version>
+ <version>6.6.0-atlassian-1</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index d7219d731..48fd6a3a4 100644
--- a/plugins/velocity/pom.xml
+++ b/plugins/velocity/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.6.0-atlassian-1-SNAPSHOT</version>
+ <version>6.6.0-atlassian-1</version>
</parent>
<artifactId>struts2-velocity-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 332afb450..6d25879b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>6.6.0-atlassian-1-SNAPSHOT</version>
+ <version>6.6.0-atlassian-1</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>https://struts.apache.org/</url>
@@ -51,7 +51,7 @@
<connection>scm:git:ssh://git@stash.atlassian.com:7997/bam/struts2-atlassian.git</connection>
<developerConnection>scm:git:ssh://git@stash.atlassian.com:7997/bam/struts2-atlassian.git</developerConnection>
<url>https://stash.atlassian.com/projects/BAM/repos/struts2-atlassian/browse</url>
- <tag>HEAD</tag>
+ <tag>struts2-parent-6.6.0-atlassian-1</tag>
</scm>
<issueManagement>
@@ -107,7 +107,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.build.outputTimestamp>2024-07-20T06:28:46Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2024-07-22T06:06:34Z</project.build.outputTimestamp>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
(struts) 07/19: Update SNAPSHOT version
Posted by ku...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch issue-85/CONFSRVDEV-37138-merge-upstream
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 7113ff8f56163c5b4cf6c2cc2b1304aa6fe4f171
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Tue Oct 8 16:35:38 2024 +1100
Update SNAPSHOT version
---
core/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/velocity/pom.xml | 2 +-
pom.xml | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 23f4f925b..46946ec6e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.6.0-atlassian-2-SNAPSHOT</version>
+ <version>6.6.1-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 47466089d..d0abb9b73 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.6.0-atlassian-2-SNAPSHOT</version>
+ <version>6.6.1-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 08dc65788..0189e693c 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.6.0-atlassian-2-SNAPSHOT</version>
+ <version>6.6.1-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-plugins</artifactId>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index cb009b588..c4b73c1b6 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.6.0-atlassian-2-SNAPSHOT</version>
+ <version>6.6.1-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index 6b5886e45..3a5849da5 100644
--- a/plugins/velocity/pom.xml
+++ b/plugins/velocity/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.6.0-atlassian-2-SNAPSHOT</version>
+ <version>6.6.1-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-velocity-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index f4e2ce028..9b4b69b10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>6.6.0-atlassian-2-SNAPSHOT</version>
+ <version>6.6.1-atlassian-1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>https://struts.apache.org/</url>
(struts) 08/19: [maven-release-plugin] prepare release struts2-parent-6.6.1-atlassian-1
Posted by ku...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch issue-85/CONFSRVDEV-37138-merge-upstream
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 90fa39363c04f8a0f9488557d05de413975d20dd
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Tue Oct 8 16:40:32 2024 +1100
[maven-release-plugin] prepare release struts2-parent-6.6.1-atlassian-1
---
core/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/velocity/pom.xml | 2 +-
pom.xml | 6 +++---
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 46946ec6e..e866b88a3 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.6.1-atlassian-1-SNAPSHOT</version>
+ <version>6.6.1-atlassian-1</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index d0abb9b73..ddd448337 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.6.1-atlassian-1-SNAPSHOT</version>
+ <version>6.6.1-atlassian-1</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 0189e693c..28787608d 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.6.1-atlassian-1-SNAPSHOT</version>
+ <version>6.6.1-atlassian-1</version>
</parent>
<artifactId>struts2-plugins</artifactId>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index c4b73c1b6..ee9e64a44 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.6.1-atlassian-1-SNAPSHOT</version>
+ <version>6.6.1-atlassian-1</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index 3a5849da5..c6da025ed 100644
--- a/plugins/velocity/pom.xml
+++ b/plugins/velocity/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.6.1-atlassian-1-SNAPSHOT</version>
+ <version>6.6.1-atlassian-1</version>
</parent>
<artifactId>struts2-velocity-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 9b4b69b10..e71cd7d7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>6.6.1-atlassian-1-SNAPSHOT</version>
+ <version>6.6.1-atlassian-1</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>https://struts.apache.org/</url>
@@ -51,7 +51,7 @@
<connection>scm:git:ssh://git@stash.atlassian.com:7997/bam/struts2-atlassian.git</connection>
<developerConnection>scm:git:ssh://git@stash.atlassian.com:7997/bam/struts2-atlassian.git</developerConnection>
<url>https://stash.atlassian.com/projects/BAM/repos/struts2-atlassian/browse</url>
- <tag>HEAD</tag>
+ <tag>struts2-parent-6.6.1-atlassian-1</tag>
</scm>
<issueManagement>
@@ -107,7 +107,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.build.outputTimestamp>2024-10-05T14:08:38Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2024-10-08T05:40:11Z</project.build.outputTimestamp>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
(struts) 09/19: [maven-release-plugin] prepare for next development iteration
Posted by ku...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch issue-85/CONFSRVDEV-37138-merge-upstream
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 7969e5932d6650a433f99e15909944dbd41f72dd
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Tue Oct 8 16:40:38 2024 +1100
[maven-release-plugin] prepare for next development iteration
---
core/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/velocity/pom.xml | 2 +-
pom.xml | 6 +++---
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index e866b88a3..cfba29fad 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.6.1-atlassian-1</version>
+ <version>6.6.1-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index ddd448337..eea7602af 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.6.1-atlassian-1</version>
+ <version>6.6.1-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 28787608d..910ad78d6 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.6.1-atlassian-1</version>
+ <version>6.6.1-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-plugins</artifactId>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index ee9e64a44..9d9074a01 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.6.1-atlassian-1</version>
+ <version>6.6.1-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index c6da025ed..1fecacb8e 100644
--- a/plugins/velocity/pom.xml
+++ b/plugins/velocity/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.6.1-atlassian-1</version>
+ <version>6.6.1-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-velocity-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index e71cd7d7c..55dba1374 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>6.6.1-atlassian-1</version>
+ <version>6.6.1-atlassian-2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>https://struts.apache.org/</url>
@@ -51,7 +51,7 @@
<connection>scm:git:ssh://git@stash.atlassian.com:7997/bam/struts2-atlassian.git</connection>
<developerConnection>scm:git:ssh://git@stash.atlassian.com:7997/bam/struts2-atlassian.git</developerConnection>
<url>https://stash.atlassian.com/projects/BAM/repos/struts2-atlassian/browse</url>
- <tag>struts2-parent-6.6.1-atlassian-1</tag>
+ <tag>HEAD</tag>
</scm>
<issueManagement>
@@ -107,7 +107,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.build.outputTimestamp>2024-10-08T05:40:11Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2024-10-08T05:40:38Z</project.build.outputTimestamp>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>