[struts] 01/01: Merge pull request #527 from apache/WW-5112-reduce-logging
This is an automated email from the ASF dual-hosted git repository. yasserzamani pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git commit 457a7c918f2d1fbfa87f27c3231d883c70043c3b Merge: 1e32510 0a05739 Author: Yasser Zamani AuthorDate: Sat Jan 29 12:08:29 2022 +0330 Merge pull request #527 from apache/WW-5112-reduce-logging [WW-5112] Reduces logging in logic around missing resource key .../xwork2/util/AbstractLocalizedTextProvider.java | 40 ++ .../apache/struts2/util/TextProviderHelper.java| 5 --- 2 files changed, 18 insertions(+), 27 deletions(-)
[struts] branch master updated (1e32510 -> 457a7c9)
This is an automated email from the ASF dual-hosted git repository. yasserzamani pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts.git. from 1e32510 Merge pull request #523 from apache/WW-5022-escape-false add 0a05739 WW-5112 Reduces logging in logic around missing resource key new 457a7c9 Merge pull request #527 from apache/WW-5112-reduce-logging The 1 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. Summary of changes: .../xwork2/util/AbstractLocalizedTextProvider.java | 40 ++ .../apache/struts2/util/TextProviderHelper.java| 5 --- 2 files changed, 18 insertions(+), 27 deletions(-)
[struts] branch master updated (457a7c9 -> 2851967)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts.git. from 457a7c9 Merge pull request #527 from apache/WW-5112-reduce-logging add 5659535 WW-5115 Reduces logging for ignored DMI related params when DMI is disabled new 2851967 Merge pull request #526 from apache/WW-5115-dmi-logging The 1 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. Summary of changes: .../xwork2/interceptor/ParametersInterceptor.java | 32 +- .../interceptor/ParametersInterceptorTest.java | 27 ++ 2 files changed, 52 insertions(+), 7 deletions(-)
[struts] 01/01: Merge pull request #526 from apache/WW-5115-dmi-logging
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git commit 2851967a2ef531a4124dffd9862460add3ab1500 Merge: 457a7c9 5659535 Author: Lukasz Lenart AuthorDate: Sat Jan 29 17:21:55 2022 +0100 Merge pull request #526 from apache/WW-5115-dmi-logging [WW-5115] Reduces logging for ignored DMI related params when DMI is disabled .../xwork2/interceptor/ParametersInterceptor.java | 32 +- .../interceptor/ParametersInterceptorTest.java | 27 ++ 2 files changed, 52 insertions(+), 7 deletions(-)
[struts] branch master updated: WW-5166 Upgrades OGNL to version 3.3.2
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/master by this push: new 3a7aabd WW-5166 Upgrades OGNL to version 3.3.2 3a7aabd is described below commit 3a7aabdcbc177d12e17b8098f585dfc7aff32a0a Author: Lukasz Lenart AuthorDate: Sat Jan 29 17:26:55 2022 +0100 WW-5166 Upgrades OGNL to version 3.3.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 52a8b26..14d6ce4 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ 2.10.5 2.10.5.1 2.17.1 -3.2.20 +3.3.2 1.7.32 4.3.30.RELEASE 3.0.8
[struts] branch master updated: [maven-release-plugin] prepare release STRUTS_6_0_0_RC2
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/master by this push: new f997d9b [maven-release-plugin] prepare release STRUTS_6_0_0_RC2 f997d9b is described below commit f997d9b1ed876c8316c5b2b19760cdaf0b2bb6a6 Author: Lukasz Lenart AuthorDate: Sat Jan 29 17:36:26 2022 +0100 [maven-release-plugin] prepare release STRUTS_6_0_0_RC2 --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 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 +- 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 +- plugins/plexus/pom.xml | 2 +- plugins/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 +- pom.xml | 6 +++--- 37 files changed, 42 insertions(+), 42 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index 791f306..d412023 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -2.6-SNAPSHOT +6.0.0-RC2 struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 9264dcd..aaa2dab 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -2.6-SNAPSHOT +6.0.0-RC2 struts2-rest-showcase war -2.6-SNAPSHOT +6.0.0-RC2 Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 78564ac..2755b91 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -2.6-SNAPSHOT +6.0.0-RC2 struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 4ad7362..4db6263 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -2.6-SNAPSHOT +6.0.0-RC2 struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index 9d5be00..6965956 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -29,7 +29,7 @@ struts2-bom -2.6-SNAPSHOT +6.0.0-RC2 pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -2.6-SNAPSHOT +6.0.0-RC2 true true @@ -175,7 +175,7 @@ -HEAD +STRUTS_6_0_0_RC2 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/bundles/admin/pom.xml b/bundles/admin/pom.xml index c6cd0e6..2a229ca 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -2.6-SNAPSHOT +6.0.0-RC2 struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index a2f639b..491ee25 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -2.6-SNAPSHOT +6.0.0-RC2 struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index c6d4a9d..ef3c5d5 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -2.6-SNAPSHOT +6.0.0-RC2 struts2-osgi-bundles diff --git a/core/pom.xml b/core/pom.xml index cd56777..94a6aec 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -2.6-SNAPSHOT +6.0.0-RC2 struts2
[struts] annotated tag STRUTS_6_0_0_RC2 created (now a3fbb8f)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to annotated tag STRUTS_6_0_0_RC2 in repository https://gitbox.apache.org/repos/asf/struts.git. at a3fbb8f (tag) tagging f997d9b1ed876c8316c5b2b19760cdaf0b2bb6a6 (commit) replaces STRUTS_6_0_0_RC1 by Lukasz Lenart on Sat Jan 29 17:36:30 2022 +0100 - Log - [maven-release-plugin] copy for tag STRUTS_6_0_0_RC2 --- No new revisions were added by this update.
[struts] branch master 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 master in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/master by this push: new 14c3a14 [maven-release-plugin] prepare for next development iteration 14c3a14 is described below commit 14c3a14c8fca0741f2c516fcb0ec551ffcf1888f Author: Lukasz Lenart AuthorDate: Sat Jan 29 17:36:34 2022 +0100 [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 | 6 +++--- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/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/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 +- plugins/plexus/pom.xml | 2 +- plugins/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 +- pom.xml | 6 +++--- 37 files changed, 42 insertions(+), 42 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index d412023..54e3b84 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.0.0-RC2 +6.0.0-SNAPSHOT struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index aaa2dab..56533ec 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -6.0.0-RC2 +6.0.0-SNAPSHOT struts2-rest-showcase war -6.0.0-RC2 +6.0.0-SNAPSHOT Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 2755b91..9ce5d0b 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -6.0.0-RC2 +6.0.0-SNAPSHOT struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 4db6263..5abd854 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.0.0-RC2 +6.0.0-SNAPSHOT struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index 6965956..021a767 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -29,7 +29,7 @@ struts2-bom -6.0.0-RC2 +6.0.0-SNAPSHOT pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -6.0.0-RC2 +6.0.0-SNAPSHOT true true @@ -175,7 +175,7 @@ -STRUTS_6_0_0_RC2 +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/bundles/admin/pom.xml b/bundles/admin/pom.xml index 2a229ca..4f5ce6c 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.0.0-RC2 +6.0.0-SNAPSHOT struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index 491ee25..df1cd32 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.0.0-RC2 +6.0.0-SNAPSHOT struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index ef3c5d5..606f235 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.0.0-RC2 +6.0.0-SNAPSHOT struts2-osgi-bundles diff --git a/core/pom.xml b/core/pom.xml index 94a6aec..4ae6fa0 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.0.0-RC2 +
svn commit: r52325 - /dev/struts/6.0.0-RC2/
Author: lukaszlenart Date: Sat Jan 29 16:48:38 2022 New Revision: 52325 Log: Updates test release 6.0.0-RC2 Added: dev/struts/6.0.0-RC2/ dev/struts/6.0.0-RC2/struts-6.0.0-RC2-all.zip (with props) dev/struts/6.0.0-RC2/struts-6.0.0-RC2-all.zip.asc (with props) dev/struts/6.0.0-RC2/struts-6.0.0-RC2-all.zip.sha256 dev/struts/6.0.0-RC2/struts-6.0.0-RC2-all.zip.sha512 dev/struts/6.0.0-RC2/struts-6.0.0-RC2-apps.zip (with props) dev/struts/6.0.0-RC2/struts-6.0.0-RC2-apps.zip.asc (with props) dev/struts/6.0.0-RC2/struts-6.0.0-RC2-apps.zip.sha256 dev/struts/6.0.0-RC2/struts-6.0.0-RC2-apps.zip.sha512 dev/struts/6.0.0-RC2/struts-6.0.0-RC2-docs.zip (with props) dev/struts/6.0.0-RC2/struts-6.0.0-RC2-docs.zip.asc (with props) dev/struts/6.0.0-RC2/struts-6.0.0-RC2-docs.zip.sha256 dev/struts/6.0.0-RC2/struts-6.0.0-RC2-docs.zip.sha512 dev/struts/6.0.0-RC2/struts-6.0.0-RC2-lib.zip (with props) dev/struts/6.0.0-RC2/struts-6.0.0-RC2-lib.zip.asc (with props) dev/struts/6.0.0-RC2/struts-6.0.0-RC2-lib.zip.sha256 dev/struts/6.0.0-RC2/struts-6.0.0-RC2-lib.zip.sha512 dev/struts/6.0.0-RC2/struts-6.0.0-RC2-min-lib.zip (with props) dev/struts/6.0.0-RC2/struts-6.0.0-RC2-min-lib.zip.asc (with props) dev/struts/6.0.0-RC2/struts-6.0.0-RC2-min-lib.zip.sha256 dev/struts/6.0.0-RC2/struts-6.0.0-RC2-min-lib.zip.sha512 dev/struts/6.0.0-RC2/struts-6.0.0-RC2-src.zip (with props) dev/struts/6.0.0-RC2/struts-6.0.0-RC2-src.zip.asc (with props) dev/struts/6.0.0-RC2/struts-6.0.0-RC2-src.zip.sha256 dev/struts/6.0.0-RC2/struts-6.0.0-RC2-src.zip.sha512 Added: dev/struts/6.0.0-RC2/struts-6.0.0-RC2-all.zip == Binary file - no diff available. Propchange: dev/struts/6.0.0-RC2/struts-6.0.0-RC2-all.zip -- svn:mime-type = application/zip Added: dev/struts/6.0.0-RC2/struts-6.0.0-RC2-all.zip.asc == Binary file - no diff available. Propchange: dev/struts/6.0.0-RC2/struts-6.0.0-RC2-all.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/6.0.0-RC2/struts-6.0.0-RC2-all.zip.sha256 == --- dev/struts/6.0.0-RC2/struts-6.0.0-RC2-all.zip.sha256 (added) +++ dev/struts/6.0.0-RC2/struts-6.0.0-RC2-all.zip.sha256 Sat Jan 29 16:48:38 2022 @@ -0,0 +1 @@ +d63d2496d2c449e0d5569234c937423d9a0f918d13e7a4981a55b7f1433c3277 struts-6.0.0-RC2-all.zip Added: dev/struts/6.0.0-RC2/struts-6.0.0-RC2-all.zip.sha512 == --- dev/struts/6.0.0-RC2/struts-6.0.0-RC2-all.zip.sha512 (added) +++ dev/struts/6.0.0-RC2/struts-6.0.0-RC2-all.zip.sha512 Sat Jan 29 16:48:38 2022 @@ -0,0 +1 @@ +7343ade8204c9bf2273b2fc527b992a432b36931698bd3fc8552be6bb342dee917fc839b1046475605a179baaf5b8ba228aed1aa573039b1a78ec1c15ed82821 struts-6.0.0-RC2-all.zip Added: dev/struts/6.0.0-RC2/struts-6.0.0-RC2-apps.zip == Binary file - no diff available. Propchange: dev/struts/6.0.0-RC2/struts-6.0.0-RC2-apps.zip -- svn:mime-type = application/zip Added: dev/struts/6.0.0-RC2/struts-6.0.0-RC2-apps.zip.asc == Binary file - no diff available. Propchange: dev/struts/6.0.0-RC2/struts-6.0.0-RC2-apps.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/6.0.0-RC2/struts-6.0.0-RC2-apps.zip.sha256 == --- dev/struts/6.0.0-RC2/struts-6.0.0-RC2-apps.zip.sha256 (added) +++ dev/struts/6.0.0-RC2/struts-6.0.0-RC2-apps.zip.sha256 Sat Jan 29 16:48:38 2022 @@ -0,0 +1 @@ +1e88ab21fed1429f5edb05f424759e56f8552d8ae6c428b90e08830289c53f26 struts-6.0.0-RC2-apps.zip Added: dev/struts/6.0.0-RC2/struts-6.0.0-RC2-apps.zip.sha512 == --- dev/struts/6.0.0-RC2/struts-6.0.0-RC2-apps.zip.sha512 (added) +++ dev/struts/6.0.0-RC2/struts-6.0.0-RC2-apps.zip.sha512 Sat Jan 29 16:48:38 2022 @@ -0,0 +1 @@ +03fa1fcf6b508627c9913c6cc2858ef2a8f7c5eaa7f2844f8857e0958ad12fe7f0c1778ffb4535d748eaae948a2ed82b628c2f298eca465c0071193112f63e33 struts-6.0.0-RC2-apps.zip Added: dev/struts/6.0.0-RC2/struts-6.0.0-RC2-docs.zip == Binary file - no diff available. Propchange: dev/struts/6.0.0-RC2/struts-6.0.0-RC2-docs.zip -