(struts) branch 7.0.x/merge-master-2024-07-20 updated (7b8435768 -> 2f6604503)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch 7.0.x/merge-master-2024-07-20 in repository https://gitbox.apache.org/repos/asf/struts.git from 7b8435768 Merge remote-tracking branch 'origin/master' into 7.0.x/merge-master-2024-07-20 add d6e30b45d [maven-release-plugin] prepare release STRUTS_6_6_0 add f977f0c0e [maven-release-plugin] prepare for next development iteration add 2f6604503 Merge remote-tracking branch 'origin/master' into 7.0.x/merge-master-2024-07-20 No new revisions were added by this update. Summary of changes:
(struts) branch release/struts-7-0-x updated (e40703e8a -> b9991b5cc)
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a change to branch release/struts-7-0-x
in repository https://gitbox.apache.org/repos/asf/struts.git
from e40703e8a [maven-release-plugin] prepare for next development iteration
add dbfb59cb7 [maven-release-plugin] prepare release STRUTS_6_5_0
add 54e387dc6 [maven-release-plugin] prepare for next development iteration
add b8f7c4b2f Merge commit '54e387dc' into 7.0.x/merge-master-2024-07-20
add fcc2c9d3a WW-5441 Bump net.sf.jasperreports:jasperreports to 6.21.3
add e9a166819 Merge pull request #985 from apache/WW-5441-jasper
add abfb2f456 WW-5428 Stop further excessive logging in DevMode
add 92fc324f2 Merge pull request #987 from apache/WW-5428-more-logging
add 5372aff1d WW-5443 Bump Spring dependencies to 5.3.37
add 9ea9d566d Merge pull request #990 from apache/WW-5443-spring-bump
add b7b5bff13 WW-5442 Enforce allowlist for OgnlReflectionProvider
add 085471b40 Merge pull request #988 from apache/kusal-experimental
add 1f46802ba Bump jackson.version from 2.17.1 to 2.17.2
add de0b3204e Merge pull request #993 from
apache/dependabot/maven/jackson.version-2.17.2
add 6d0fc2aa2 Bump maven-surefire-plugin.version from 3.2.5 to 3.3.1
add 0c4d66430 Merge pull request #994 from
apache/dependabot/maven/maven-surefire-plugin.version-3.3.1
add 56c1291d2 WW-5440 Deprecate AnnotationParameterFilterInterceptor
add 10edbce8d WW-5440 Fix MultipleFileUploadUsingArrayAction
add f9953938f WW-5440 Add missing annotations
add 8b4c188d0 WW-5440 Fix Showcase App allowlist configuration
add cb62cb4e9 WW-5440 Fix OGNL allowlist compat with Convention plugin
add 27e4d0d47 WW-5440 Fix inconsistent indenting
add cec46792c Merge branch 'master' into WW-5440-convention
add 9195990b5 Merge pull request #986 from apache/WW-5440-convention
add 7b8435768 Merge remote-tracking branch 'origin/master' into
7.0.x/merge-master-2024-07-20
add d6e30b45d [maven-release-plugin] prepare release STRUTS_6_6_0
add f977f0c0e [maven-release-plugin] prepare for next development iteration
add 2f6604503 Merge remote-tracking branch 'origin/master' into
7.0.x/merge-master-2024-07-20
add b9991b5cc Merge pull request #996 from
apache/7.0.x/merge-master-2024-07-20
No new revisions were added by this update.
Summary of changes:
.../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/SubmitActi
(struts) branch 7.0.x/merge-master-2024-07-20 deleted (was 2f6604503)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch 7.0.x/merge-master-2024-07-20 in repository https://gitbox.apache.org/repos/asf/struts.git was 2f6604503 Merge remote-tracking branch 'origin/master' into 7.0.x/merge-master-2024-07-20 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 release/struts-7-0-x updated: [maven-release-plugin] prepare release STRUTS_7_0_0_M9
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/release/struts-7-0-x by this push: new 571c7eff0 [maven-release-plugin] prepare release STRUTS_7_0_0_M9 571c7eff0 is described below commit 571c7eff0a8023386d66b4b64a8098090706793b Author: Lukasz Lenart AuthorDate: Sun Jul 21 08:59:32 2024 +0200 [maven-release-plugin] prepare release STRUTS_7_0_0_M9 --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 8 core/pom.xml| 2 +- jakarta/pom.xml | 2 +- jakarta/sitemesh2-jakarta/pom.xml | 2 +- jakarta/velocity-tools-jsp-jakarta/pom.xml | 2 +- jakarta/velocity-tools-view-jakarta/pom.xml | 2 +- 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/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/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 | 6 +++--- 29 files changed, 35 insertions(+), 35 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index 20efc9d8e..5fab7bfb1 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M9-SNAPSHOT +7.0.0-M9 struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 65a6bb5fa..c0cc8e2b1 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -7.0.0-M9-SNAPSHOT +7.0.0-M9 struts2-rest-showcase war -7.0.0-M9-SNAPSHOT +7.0.0-M9 Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 7872c39bf..b1d8b5601 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -7.0.0-M9-SNAPSHOT +7.0.0-M9 struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index e51e12ab7..8676ea503 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M9-SNAPSHOT +7.0.0-M9 struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index ab7f60bd5..2a8b8f76c 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -7.0.0-M9-SNAPSHOT +7.0.0-M9 struts2-bom -7.0.0-M9-SNAPSHOT +7.0.0-M9 pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -7.0.0-M9-SNAPSHOT +7.0.0-M9 true true @@ -165,7 +165,7 @@ -HEAD +STRUTS_7_0_0_M9 scm:git:https://gitbox.apache.org/repos/asf/struts.git scm:git:https://gitbox.apache.org/repos/asf/struts.git https://github.com/apache/struts/ diff --git a/core/pom.xml b/core/pom.xml index 52f1ac8aa..43e8387b7 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M9-SNAPSHOT +7.0.0-M9 struts2-core jar diff --git a/jakarta/pom.xml b/jakarta/pom.xml index 445c41b6b..23816164c 100644 --- a/jakarta/pom.xml +++ b/jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M9-SNAPSHOT +7.0.0-M9 struts2-jakarta pom diff --git a/jakarta/sitemesh2-jakarta/pom.xml b/jakarta/sitemesh2-jakarta/pom.xml index ff89ab8ba..0ae9b6e5c 100644 --- a/jakarta/sitemesh2-jakarta/pom.xml +++ b/jakarta/sitemesh2-jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-jakarta -7.0.0-M9-SNAPSHOT +7.0.0-M9 struts2-sitemesh2-jakarta ja
(struts) annotated tag STRUTS_7_0_0_M9 created (now a0e67549d)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to annotated tag STRUTS_7_0_0_M9 in repository https://gitbox.apache.org/repos/asf/struts.git at a0e67549d (tag) tagging 571c7eff0a8023386d66b4b64a8098090706793b (commit) replaces STRUTS_7_0_0_M8 by Lukasz Lenart on Sun Jul 21 08:59:39 2024 +0200 - Log - [maven-release-plugin] copy for tag STRUTS_7_0_0_M9 --- No new revisions were added by this update.
(struts) branch release/struts-7-0-x updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/release/struts-7-0-x by this push: new c5dfe61ec [maven-release-plugin] prepare for next development iteration c5dfe61ec is described below commit c5dfe61ecf901f1a350fcdab582fc318ae3e7abf Author: Lukasz Lenart AuthorDate: Sun Jul 21 08:59:44 2024 +0200 [maven-release-plugin] prepare for next development iteration --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 8 core/pom.xml| 2 +- jakarta/pom.xml | 2 +- jakarta/sitemesh2-jakarta/pom.xml | 2 +- jakarta/velocity-tools-jsp-jakarta/pom.xml | 2 +- jakarta/velocity-tools-view-jakarta/pom.xml | 2 +- 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/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/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 | 6 +++--- 29 files changed, 35 insertions(+), 35 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index 5fab7bfb1..56d26ea3e 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M9 +7.0.0-M10-SNAPSHOT struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index c0cc8e2b1..a27cccaf8 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -7.0.0-M9 +7.0.0-M10-SNAPSHOT struts2-rest-showcase war -7.0.0-M9 +7.0.0-M10-SNAPSHOT Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index b1d8b5601..b0d697354 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -7.0.0-M9 +7.0.0-M10-SNAPSHOT struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 8676ea503..57e20e4e9 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M9 +7.0.0-M10-SNAPSHOT struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index 2a8b8f76c..0f9e165a6 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -7.0.0-M9 +7.0.0-M10-SNAPSHOT struts2-bom -7.0.0-M9 +7.0.0-M10-SNAPSHOT pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -7.0.0-M9 +7.0.0-M10-SNAPSHOT true true @@ -165,7 +165,7 @@ -STRUTS_7_0_0_M9 +HEAD scm:git:https://gitbox.apache.org/repos/asf/struts.git scm:git:https://gitbox.apache.org/repos/asf/struts.git https://github.com/apache/struts/ diff --git a/core/pom.xml b/core/pom.xml index 43e8387b7..49ffa39c9 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M9 +7.0.0-M10-SNAPSHOT struts2-core jar diff --git a/jakarta/pom.xml b/jakarta/pom.xml index 23816164c..a1186f024 100644 --- a/jakarta/pom.xml +++ b/jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M9 +7.0.0-M10-SNAPSHOT struts2-jakarta pom diff --git a/jakarta/sitemesh2-jakarta/pom.xml b/jakarta/sitemesh2-jakarta/pom.xml index 0ae9b6e5c..1cd99aa13 100644 --- a/jakarta/sitemesh2-jakarta/pom.xml +++ b/jakarta/sitemesh2-jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-jakarta -7.0.0-M9 +7.0.0-M10-SNAPSHOT struts2-
