(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) 03/19: Merge remote-tracking branch 'origin/master' into fork/6.6
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
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/
(struts) 08/19: [maven-release-plugin] prepare release struts2-parent-6.6.1-atlassian-1
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 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 @@ org.apache.struts struts2-parent -6.6.1-atlassian-1-SNAPSHOT +6.6.1-atlassian-1 struts2-core jar 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 @@ org.apache.struts struts2-plugins -6.6.1-atlassian-1-SNAPSHOT +6.6.1-atlassian-1 struts2-junit-plugin 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 @@ org.apache.struts struts2-parent -6.6.1-atlassian-1-SNAPSHOT +6.6.1-atlassian-1 struts2-plugins 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 @@ org.apache.struts struts2-plugins -6.6.1-atlassian-1-SNAPSHOT +6.6.1-atlassian-1 struts2-spring-plugin 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 @@ org.apache.struts struts2-plugins -6.6.1-atlassian-1-SNAPSHOT +6.6.1-atlassian-1 struts2-velocity-plugin diff --git a/pom.xml b/pom.xml index 9b4b69b10..e71cd7d7c 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 4.0.0 struts2-parent -6.6.1-atlassian-1-SNAPSHOT +6.6.1-atlassian-1 pom Struts 2 https://struts.apache.org/ @@ -51,7 +51,7 @@ scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git https://stash.atlassian.com/projects/BAM/repos/struts2-atlassian/browse -HEAD +struts2-parent-6.6.1-atlassian-1 @@ -107,7 +107,7 @@ UTF-8 - 2024-10-05T14:08:38Z + 2024-10-08T05:40:11Z 1.8 1.8
(struts) 12/19: Merge remote-tracking branch 'origin/master' into release/6.7
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 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/F
(struts) 16/19: Pull request #28: CONFSRVDEV-37099 Backport of CVE-2024-53677 fix from 7.0
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 AuthorDate: Mon Feb 3 03:03:09 2025 + 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) 10/19: CONFSRVDEV-34293 Fix Struts 6.6 build
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
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
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 AuthorDate: Mon Feb 3 03:06:29 2025 + [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 @@ org.apache.struts struts2-parent -6.7.0-atlassian-2 +6.7.0-atlassian-3-SNAPSHOT struts2-core jar 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 @@ org.apache.struts struts2-plugins -6.7.0-atlassian-2 +6.7.0-atlassian-3-SNAPSHOT struts2-junit-plugin 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 @@ org.apache.struts struts2-parent -6.7.0-atlassian-2 +6.7.0-atlassian-3-SNAPSHOT struts2-plugins 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 @@ org.apache.struts struts2-plugins -6.7.0-atlassian-2 +6.7.0-atlassian-3-SNAPSHOT struts2-spring-plugin 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 @@ org.apache.struts struts2-plugins -6.7.0-atlassian-2 +6.7.0-atlassian-3-SNAPSHOT struts2-velocity-plugin diff --git a/pom.xml b/pom.xml index 859e2e5bf..81ef61f36 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 4.0.0 struts2-parent -6.7.0-atlassian-2 +6.7.0-atlassian-3-SNAPSHOT pom Struts 2 https://struts.apache.org/ @@ -51,7 +51,7 @@ scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git https://stash.atlassian.com/projects/BAM/repos/struts2-atlassian/browse -struts2-parent-6.7.0-atlassian-2 +HEAD @@ -107,7 +107,7 @@ UTF-8 - 2025-02-03T03:06:03Z + 2025-02-03T03:06:29Z 1.8 1.8
(struts) 19/19: Merge remote-tracking branch 'origin/release/struts-6-7-x' into issue-85/CONFSRVDEV-37138-merge-upstream
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 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 @@@
(struts) 14/19: [maven-release-plugin] prepare for next development iteration
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 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 @@ org.apache.struts struts2-parent -6.7.0-atlassian-1 +6.7.0-atlassian-2-SNAPSHOT struts2-core jar 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 @@ org.apache.struts struts2-plugins -6.7.0-atlassian-1 +6.7.0-atlassian-2-SNAPSHOT struts2-junit-plugin 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 @@ org.apache.struts struts2-parent -6.7.0-atlassian-1 +6.7.0-atlassian-2-SNAPSHOT struts2-plugins 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 @@ org.apache.struts struts2-plugins -6.7.0-atlassian-1 +6.7.0-atlassian-2-SNAPSHOT struts2-spring-plugin 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 @@ org.apache.struts struts2-plugins -6.7.0-atlassian-1 +6.7.0-atlassian-2-SNAPSHOT struts2-velocity-plugin diff --git a/pom.xml b/pom.xml index ba3252044..ed52b98d4 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 4.0.0 struts2-parent -6.7.0-atlassian-1 +6.7.0-atlassian-2-SNAPSHOT pom Struts 2 https://struts.apache.org/ @@ -51,7 +51,7 @@ scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git https://stash.atlassian.com/projects/BAM/repos/struts2-atlassian/browse -struts2-parent-6.7.0-atlassian-1 +HEAD @@ -107,7 +107,7 @@ UTF-8 - 2024-11-18T06:28:35Z + 2024-11-18T06:28:56Z 1.8 1.8
(struts) 13/19: [maven-release-plugin] prepare release struts2-parent-6.7.0-atlassian-1
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 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 @@ org.apache.struts struts2-parent -6.7.0-atlassian-1-SNAPSHOT +6.7.0-atlassian-1 struts2-core jar 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 @@ org.apache.struts struts2-plugins -6.7.0-atlassian-1-SNAPSHOT +6.7.0-atlassian-1 struts2-junit-plugin 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 @@ org.apache.struts struts2-parent -6.7.0-atlassian-1-SNAPSHOT +6.7.0-atlassian-1 struts2-plugins 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 @@ org.apache.struts struts2-plugins -6.7.0-atlassian-1-SNAPSHOT +6.7.0-atlassian-1 struts2-spring-plugin 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 @@ org.apache.struts struts2-plugins -6.7.0-atlassian-1-SNAPSHOT +6.7.0-atlassian-1 struts2-velocity-plugin diff --git a/pom.xml b/pom.xml index c1c70f163..ba3252044 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 4.0.0 struts2-parent -6.7.0-atlassian-1-SNAPSHOT +6.7.0-atlassian-1 pom Struts 2 https://struts.apache.org/ @@ -51,7 +51,7 @@ scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git https://stash.atlassian.com/projects/BAM/repos/struts2-atlassian/browse -HEAD +struts2-parent-6.7.0-atlassian-1 @@ -107,7 +107,7 @@ UTF-8 - 2024-11-17T09:57:20Z + 2024-11-18T06:28:35Z 1.8 1.8
(struts) 04/19: [maven-release-plugin] prepare release struts2-parent-6.6.0-atlassian-1
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 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 @@ org.apache.struts struts2-parent -6.6.0-atlassian-1-SNAPSHOT +6.6.0-atlassian-1 struts2-core jar 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 @@ org.apache.struts struts2-plugins -6.6.0-atlassian-1-SNAPSHOT +6.6.0-atlassian-1 struts2-junit-plugin 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 @@ org.apache.struts struts2-parent -6.6.0-atlassian-1-SNAPSHOT +6.6.0-atlassian-1 struts2-plugins 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 @@ org.apache.struts struts2-plugins -6.6.0-atlassian-1-SNAPSHOT +6.6.0-atlassian-1 struts2-spring-plugin 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 @@ org.apache.struts struts2-plugins -6.6.0-atlassian-1-SNAPSHOT +6.6.0-atlassian-1 struts2-velocity-plugin diff --git a/pom.xml b/pom.xml index 332afb450..6d25879b9 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 4.0.0 struts2-parent -6.6.0-atlassian-1-SNAPSHOT +6.6.0-atlassian-1 pom Struts 2 https://struts.apache.org/ @@ -51,7 +51,7 @@ scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git https://stash.atlassian.com/projects/BAM/repos/struts2-atlassian/browse -HEAD +struts2-parent-6.6.0-atlassian-1 @@ -107,7 +107,7 @@ UTF-8 - 2024-07-20T06:28:46Z + 2024-07-22T06:06:34Z 1.8 1.8
(struts) 06/19: Merge remote-tracking branch 'origin/master' into fork/6.6
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 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 @@@ org.apache.maven.plugins maven-release-plugin - 3.0.1 + 3.1.1 + +-Dmaven.test.skip -Dgpg.skip + maven-jar-plugin
(struts) 17/19: [maven-release-plugin] prepare release struts2-parent-6.7.0-atlassian-2
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 AuthorDate: Mon Feb 3 03:06:27 2025 + [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 @@ org.apache.struts struts2-parent -6.7.0-atlassian-2-SNAPSHOT +6.7.0-atlassian-2 struts2-core jar 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 @@ org.apache.struts struts2-plugins -6.7.0-atlassian-2-SNAPSHOT +6.7.0-atlassian-2 struts2-junit-plugin 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 @@ org.apache.struts struts2-parent -6.7.0-atlassian-2-SNAPSHOT +6.7.0-atlassian-2 struts2-plugins 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 @@ org.apache.struts struts2-plugins -6.7.0-atlassian-2-SNAPSHOT +6.7.0-atlassian-2 struts2-spring-plugin 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 @@ org.apache.struts struts2-plugins -6.7.0-atlassian-2-SNAPSHOT +6.7.0-atlassian-2 struts2-velocity-plugin diff --git a/pom.xml b/pom.xml index ed52b98d4..859e2e5bf 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 4.0.0 struts2-parent -6.7.0-atlassian-2-SNAPSHOT +6.7.0-atlassian-2 pom Struts 2 https://struts.apache.org/ @@ -51,7 +51,7 @@ scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git https://stash.atlassian.com/projects/BAM/repos/struts2-atlassian/browse -HEAD +struts2-parent-6.7.0-atlassian-2 @@ -107,7 +107,7 @@ UTF-8 - 2024-11-18T06:28:56Z + 2025-02-03T03:06:03Z 1.8 1.8
(struts) 07/19: Update SNAPSHOT version
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 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 @@ org.apache.struts struts2-parent -6.6.0-atlassian-2-SNAPSHOT +6.6.1-atlassian-1-SNAPSHOT struts2-core jar 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 @@ org.apache.struts struts2-plugins -6.6.0-atlassian-2-SNAPSHOT +6.6.1-atlassian-1-SNAPSHOT struts2-junit-plugin 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 @@ org.apache.struts struts2-parent -6.6.0-atlassian-2-SNAPSHOT +6.6.1-atlassian-1-SNAPSHOT struts2-plugins 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 @@ org.apache.struts struts2-plugins -6.6.0-atlassian-2-SNAPSHOT +6.6.1-atlassian-1-SNAPSHOT struts2-spring-plugin 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 @@ org.apache.struts struts2-plugins -6.6.0-atlassian-2-SNAPSHOT +6.6.1-atlassian-1-SNAPSHOT struts2-velocity-plugin diff --git a/pom.xml b/pom.xml index f4e2ce028..9b4b69b10 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 4.0.0 struts2-parent -6.6.0-atlassian-2-SNAPSHOT +6.6.1-atlassian-1-SNAPSHOT pom Struts 2 https://struts.apache.org/
(struts) 11/19: CONFSRVDEV-34293 Add Bamboo build note to README
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 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) branch issue-85/CONFSRVDEV-37138-merge-upstream deleted (was 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 was df5ad6914 Merge remote-tracking branch 'origin/release/struts-6-7-x' into issue-85/CONFSRVDEV-37138-merge-upstream This change permanently discards the following revisions: discard df5ad6914 Merge remote-tracking branch 'origin/release/struts-6-7-x' into issue-85/CONFSRVDEV-37138-merge-upstream discard f50587ade [maven-release-plugin] prepare for next development iteration discard ec1a70e56 [maven-release-plugin] prepare release struts2-parent-6.7.0-atlassian-2 discard ca04a99d3 Pull request #28: CONFSRVDEV-37099 Backport of CVE-2024-53677 fix from 7.0 discard 98348790e CONFSRVDEV-37099 Backport of CVE-2024-53677 fix from 7.0 discard 7ee62ea6c [maven-release-plugin] prepare for next development iteration discard 28cc851ab [maven-release-plugin] prepare release struts2-parent-6.7.0-atlassian-1 discard 7fa08d053 Merge remote-tracking branch 'origin/master' into release/6.7 discard c2c35251a CONFSRVDEV-34293 Add Bamboo build note to README discard dc88606ce CONFSRVDEV-34293 Fix Struts 6.6 build discard 7969e5932 [maven-release-plugin] prepare for next development iteration discard 90fa39363 [maven-release-plugin] prepare release struts2-parent-6.6.1-atlassian-1 discard 7113ff8f5 Update SNAPSHOT version discard 91ef86894 Merge remote-tracking branch 'origin/master' into fork/6.6 discard 183352bc4 [maven-release-plugin] prepare for next development iteration discard b1a8797c9 [maven-release-plugin] prepare release struts2-parent-6.6.0-atlassian-1 discard 9ce0a4893 Merge remote-tracking branch 'origin/master' into fork/6.6 discard 62b9871a6 [maven-release-plugin] prepare for next development iteration discard 5e7c00afb [maven-release-plugin] prepare release struts2-parent-6.4.0-atlassian-1
(struts) branch fix/WW-5468-modeldriven-kusal deleted (was f67f593bd)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch fix/WW-5468-modeldriven-kusal in repository https://gitbox.apache.org/repos/asf/struts.git was f67f593bd WW-5468 Alternate fix for ModelDriven Action parameters This change permanently discards the following revisions: discard f67f593bd WW-5468 Alternate fix for ModelDriven Action parameters discard 2e352d1b7 Tmp revert
(struts) 01/19: [maven-release-plugin] prepare release struts2-parent-6.4.0-atlassian-1
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 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 @@ org.apache.struts struts2-parent -6.4.0-atlassian-1-SNAPSHOT +6.4.0-atlassian-1 struts2-core jar 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 @@ org.apache.struts struts2-plugins -6.4.0-atlassian-1-SNAPSHOT +6.4.0-atlassian-1 struts2-junit-plugin 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 @@ org.apache.struts struts2-parent -6.4.0-atlassian-1-SNAPSHOT +6.4.0-atlassian-1 struts2-plugins 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 @@ org.apache.struts struts2-plugins -6.4.0-atlassian-1-SNAPSHOT +6.4.0-atlassian-1 struts2-spring-plugin 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 @@ org.apache.struts struts2-plugins -6.4.0-atlassian-1-SNAPSHOT +6.4.0-atlassian-1 struts2-velocity-plugin diff --git a/pom.xml b/pom.xml index 53d90d889..439f1fe43 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 4.0.0 struts2-parent -6.4.0-atlassian-1-SNAPSHOT +6.4.0-atlassian-1 pom Struts 2 https://struts.apache.org/ @@ -51,7 +51,7 @@ scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git https://stash.atlassian.com/projects/BAM/repos/struts2-atlassian/browse -HEAD +struts2-parent-6.4.0-atlassian-1 @@ -107,7 +107,7 @@ UTF-8 - 2024-04-12T07:47:44Z + 2024-04-23T06:46:09Z 1.8 1.8
(struts) 02/19: [maven-release-plugin] prepare for next development iteration
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 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 @@ org.apache.struts struts2-parent -6.4.0-atlassian-1 +6.4.0-atlassian-2-SNAPSHOT struts2-core jar 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 @@ org.apache.struts struts2-plugins -6.4.0-atlassian-1 +6.4.0-atlassian-2-SNAPSHOT struts2-junit-plugin 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 @@ org.apache.struts struts2-parent -6.4.0-atlassian-1 +6.4.0-atlassian-2-SNAPSHOT struts2-plugins 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 @@ org.apache.struts struts2-plugins -6.4.0-atlassian-1 +6.4.0-atlassian-2-SNAPSHOT struts2-spring-plugin 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 @@ org.apache.struts struts2-plugins -6.4.0-atlassian-1 +6.4.0-atlassian-2-SNAPSHOT struts2-velocity-plugin diff --git a/pom.xml b/pom.xml index 439f1fe43..deefe04b9 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 4.0.0 struts2-parent -6.4.0-atlassian-1 +6.4.0-atlassian-2-SNAPSHOT pom Struts 2 https://struts.apache.org/ @@ -51,7 +51,7 @@ scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git https://stash.atlassian.com/projects/BAM/repos/struts2-atlassian/browse -struts2-parent-6.4.0-atlassian-1 +HEAD @@ -107,7 +107,7 @@ UTF-8 - 2024-04-23T06:46:09Z + 2024-04-23T06:46:38Z 1.8 1.8
(struts) 05/19: [maven-release-plugin] prepare for next development iteration
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 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 @@ org.apache.struts struts2-parent -6.6.0-atlassian-1 +6.6.0-atlassian-2-SNAPSHOT struts2-core jar 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 @@ org.apache.struts struts2-plugins -6.6.0-atlassian-1 +6.6.0-atlassian-2-SNAPSHOT struts2-junit-plugin 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 @@ org.apache.struts struts2-parent -6.6.0-atlassian-1 +6.6.0-atlassian-2-SNAPSHOT struts2-plugins 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 @@ org.apache.struts struts2-plugins -6.6.0-atlassian-1 +6.6.0-atlassian-2-SNAPSHOT struts2-spring-plugin 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 @@ org.apache.struts struts2-plugins -6.6.0-atlassian-1 +6.6.0-atlassian-2-SNAPSHOT struts2-velocity-plugin diff --git a/pom.xml b/pom.xml index 6d25879b9..bad45abe4 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 4.0.0 struts2-parent -6.6.0-atlassian-1 +6.6.0-atlassian-2-SNAPSHOT pom Struts 2 https://struts.apache.org/ @@ -51,7 +51,7 @@ scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git https://stash.atlassian.com/projects/BAM/repos/struts2-atlassian/browse -struts2-parent-6.6.0-atlassian-1 +HEAD @@ -107,7 +107,7 @@ UTF-8 - 2024-07-22T06:06:34Z + 2024-07-22T06:07:14Z 1.8 1.8
(struts) 15/19: CONFSRVDEV-37099 Backport of CVE-2024-53677 fix from 7.0
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
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..0
---
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;
-
-/**
- *
- *
- * 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:
- *
- *
- *
- * [File Name] : File - the actual File
- *
- * [File Name]ContentType : String - the content type of the file
- *
- * [File Name]FileName : String - the actual name of the file uploaded
(not the HTML name)
- *
- *
- *
- * 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.
- * See the example code section.
- *
- *
- * 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:
- *
- *
- *
- *
- * struts.messages.error.uploading - a general error that occurs when the
file could not be uploaded
- *
- * struts.messages.error.file.too.large - occurs when the uploaded file is
too large
- *
- * struts.messages.error.content.type.not.allowed - occurs when the
uploaded file does not match the expected
- * content types specified
- *
- * struts.messages.error.file.extension.not.allowed - occurs when the
uploaded file does not match the expected
- * file extensions specified
- *
- *
- *
- *
- *
- * Interceptor parameters:
- *
- *
- *
- *
- *
- * maximumSize (optional) - the maximum size (in bytes) that the
interceptor will allow a file reference to be set
- * on the action. Note, this is not related to the various properties
found in struts.properties.
- * Default to approximately 2MB.
- *
- * 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.
- *
- * 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.
- *
- *
- *
- *
- *
- * Extending the interceptor:
- *
- *
- *
- *
- *
- *
(struts) 09/19: [maven-release-plugin] prepare for next development iteration
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 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 @@ org.apache.struts struts2-parent -6.6.1-atlassian-1 +6.6.1-atlassian-2-SNAPSHOT struts2-core jar 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 @@ org.apache.struts struts2-plugins -6.6.1-atlassian-1 +6.6.1-atlassian-2-SNAPSHOT struts2-junit-plugin 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 @@ org.apache.struts struts2-parent -6.6.1-atlassian-1 +6.6.1-atlassian-2-SNAPSHOT struts2-plugins 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 @@ org.apache.struts struts2-plugins -6.6.1-atlassian-1 +6.6.1-atlassian-2-SNAPSHOT struts2-spring-plugin 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 @@ org.apache.struts struts2-plugins -6.6.1-atlassian-1 +6.6.1-atlassian-2-SNAPSHOT struts2-velocity-plugin diff --git a/pom.xml b/pom.xml index e71cd7d7c..55dba1374 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 4.0.0 struts2-parent -6.6.1-atlassian-1 +6.6.1-atlassian-2-SNAPSHOT pom Struts 2 https://struts.apache.org/ @@ -51,7 +51,7 @@ scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git https://stash.atlassian.com/projects/BAM/repos/struts2-atlassian/browse -struts2-parent-6.6.1-atlassian-1 +HEAD @@ -107,7 +107,7 @@ UTF-8 - 2024-10-08T05:40:11Z + 2024-10-08T05:40:38Z 1.8 1.8
(struts) branch kusal-depr-apis-8 deleted (was 6b0976ac7)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch kusal-depr-apis-8 in repository https://gitbox.apache.org/repos/asf/struts.git was 6b0976ac7 WW-3714 Deprecate and migrate (Field)ValidationSupport This change permanently discards the following revisions: discard 6b0976ac7 WW-3714 Deprecate and migrate (Field)ValidationSupport discard ab1240df6 WW-3714 Deprecate and migrate ValidationInterceptor discard 4359f76c5 WW-3714 Deprecate and migrate Validator interfaces discard 440153c0d WW-3714 Deprecate and migrate assorted Interceptors discard f8dc1ceec WW-3714 Deprecate and migrate AbstractInterceptor and MethodFilterInterceptor discard 5e295d10b WW-3714 Deprecate and migrate ActionSupport discard 44855ca7c WW-3714 Marker interface migration follow-up discard dc8164577 WW-3714 Shortcut adapters discard a02f37fb5 WW-3714 Update new ActionContext with new ValueStack discard da687be2a WW-3714 Deprecate and migrate assorted marker interfaces discard 00f9172ac WW-3714 Deprecate and migrate ValueStack discard cc0038b35 WW-3714 Deprecate and migrate ActionProxy discard bdc15b8ef WW-3714 Deprecate and migrate ActionEventListener discard b3d72a241 WW-3714 Add factory support for new Interceptor, Result interfaces
(struts) branch m02 deleted (was d398fbe60)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch m02 in repository https://gitbox.apache.org/repos/asf/struts.git was d398fbe60 Prepare milestone m02 This change permanently discards the following revisions: discard d398fbe60 Prepare milestone m02 discard 0a3eef562 Merge remote-tracking branch 'origin/master' into fork/6.4 discard 6b79f3d40 CONFSRVDEV-26304 Type preservation for Velocity directive parameters (cherry-picked from 82ef6576c5d and 059de2305af) discard 1bbea4276 CONFSRVDEV-26354 Reinstate legacy WebWork syntax support (partial revert 7840fa1) discard c135a7898 Set version to 6.4.0-atlassian-1-SNAPSHOT discard c065da4ef Atlassian fork preparation
(struts) branch WW-5379-directives-valuestack deleted (was c5cf3fc28)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5379-directives-valuestack in repository https://gitbox.apache.org/repos/asf/struts.git was c5cf3fc28 WW-5379 Add one more method to provide Velocity directives with ValueStack The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(struts) branch WW-5352-parameter-annotation-4 deleted (was 805f2ba72)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5352-parameter-annotation-4 in repository https://gitbox.apache.org/repos/asf/struts.git was 805f2ba72 WW-5352 Ensure StrutsParameter compatibility with TypeConversion setters The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
