(struts) 01/01: Merge pull request #945 from apache/fix/disable-review

[lukaszlenart]

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 36230dc5bee17cb0bcd51fb925b8485895f7d5fa
Merge: 40ccc74b8 9ee39d0a2
Author: Lukasz Lenart 
AuthorDate: Mon May 20 08:02:51 2024 +0200

Merge pull request #945 from apache/fix/disable-review

INFRA-25666 Disables review by code owners

 .asf.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(struts) branch master updated (40ccc74b8 -> 36230dc5b)

[lukaszlenart]

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 40ccc74b8 Merge pull request #933 from apache/fix/WW-5415-constructor
 add 9ee39d0a2 INFRA-25666 Disables review by code owners * this 
functionality requires to have public teams * currently all ASF teams are 
private
 new 36230dc5b Merge pull request #945 from apache/fix/disable-review

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:
 .asf.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(struts) branch fix/disable-review deleted (was 9ee39d0a2)

[lukaszlenart]

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

lukaszlenart pushed a change to branch fix/disable-review
in repository https://gitbox.apache.org/repos/asf/struts.git


 was 9ee39d0a2 INFRA-25666 Disables review by code owners * this 
functionality requires to have public teams * currently all ASF teams are 
private

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) 01/01: INFRA-25666 Disables review by code owners * this functionality requires to have public teams * currently all ASF teams are private

[lukaszlenart]

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

lukaszlenart pushed a commit to branch fix/disable-review
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 9ee39d0a2cae2585ff551152d36450a7ba777019
Author: Lukasz Lenart 
AuthorDate: Mon May 20 07:02:45 2024 +0200

INFRA-25666 Disables review by code owners
* this functionality requires to have public teams
* currently all ASF teams are private
---
 .asf.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.asf.yaml b/.asf.yaml
index 87706aa57..3f83d509a 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -18,7 +18,8 @@ github:
   contexts:
 - build
   required_pull_request_reviews:
-require_code_owner_reviews: true
+# it does not work because our github teams are private/secret, see 
INFRA-25666
+require_code_owner_reviews: false
 required_approving_review_count: 1
   autolink_jira:
 - WW

(struts) branch fix/disable-review created (now 9ee39d0a2)

[lukaszlenart]

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

lukaszlenart pushed a change to branch fix/disable-review
in repository https://gitbox.apache.org/repos/asf/struts.git


  at 9ee39d0a2 INFRA-25666 Disables review by code owners * this 
functionality requires to have public teams * currently all ASF teams are 
private

This branch includes the following new commits:

 new 9ee39d0a2 INFRA-25666 Disables review by code owners * this 
functionality requires to have public teams * currently all ASF teams are 
private

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.

(struts) 01/01: Merge pull request #933 from apache/fix/WW-5415-constructor

[lukaszlenart]

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 40ccc74b8a907d8f812944a4a059bf6867c79720
Merge: d147543dc 7c523ac33
Author: Lukasz Lenart 
AuthorDate: Tue May 14 19:56:27 2024 +0200

Merge pull request #933 from apache/fix/WW-5415-constructor

WW-5415 Fixes accessing public constructors via expression

 .../com/opensymphony/xwork2/ognl/SecurityMemberAccess.java|  7 ---
 .../xwork2/validator/VisitorFieldValidatorTest.java   | 11 +++
 .../xwork2/validator/VisitorValidatorTestAction.java  | 11 ++-
 .../validator/VisitorValidatorTestAction-validation.xml   |  8 
 4 files changed, 33 insertions(+), 4 deletions(-)

(struts) branch master updated (d147543dc -> 40ccc74b8)

[lukaszlenart]

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 d147543dc Merge pull request #932 from apache/feature/WW-5414-after
 add b36e88ff4 WW-5415 Fixes accessing public constructors via expression
 add 7c523ac33 WW-5415 Constructor members should be exempted as static 
members
 new 40ccc74b8 Merge pull request #933 from apache/fix/WW-5415-constructor

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:
 .../com/opensymphony/xwork2/ognl/SecurityMemberAccess.java|  7 ---
 .../xwork2/validator/VisitorFieldValidatorTest.java   | 11 +++
 .../xwork2/validator/VisitorValidatorTestAction.java  | 11 ++-
 .../validator/VisitorValidatorTestAction-validation.xml   |  8 
 4 files changed, 33 insertions(+), 4 deletions(-)

(struts) branch fix/WW-5415-constructor deleted (was 7c523ac33)

[lukaszlenart]

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

lukaszlenart pushed a change to branch fix/WW-5415-constructor
in repository https://gitbox.apache.org/repos/asf/struts.git


 was 7c523ac33 WW-5415 Constructor members should be exempted as static 
members

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

(struts) branch feature/WW-5414-after deleted (was 4dfbe0934)

[lukaszlenart]

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

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


 was 4dfbe0934 WW-5414 Always call afterInvocation even in case of exception

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 master updated (49eda37f2 -> d147543dc)

[lukaszlenart]

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 49eda37f2 Merge pull request #931 from apache/fix/WW-5422-trimable
 add 4dfbe0934 WW-5414 Always call afterInvocation even in case of exception
 new d147543dc Merge pull request #932 from apache/feature/WW-5414-after

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:
 core/pom.xml   |  6 +++
 .../interceptor/exec/StrutsBackgroundProcess.java  | 20 ++--
 .../exec/StrutsBackgroundProcessTest.java  | 60 +++---
 pom.xml|  7 +++
 4 files changed, 83 insertions(+), 10 deletions(-)

(struts) 01/01: Merge pull request #932 from apache/feature/WW-5414-after

[lukaszlenart]

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 d147543dcd9e1a5b3165cc4a966c092c7895204c
Merge: 49eda37f2 4dfbe0934
Author: Lukasz Lenart 
AuthorDate: Tue May 14 19:55:30 2024 +0200

Merge pull request #932 from apache/feature/WW-5414-after

WW-5414 Always call afterInvocation even in case of exception

 core/pom.xml   |  6 +++
 .../interceptor/exec/StrutsBackgroundProcess.java  | 20 ++--
 .../exec/StrutsBackgroundProcessTest.java  | 60 +++---
 pom.xml|  7 +++
 4 files changed, 83 insertions(+), 10 deletions(-)

(struts) 01/01: Merge pull request #931 from apache/fix/WW-5422-trimable

[lukaszlenart]

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 49eda37f2dfc163fc2a4f93a3219ff38385dbdc1
Merge: 195b0e59d 0a57cac6d
Author: Lukasz Lenart 
AuthorDate: Mon May 13 08:23:26 2024 +0200

Merge pull request #931 from apache/fix/WW-5422-trimable

WW-5422 Fixes support for trimable locale string in request

 .../com/opensymphony/xwork2/ActionSupport.java |   5 +
 .../opensymphony/xwork2/DefaultLocaleProvider.java |  18 ++-
 .../com/opensymphony/xwork2/LocaleProvider.java|  16 ++
 .../validator/DelegatingValidatorContext.java  |  12 +-
 .../struts2/interceptor/I18nInterceptor.java   |  25 ++-
 .../xwork2/DefaultLocaleProviderTest.java  | 174 +
 .../opensymphony/xwork2/LocaleProviderTest.java}   |  70 ++---
 .../struts2/interceptor/I18nInterceptorTest.java   |  20 +++
 8 files changed, 292 insertions(+), 48 deletions(-)

(struts) branch master updated (195b0e59d -> 49eda37f2)

[lukaszlenart]

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 195b0e59d Merge pull request #939 from 
apache/dependabot/github_actions/ossf/scorecard-action-2.3.3
 add 0a57cac6d WW-5422 Adds dedicate unit test to cover 
DefaultLocaleProvider
 new 49eda37f2 Merge pull request #931 from apache/fix/WW-5422-trimable

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:
 .../com/opensymphony/xwork2/ActionSupport.java |   5 +
 .../opensymphony/xwork2/DefaultLocaleProvider.java |  18 ++-
 .../com/opensymphony/xwork2/LocaleProvider.java|  16 ++
 .../validator/DelegatingValidatorContext.java  |  12 +-
 .../struts2/interceptor/I18nInterceptor.java   |  25 ++-
 .../xwork2/DefaultLocaleProviderTest.java  | 174 +
 .../opensymphony/xwork2/LocaleProviderTest.java}   |  70 ++---
 .../struts2/interceptor/I18nInterceptorTest.java   |  20 +++
 8 files changed, 292 insertions(+), 48 deletions(-)
 create mode 100644 
core/src/test/java/com/opensymphony/xwork2/DefaultLocaleProviderTest.java
 copy core/src/{main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java => 
test/java/com/opensymphony/xwork2/LocaleProviderTest.java} (50%)

(struts) branch fix/WW-5422-trimable deleted (was 0a57cac6d)

[lukaszlenart]

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

lukaszlenart pushed a change to branch fix/WW-5422-trimable
in repository https://gitbox.apache.org/repos/asf/struts.git


 was 0a57cac6d WW-5422 Adds dedicate unit test to cover 
DefaultLocaleProvider

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 fix/WW-5422-trimable updated (adec73ea7 -> 0a57cac6d)

[lukaszlenart]

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

lukaszlenart pushed a change to branch fix/WW-5422-trimable
in repository https://gitbox.apache.org/repos/asf/struts.git


 discard adec73ea7 WW-5422 Adds dedicate unit test to cover 
DefaultLocaleProvider
 new 0a57cac6d WW-5422 Adds dedicate unit test to cover 
DefaultLocaleProvider

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (adec73ea7)
\
 N -- N -- N   refs/heads/fix/WW-5422-trimable (0a57cac6d)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

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/DefaultLocaleProviderTest.java  | 40 +++---
 .../opensymphony/xwork2/LocaleProviderTest.java| 12 +++
 2 files changed, 26 insertions(+), 26 deletions(-)

(struts) 01/01: WW-5422 Adds dedicate unit test to cover DefaultLocaleProvider

[lukaszlenart]

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

lukaszlenart pushed a commit to branch fix/WW-5422-trimable
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 0a57cac6d6645789e36597fa0282d86f93455849
Author: Lukasz Lenart 
AuthorDate: Sat May 11 07:23:22 2024 +0200

WW-5422 Adds dedicate unit test to cover DefaultLocaleProvider
---
 .../com/opensymphony/xwork2/ActionSupport.java |   5 +
 .../opensymphony/xwork2/DefaultLocaleProvider.java |  18 ++-
 .../com/opensymphony/xwork2/LocaleProvider.java|  16 ++
 .../validator/DelegatingValidatorContext.java  |  12 +-
 .../struts2/interceptor/I18nInterceptor.java   |  25 ++-
 .../xwork2/DefaultLocaleProviderTest.java  | 174 +
 .../opensymphony/xwork2/LocaleProviderTest.java}   |  70 ++---
 .../struts2/interceptor/I18nInterceptorTest.java   |  20 +++
 8 files changed, 292 insertions(+), 48 deletions(-)

diff --git a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java 
b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
index 8c7e15e60..ab1a18099 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
@@ -90,6 +90,11 @@ public class ActionSupport implements Action, Validateable, 
ValidationAware, Tex
 return getLocaleProvider().isValidLocale(locale);
 }
 
+@Override
+public Locale toLocale(String localeStr) {
+return getLocaleProvider().toLocale(localeStr);
+}
+
 @Override
 public boolean hasKey(String key) {
 return getTextProvider().hasKey(key);
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java 
b/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java
index da89306c0..35f16191a 100644
--- a/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java
+++ b/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java
@@ -46,17 +46,23 @@ public class DefaultLocaleProvider implements 
LocaleProvider {
 
 @Override
 public boolean isValidLocaleString(String localeStr) {
+Locale locale = this.toLocale(localeStr);
+return isValidLocale(locale);
+}
+
+@Override
+public boolean isValidLocale(Locale locale) {
+return locale != null && LocaleUtils.isAvailableLocale(locale);
+}
+
+@Override
+public Locale toLocale(String localeStr) {
 Locale locale = null;
 try {
 locale = LocaleUtils.toLocale(StringUtils.trimToNull(localeStr));
 } catch (IllegalArgumentException e) {
 LOG.warn(new ParameterizedMessage("Cannot convert [{}] to proper 
locale", localeStr), e);
 }
-return isValidLocale(locale);
-}
-
-@Override
-public boolean isValidLocale(Locale locale) {
-return LocaleUtils.isAvailableLocale(locale);
+return locale;
 }
 }
diff --git a/core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java 
b/core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java
index 67972af34..00a41a25b 100644
--- a/core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java
+++ b/core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java
@@ -18,6 +18,9 @@
  */
 package com.opensymphony.xwork2;
 
+import org.apache.commons.lang3.LocaleUtils;
+import org.apache.commons.lang3.StringUtils;
+
 import java.util.Locale;
 
 
@@ -58,4 +61,17 @@ public interface LocaleProvider {
  */
 boolean isValidLocale(Locale locale);
 
+/**
+ * Tries to convert provided locale string into {@link Locale} or returns 
null
+ * @param localeStr a String representing locale, e.g.: en_EN
+ * @return instance of {@link Locale} or null
+ * @since Struts 6.5.0
+ */
+default Locale toLocale(String localeStr) {
+try {
+return LocaleUtils.toLocale(StringUtils.trimToNull(localeStr));
+} catch (IllegalArgumentException e) {
+return null;
+}
+}
 }
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
 
b/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
index 5c7f2c136..bc8c88875 100644
--- 
a/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
+++ 
b/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
@@ -122,10 +122,15 @@ public class DelegatingValidatorContext implements 
ValidatorContext {
 return localeProvider.isValidLocale(locale);
 }
 
+@Override
+public Locale toLocale(String localeStr) {
+return localeProvider.toLocale(localeStr);
+}
+
 public boolean hasKey(String key) {
return textProvider.hasKey(key);
 }
-
+
 public String getText(String aTextName) {
 return textProvider.getText(aTextName);
 }
@@ -280,6 +285,11 @@ public class Delegati

(struts) branch fix/WW-5422-trimable updated (38d11f4b4 -> adec73ea7)

[lukaszlenart]

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

lukaszlenart pushed a change to branch fix/WW-5422-trimable
in repository https://gitbox.apache.org/repos/asf/struts.git


 discard 38d11f4b4 WW-5422 Adds dedicate unit test to cover 
DefaultLocaleProvider
 new adec73ea7 WW-5422 Adds dedicate unit test to cover 
DefaultLocaleProvider

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (38d11f4b4)
\
 N -- N -- N   refs/heads/fix/WW-5422-trimable (adec73ea7)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

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:
 .../opensymphony/xwork2/LocaleProviderTest.java| 82 ++
 1 file changed, 82 insertions(+)
 create mode 100644 
core/src/test/java/com/opensymphony/xwork2/LocaleProviderTest.java

(struts) 01/01: WW-5422 Adds dedicate unit test to cover DefaultLocaleProvider

[lukaszlenart]

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

lukaszlenart pushed a commit to branch fix/WW-5422-trimable
in repository https://gitbox.apache.org/repos/asf/struts.git

commit adec73ea753f2a5e15090544e7876a4a1a3a2700
Author: Lukasz Lenart 
AuthorDate: Sat May 11 07:23:22 2024 +0200

WW-5422 Adds dedicate unit test to cover DefaultLocaleProvider
---
 .../com/opensymphony/xwork2/ActionSupport.java |   5 +
 .../opensymphony/xwork2/DefaultLocaleProvider.java |  18 ++-
 .../com/opensymphony/xwork2/LocaleProvider.java|  16 ++
 .../validator/DelegatingValidatorContext.java  |  12 +-
 .../struts2/interceptor/I18nInterceptor.java   |  25 ++-
 .../xwork2/DefaultLocaleProviderTest.java  | 174 +
 .../opensymphony/xwork2/LocaleProviderTest.java}   |  70 ++---
 .../struts2/interceptor/I18nInterceptorTest.java   |  20 +++
 8 files changed, 292 insertions(+), 48 deletions(-)

diff --git a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java 
b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
index 8c7e15e60..ab1a18099 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
@@ -90,6 +90,11 @@ public class ActionSupport implements Action, Validateable, 
ValidationAware, Tex
 return getLocaleProvider().isValidLocale(locale);
 }
 
+@Override
+public Locale toLocale(String localeStr) {
+return getLocaleProvider().toLocale(localeStr);
+}
+
 @Override
 public boolean hasKey(String key) {
 return getTextProvider().hasKey(key);
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java 
b/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java
index da89306c0..35f16191a 100644
--- a/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java
+++ b/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java
@@ -46,17 +46,23 @@ public class DefaultLocaleProvider implements 
LocaleProvider {
 
 @Override
 public boolean isValidLocaleString(String localeStr) {
+Locale locale = this.toLocale(localeStr);
+return isValidLocale(locale);
+}
+
+@Override
+public boolean isValidLocale(Locale locale) {
+return locale != null && LocaleUtils.isAvailableLocale(locale);
+}
+
+@Override
+public Locale toLocale(String localeStr) {
 Locale locale = null;
 try {
 locale = LocaleUtils.toLocale(StringUtils.trimToNull(localeStr));
 } catch (IllegalArgumentException e) {
 LOG.warn(new ParameterizedMessage("Cannot convert [{}] to proper 
locale", localeStr), e);
 }
-return isValidLocale(locale);
-}
-
-@Override
-public boolean isValidLocale(Locale locale) {
-return LocaleUtils.isAvailableLocale(locale);
+return locale;
 }
 }
diff --git a/core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java 
b/core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java
index 67972af34..00a41a25b 100644
--- a/core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java
+++ b/core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java
@@ -18,6 +18,9 @@
  */
 package com.opensymphony.xwork2;
 
+import org.apache.commons.lang3.LocaleUtils;
+import org.apache.commons.lang3.StringUtils;
+
 import java.util.Locale;
 
 
@@ -58,4 +61,17 @@ public interface LocaleProvider {
  */
 boolean isValidLocale(Locale locale);
 
+/**
+ * Tries to convert provided locale string into {@link Locale} or returns 
null
+ * @param localeStr a String representing locale, e.g.: en_EN
+ * @return instance of {@link Locale} or null
+ * @since Struts 6.5.0
+ */
+default Locale toLocale(String localeStr) {
+try {
+return LocaleUtils.toLocale(StringUtils.trimToNull(localeStr));
+} catch (IllegalArgumentException e) {
+return null;
+}
+}
 }
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
 
b/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
index 5c7f2c136..bc8c88875 100644
--- 
a/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
+++ 
b/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
@@ -122,10 +122,15 @@ public class DelegatingValidatorContext implements 
ValidatorContext {
 return localeProvider.isValidLocale(locale);
 }
 
+@Override
+public Locale toLocale(String localeStr) {
+return localeProvider.toLocale(localeStr);
+}
+
 public boolean hasKey(String key) {
return textProvider.hasKey(key);
 }
-
+
 public String getText(String aTextName) {
 return textProvider.getText(aTextName);
 }
@@ -280,6 +285,11 @@ public class Delegati

(struts) 01/01: WW-5422 Adds dedicate unit test to cover DefaultLocaleProvider

[lukaszlenart]

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

lukaszlenart pushed a commit to branch fix/WW-5422-trimable
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 38d11f4b43cc6ed6203a72ed7e312fde57bb53b2
Author: Lukasz Lenart 
AuthorDate: Sat May 11 07:23:22 2024 +0200

WW-5422 Adds dedicate unit test to cover DefaultLocaleProvider
---
 .../com/opensymphony/xwork2/ActionSupport.java |   5 +
 .../opensymphony/xwork2/DefaultLocaleProvider.java |  18 ++-
 .../com/opensymphony/xwork2/LocaleProvider.java|  16 ++
 .../validator/DelegatingValidatorContext.java  |  12 +-
 .../struts2/interceptor/I18nInterceptor.java   |  25 ++-
 .../xwork2/DefaultLocaleProviderTest.java  | 174 +
 .../struts2/interceptor/I18nInterceptorTest.java   |  20 +++
 7 files changed, 247 insertions(+), 23 deletions(-)

diff --git a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java 
b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
index 8c7e15e60..ab1a18099 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
@@ -90,6 +90,11 @@ public class ActionSupport implements Action, Validateable, 
ValidationAware, Tex
 return getLocaleProvider().isValidLocale(locale);
 }
 
+@Override
+public Locale toLocale(String localeStr) {
+return getLocaleProvider().toLocale(localeStr);
+}
+
 @Override
 public boolean hasKey(String key) {
 return getTextProvider().hasKey(key);
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java 
b/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java
index da89306c0..35f16191a 100644
--- a/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java
+++ b/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java
@@ -46,17 +46,23 @@ public class DefaultLocaleProvider implements 
LocaleProvider {
 
 @Override
 public boolean isValidLocaleString(String localeStr) {
+Locale locale = this.toLocale(localeStr);
+return isValidLocale(locale);
+}
+
+@Override
+public boolean isValidLocale(Locale locale) {
+return locale != null && LocaleUtils.isAvailableLocale(locale);
+}
+
+@Override
+public Locale toLocale(String localeStr) {
 Locale locale = null;
 try {
 locale = LocaleUtils.toLocale(StringUtils.trimToNull(localeStr));
 } catch (IllegalArgumentException e) {
 LOG.warn(new ParameterizedMessage("Cannot convert [{}] to proper 
locale", localeStr), e);
 }
-return isValidLocale(locale);
-}
-
-@Override
-public boolean isValidLocale(Locale locale) {
-return LocaleUtils.isAvailableLocale(locale);
+return locale;
 }
 }
diff --git a/core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java 
b/core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java
index 67972af34..00a41a25b 100644
--- a/core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java
+++ b/core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java
@@ -18,6 +18,9 @@
  */
 package com.opensymphony.xwork2;
 
+import org.apache.commons.lang3.LocaleUtils;
+import org.apache.commons.lang3.StringUtils;
+
 import java.util.Locale;
 
 
@@ -58,4 +61,17 @@ public interface LocaleProvider {
  */
 boolean isValidLocale(Locale locale);
 
+/**
+ * Tries to convert provided locale string into {@link Locale} or returns 
null
+ * @param localeStr a String representing locale, e.g.: en_EN
+ * @return instance of {@link Locale} or null
+ * @since Struts 6.5.0
+ */
+default Locale toLocale(String localeStr) {
+try {
+return LocaleUtils.toLocale(StringUtils.trimToNull(localeStr));
+} catch (IllegalArgumentException e) {
+return null;
+}
+}
 }
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
 
b/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
index 5c7f2c136..bc8c88875 100644
--- 
a/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
+++ 
b/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
@@ -122,10 +122,15 @@ public class DelegatingValidatorContext implements 
ValidatorContext {
 return localeProvider.isValidLocale(locale);
 }
 
+@Override
+public Locale toLocale(String localeStr) {
+return localeProvider.toLocale(localeStr);
+}
+
 public boolean hasKey(String key) {
return textProvider.hasKey(key);
 }
-
+
 public String getText(String aTextName) {
 return textProvider.getText(aTextName);
 }
@@ -280,6 +285,11 @@ public class DelegatingValidatorContext implements 
ValidatorContext {
 

(struts) branch fix/WW-5422-trimable updated (67eb1aac4 -> 38d11f4b4)

[lukaszlenart]

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

lukaszlenart pushed a change to branch fix/WW-5422-trimable
in repository https://gitbox.apache.org/repos/asf/struts.git


 discard 67eb1aac4 WW-5422 Adds dedicate unit test to cover 
DefaultLocaleProvider
 new 38d11f4b4 WW-5422 Adds dedicate unit test to cover 
DefaultLocaleProvider

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (67eb1aac4)
\
 N -- N -- N   refs/heads/fix/WW-5422-trimable (38d11f4b4)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

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/DefaultLocaleProviderTest.java| 20 +++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(struts) 01/01: WW-5422 Adds dedicate unit test to cover DefaultLocaleProvider

[lukaszlenart]

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

lukaszlenart pushed a commit to branch fix/WW-5422-trimable
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 67eb1aac4a45f753bc179d7e1990df02142a3edd
Author: Lukasz Lenart 
AuthorDate: Sat May 11 07:23:22 2024 +0200

WW-5422 Adds dedicate unit test to cover DefaultLocaleProvider
---
 .../com/opensymphony/xwork2/ActionSupport.java |   5 +
 .../opensymphony/xwork2/DefaultLocaleProvider.java |  18 ++-
 .../com/opensymphony/xwork2/LocaleProvider.java|  16 +++
 .../validator/DelegatingValidatorContext.java  |  12 +-
 .../struts2/interceptor/I18nInterceptor.java   |  25 ++--
 .../xwork2/DefaultLocaleProviderTest.java  | 156 +
 .../struts2/interceptor/I18nInterceptorTest.java   |  20 +++
 7 files changed, 229 insertions(+), 23 deletions(-)

diff --git a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java 
b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
index 8c7e15e60..ab1a18099 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
@@ -90,6 +90,11 @@ public class ActionSupport implements Action, Validateable, 
ValidationAware, Tex
 return getLocaleProvider().isValidLocale(locale);
 }
 
+@Override
+public Locale toLocale(String localeStr) {
+return getLocaleProvider().toLocale(localeStr);
+}
+
 @Override
 public boolean hasKey(String key) {
 return getTextProvider().hasKey(key);
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java 
b/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java
index da89306c0..35f16191a 100644
--- a/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java
+++ b/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java
@@ -46,17 +46,23 @@ public class DefaultLocaleProvider implements 
LocaleProvider {
 
 @Override
 public boolean isValidLocaleString(String localeStr) {
+Locale locale = this.toLocale(localeStr);
+return isValidLocale(locale);
+}
+
+@Override
+public boolean isValidLocale(Locale locale) {
+return locale != null && LocaleUtils.isAvailableLocale(locale);
+}
+
+@Override
+public Locale toLocale(String localeStr) {
 Locale locale = null;
 try {
 locale = LocaleUtils.toLocale(StringUtils.trimToNull(localeStr));
 } catch (IllegalArgumentException e) {
 LOG.warn(new ParameterizedMessage("Cannot convert [{}] to proper 
locale", localeStr), e);
 }
-return isValidLocale(locale);
-}
-
-@Override
-public boolean isValidLocale(Locale locale) {
-return LocaleUtils.isAvailableLocale(locale);
+return locale;
 }
 }
diff --git a/core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java 
b/core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java
index 67972af34..00a41a25b 100644
--- a/core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java
+++ b/core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java
@@ -18,6 +18,9 @@
  */
 package com.opensymphony.xwork2;
 
+import org.apache.commons.lang3.LocaleUtils;
+import org.apache.commons.lang3.StringUtils;
+
 import java.util.Locale;
 
 
@@ -58,4 +61,17 @@ public interface LocaleProvider {
  */
 boolean isValidLocale(Locale locale);
 
+/**
+ * Tries to convert provided locale string into {@link Locale} or returns 
null
+ * @param localeStr a String representing locale, e.g.: en_EN
+ * @return instance of {@link Locale} or null
+ * @since Struts 6.5.0
+ */
+default Locale toLocale(String localeStr) {
+try {
+return LocaleUtils.toLocale(StringUtils.trimToNull(localeStr));
+} catch (IllegalArgumentException e) {
+return null;
+}
+}
 }
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
 
b/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
index 5c7f2c136..bc8c88875 100644
--- 
a/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
+++ 
b/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
@@ -122,10 +122,15 @@ public class DelegatingValidatorContext implements 
ValidatorContext {
 return localeProvider.isValidLocale(locale);
 }
 
+@Override
+public Locale toLocale(String localeStr) {
+return localeProvider.toLocale(localeStr);
+}
+
 public boolean hasKey(String key) {
return textProvider.hasKey(key);
 }
-
+
 public String getText(String aTextName) {
 return textProvider.getText(aTextName);
 }
@@ -280,6 +285,11 @@ public class DelegatingValidatorContext implements 
ValidatorContext {
 

(struts) branch fix/WW-5422-trimable updated (3e3111c74 -> 67eb1aac4)

[lukaszlenart]

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

lukaszlenart pushed a change to branch fix/WW-5422-trimable
in repository https://gitbox.apache.org/repos/asf/struts.git


omit 3e3111c74 WW-5422 Fixes support for trimable locale string in request
 new 67eb1aac4 WW-5422 Adds dedicate unit test to cover 
DefaultLocaleProvider

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (3e3111c74)
\
 N -- N -- N   refs/heads/fix/WW-5422-trimable (67eb1aac4)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

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:
 .../opensymphony/xwork2/DefaultLocaleProvider.java |   9 +-
 .../xwork2/DefaultLocaleProviderTest.java  | 156 +
 2 files changed, 158 insertions(+), 7 deletions(-)
 create mode 100644 
core/src/test/java/com/opensymphony/xwork2/DefaultLocaleProviderTest.java

(struts) branch dependabot/github_actions/ossf/scorecard-action-2.3.3 deleted (was 039c5f8d4)

[lukaszlenart]

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

lukaszlenart pushed a change to branch 
dependabot/github_actions/ossf/scorecard-action-2.3.3
in repository https://gitbox.apache.org/repos/asf/struts.git


 was 039c5f8d4 Bump ossf/scorecard-action from 2.3.1 to 2.3.3

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) 01/01: Merge pull request #939 from apache/dependabot/github_actions/ossf/scorecard-action-2.3.3

[lukaszlenart]

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 195b0e59d00e0c9451fb19dd44f0a1a79e1aeaea
Merge: 03126c01b 039c5f8d4
Author: Lukasz Lenart 
AuthorDate: Mon May 13 06:50:39 2024 +0200

Merge pull request #939 from 
apache/dependabot/github_actions/ossf/scorecard-action-2.3.3

Bump ossf/scorecard-action from 2.3.1 to 2.3.3

 .github/workflows/scorecards-analysis.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts) branch master updated (03126c01b -> 195b0e59d)

[lukaszlenart]

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 03126c01b Merge pull request #938 from 
apache/dependabot/maven/org.apache.maven.plugins-maven-project-info-reports-plugin-3.5.0
 add 039c5f8d4 Bump ossf/scorecard-action from 2.3.1 to 2.3.3
 new 195b0e59d Merge pull request #939 from 
apache/dependabot/github_actions/ossf/scorecard-action-2.3.3

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:
 .github/workflows/scorecards-analysis.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts) branch dependabot/maven/org.apache.maven.plugins-maven-project-info-reports-plugin-3.5.0 deleted (was 6e12c25ac)

[lukaszlenart]

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

lukaszlenart pushed a change to branch 
dependabot/maven/org.apache.maven.plugins-maven-project-info-reports-plugin-3.5.0
in repository https://gitbox.apache.org/repos/asf/struts.git


 was 6e12c25ac Bump 
org.apache.maven.plugins:maven-project-info-reports-plugin

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 master updated (73be382a9 -> 03126c01b)

[lukaszlenart]

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 73be382a9 Merge pull request #936 from 
apache/dependabot/maven/slf4j.version-2.0.13
 add 6e12c25ac Bump 
org.apache.maven.plugins:maven-project-info-reports-plugin
 new 03126c01b Merge pull request #938 from 
apache/dependabot/maven/org.apache.maven.plugins-maven-project-info-reports-plugin-3.5.0

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:
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts) 01/01: Merge pull request #938 from apache/dependabot/maven/org.apache.maven.plugins-maven-project-info-reports-plugin-3.5.0

[lukaszlenart]

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 03126c01bfd07c88f0594275b1dd1b5d73ba8ea1
Merge: 73be382a9 6e12c25ac
Author: Lukasz Lenart 
AuthorDate: Mon May 13 06:50:20 2024 +0200

Merge pull request #938 from 
apache/dependabot/maven/org.apache.maven.plugins-maven-project-info-reports-plugin-3.5.0

Bump org.apache.maven.plugins:maven-project-info-reports-plugin from 3.0.0 
to 3.5.0

 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts) branch dependabot/maven/ognl-ognl-3.4.3 deleted (was f3108a438)

[lukaszlenart]

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

lukaszlenart pushed a change to branch dependabot/maven/ognl-ognl-3.4.3
in repository https://gitbox.apache.org/repos/asf/struts.git


 was f3108a438 Bump ognl:ognl from 3.3.5 to 3.4.3

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 dependabot/maven/slf4j.version-2.0.13 deleted (was c6b53d488)

[lukaszlenart]

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

lukaszlenart pushed a change to branch dependabot/maven/slf4j.version-2.0.13
in repository https://gitbox.apache.org/repos/asf/struts.git


 was c6b53d488 Bump slf4j.version from 2.0.12 to 2.0.13

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 master updated (f338fda6d -> 73be382a9)

[lukaszlenart]

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 f338fda6d Merge pull request #934 from 
apache/dependabot/maven/org.apache.maven.plugins-maven-source-plugin-3.3.1
 add c6b53d488 Bump slf4j.version from 2.0.12 to 2.0.13
 new 73be382a9 Merge pull request #936 from 
apache/dependabot/maven/slf4j.version-2.0.13

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:
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts) 01/01: Merge pull request #936 from apache/dependabot/maven/slf4j.version-2.0.13

[lukaszlenart]

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 73be382a96ac24fe3c3f8e314d74c45fa412f54a
Merge: f338fda6d c6b53d488
Author: Lukasz Lenart 
AuthorDate: Mon May 13 06:49:43 2024 +0200

Merge pull request #936 from apache/dependabot/maven/slf4j.version-2.0.13

Bump slf4j.version from 2.0.12 to 2.0.13

 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts) branch dependabot/maven/spring.platformVersion-6.1.6 deleted (was 04fa3f015)

[lukaszlenart]

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

lukaszlenart pushed a change to branch 
dependabot/maven/spring.platformVersion-6.1.6
in repository https://gitbox.apache.org/repos/asf/struts.git


 was 04fa3f015 Bump spring.platformVersion from 5.3.31 to 6.1.6

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 dependabot/maven/org.apache.maven.plugins-maven-source-plugin-3.3.1 deleted (was 942fbd67e)

[lukaszlenart]

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

lukaszlenart pushed a change to branch 
dependabot/maven/org.apache.maven.plugins-maven-source-plugin-3.3.1
in repository https://gitbox.apache.org/repos/asf/struts.git


 was 942fbd67e Bump org.apache.maven.plugins:maven-source-plugin from 3.3.0 
to 3.3.1

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 master updated (649760d8b -> f338fda6d)

[lukaszlenart]

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 649760d8b Merge pull request #913 from eschulma/master
 add 942fbd67e Bump org.apache.maven.plugins:maven-source-plugin from 3.3.0 
to 3.3.1
 add f338fda6d Merge pull request #934 from 
apache/dependabot/maven/org.apache.maven.plugins-maven-source-plugin-3.3.1

No new revisions were added by this update.

Summary of changes:
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts) 01/01: WW-5415 Fixes accessing public constructors via expression

[lukaszlenart]

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

lukaszlenart pushed a commit to branch fix/WW-5415-constructor
in repository https://gitbox.apache.org/repos/asf/struts.git

commit b36e88ff4b2810776854041dc1e71fd95228aef5
Author: Lukasz Lenart 
AuthorDate: Sun May 12 09:47:38 2024 +0200

WW-5415 Fixes accessing public constructors via expression
---
 .../com/opensymphony/xwork2/ognl/SecurityMemberAccess.java|  2 +-
 .../xwork2/validator/VisitorFieldValidatorTest.java   | 11 +++
 .../xwork2/validator/VisitorValidatorTestAction.java  | 11 ++-
 .../validator/VisitorValidatorTestAction-validation.xml   |  8 
 4 files changed, 30 insertions(+), 2 deletions(-)

diff --git 
a/core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java 
b/core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
index 43ae99240..8a8c71326 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
@@ -147,7 +147,7 @@ public class SecurityMemberAccess implements MemberAccess {
 if (target != null) {
 // Special case: Target is a Class object but not Class.class
 if (Class.class.equals(target.getClass()) && 
!Class.class.equals(target)) {
-if (!isStatic(member)) {
+if (!isStatic(member) && Arrays.stream(((Class) 
target).getConstructors()).noneMatch(p -> 
p.getClass().equals(member.getClass( {
 throw new IllegalArgumentException("Member expected to be 
static!");
 }
 if (!member.getDeclaringClass().equals(target)) {
diff --git 
a/core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java
 
b/core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java
index 76c2eac71..de605d2c5 100644
--- 
a/core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java
+++ 
b/core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java
@@ -28,6 +28,8 @@ import com.opensymphony.xwork2.config.entities.ActionConfig;
 import com.opensymphony.xwork2.conversion.impl.ConversionData;
 import org.easymock.EasyMock;
 
+import java.sql.Date;
+import java.time.LocalDate;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
@@ -142,6 +144,15 @@ public class VisitorFieldValidatorTest extends 
XWorkTestCase {
 assertEquals(1, errors.size());
 }
 
+public void testDateValidation() throws Exception {
+action.setBirthday(Date.valueOf(LocalDate.now().minusYears(20)));
+action.setContext("birthday");
+
+validate("birthday");
+
+assertFalse(action.hasFieldErrors());
+}
+
 public void testContextIsOverriddenByContextParamInValidationXML() throws 
Exception {
 validate("visitorValidationAlias");
 assertTrue(action.hasFieldErrors());
diff --git 
a/core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorTestAction.java
 
b/core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorTestAction.java
index 2050726f7..9e672bf48 100644
--- 
a/core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorTestAction.java
+++ 
b/core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorTestAction.java
@@ -22,6 +22,7 @@ import com.opensymphony.xwork2.ActionSupport;
 import com.opensymphony.xwork2.TestBean;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 
@@ -37,7 +38,7 @@ public class VisitorValidatorTestAction extends ActionSupport 
{
 private String context;
 private TestBean bean = new TestBean();
 private TestBean[] testBeanArray;
-
+private Date birthday;
 
 public VisitorValidatorTestAction() {
 testBeanArray = new TestBean[5];
@@ -80,4 +81,12 @@ public class VisitorValidatorTestAction extends 
ActionSupport {
 public List getTestBeanList() {
 return testBeanList;
 }
+
+public Date getBirthday() {
+return birthday;
+}
+
+public void setBirthday(Date birthday) {
+this.birthday = birthday;
+}
 }
diff --git 
a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validation.xml
 
b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validation.xml
index a8de9f705..fb2aa80bf 100644
--- 
a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validation.xml
+++ 
b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validation.xml
@@ -26,4 +26,12 @@
 You must enter a context.
 
 
+
+
+
+
+
+
 

(struts) branch fix/WW-5415-constructor created (now b36e88ff4)

[lukaszlenart]

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

lukaszlenart pushed a change to branch fix/WW-5415-constructor
in repository https://gitbox.apache.org/repos/asf/struts.git


  at b36e88ff4 WW-5415 Fixes accessing public constructors via expression

This branch includes the following new commits:

 new b36e88ff4 WW-5415 Fixes accessing public constructors via expression

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.

(struts) branch feature/WW-5414-after updated (7c271f69d -> 4dfbe0934)

[lukaszlenart]

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

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


 discard 7c271f69d WW-5414 Always call afterInvocation even in case of exception
 new 4dfbe0934 WW-5414 Always call afterInvocation even in case of exception

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (7c271f69d)
\
 N -- N -- N   refs/heads/feature/WW-5414-after (4dfbe0934)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

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:
 .../org/apache/struts2/interceptor/exec/StrutsBackgroundProcess.java | 4 +++-
 .../apache/struts2/interceptor/exec/StrutsBackgroundProcessTest.java | 5 ++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(struts) 01/01: WW-5414 Always call afterInvocation even in case of exception

[lukaszlenart]

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

lukaszlenart pushed a commit to branch feature/WW-5414-after
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 4dfbe093438d8bda9fed71c227416a6ace22c934
Author: Lukasz Lenart 
AuthorDate: Sat May 11 08:23:56 2024 +0200

WW-5414 Always call afterInvocation even in case of exception
---
 core/pom.xml   |  6 +++
 .../interceptor/exec/StrutsBackgroundProcess.java  | 20 ++--
 .../exec/StrutsBackgroundProcessTest.java  | 60 +++---
 pom.xml|  7 +++
 4 files changed, 83 insertions(+), 10 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 8165d191a..4027d37e7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -260,6 +260,12 @@
 test
 
 
+
+org.awaitility
+awaitility
+test
+
+
 
 junit
 junit
diff --git 
a/core/src/main/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcess.java
 
b/core/src/main/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcess.java
index 42237262f..b385c9b8f 100644
--- 
a/core/src/main/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcess.java
+++ 
b/core/src/main/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcess.java
@@ -20,6 +20,8 @@ package org.apache.struts2.interceptor.exec;
 
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionInvocation;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.io.Serializable;
 
@@ -30,6 +32,8 @@ public class StrutsBackgroundProcess implements 
BackgroundProcess, Serializable
 
 private static final long serialVersionUID = 3884464776311686443L;
 
+private static final Logger LOG = 
LogManager.getLogger(StrutsBackgroundProcess.class);
+
 private final String threadName;
 private final int threadPriority;
 
@@ -44,8 +48,8 @@ public class StrutsBackgroundProcess implements 
BackgroundProcess, Serializable
 /**
  * Constructs a background process
  *
- * @param invocation The action invocation
- * @param threadName The name of background thread
+ * @param invocation The action invocation
+ * @param threadName The name of background thread
  * @param threadPriority The priority of background thread
  */
 public StrutsBackgroundProcess(ActionInvocation invocation, String 
threadName, int threadPriority) {
@@ -61,11 +65,19 @@ public class StrutsBackgroundProcess implements 
BackgroundProcess, Serializable
 try {
 beforeInvocation();
 result = invocation.invokeActionOnly();
-afterInvocation();
 } catch (Exception e) {
+LOG.warn("Exception during invokeActionOnly() execution", 
e);
 exception = e;
 } finally {
-  done = true;
+try {
+afterInvocation();
+} catch (Exception ex) {
+if (exception == null) {
+exception = ex;
+}
+LOG.warn("Exception during afterInvocation() 
execution", ex);
+}
+done = true;
 }
 });
 processThread.setName(threadName);
diff --git 
a/core/src/test/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcessTest.java
 
b/core/src/test/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcessTest.java
index 5906c995a..a705c2c7b 100644
--- 
a/core/src/test/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcessTest.java
+++ 
b/core/src/test/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcessTest.java
@@ -26,6 +26,7 @@ import org.apache.struts2.StrutsInternalTestCase;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.NotSerializableException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.security.SecureRandom;
@@ -41,6 +42,8 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  * Test case for BackgroundProcessTest.
  */
@@ -59,9 +62,9 @@ public class StrutsBackgroundProcessTest extends 
StrutsInternalTestCase {
 invocation.setInvocationContext(ActionContext.getContext());
 
 StrutsBackgroundProcess bp = (StrutsBackgroundProcess) new 
StrutsBackgroundProcess(
-invocation,
-"BackgroundProcessTest.testSerializeDeserialize",
-Thread.MIN_PRIORITY
+invocation,
+"BackgroundP

(struts) 01/01: WW-5414 Always call afterInvocation even in case of exception

[lukaszlenart]

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

lukaszlenart pushed a commit to branch feature/WW-5414-after
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 7c271f69db8c4df546b89712c1731e380baefc03
Author: Lukasz Lenart 
AuthorDate: Sat May 11 08:23:56 2024 +0200

WW-5414 Always call afterInvocation even in case of exception
---
 core/pom.xml   |  6 +++
 .../interceptor/exec/StrutsBackgroundProcess.java  | 18 +--
 .../exec/StrutsBackgroundProcessTest.java  | 61 +++---
 pom.xml|  7 +++
 4 files changed, 82 insertions(+), 10 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 8165d191a..4027d37e7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -260,6 +260,12 @@
 test
 
 
+
+org.awaitility
+awaitility
+test
+
+
 
 junit
 junit
diff --git 
a/core/src/main/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcess.java
 
b/core/src/main/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcess.java
index 42237262f..0088ebf2e 100644
--- 
a/core/src/main/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcess.java
+++ 
b/core/src/main/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcess.java
@@ -20,6 +20,8 @@ package org.apache.struts2.interceptor.exec;
 
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionInvocation;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.io.Serializable;
 
@@ -30,6 +32,8 @@ public class StrutsBackgroundProcess implements 
BackgroundProcess, Serializable
 
 private static final long serialVersionUID = 3884464776311686443L;
 
+private static final Logger LOG = 
LogManager.getLogger(StrutsBackgroundProcess.class);
+
 private final String threadName;
 private final int threadPriority;
 
@@ -44,8 +48,8 @@ public class StrutsBackgroundProcess implements 
BackgroundProcess, Serializable
 /**
  * Constructs a background process
  *
- * @param invocation The action invocation
- * @param threadName The name of background thread
+ * @param invocation The action invocation
+ * @param threadName The name of background thread
  * @param threadPriority The priority of background thread
  */
 public StrutsBackgroundProcess(ActionInvocation invocation, String 
threadName, int threadPriority) {
@@ -61,11 +65,17 @@ public class StrutsBackgroundProcess implements 
BackgroundProcess, Serializable
 try {
 beforeInvocation();
 result = invocation.invokeActionOnly();
-afterInvocation();
 } catch (Exception e) {
+LOG.warn("Exception during invokeActionOnly() execution", 
e);
 exception = e;
 } finally {
-  done = true;
+try {
+afterInvocation();
+} catch (Exception ex) {
+exception = ex;
+LOG.warn("Exception during afterInvocation() 
execution", ex);
+}
+done = true;
 }
 });
 processThread.setName(threadName);
diff --git 
a/core/src/test/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcessTest.java
 
b/core/src/test/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcessTest.java
index 5906c995a..a350d3021 100644
--- 
a/core/src/test/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcessTest.java
+++ 
b/core/src/test/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcessTest.java
@@ -41,6 +41,8 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  * Test case for BackgroundProcessTest.
  */
@@ -59,9 +61,9 @@ public class StrutsBackgroundProcessTest extends 
StrutsInternalTestCase {
 invocation.setInvocationContext(ActionContext.getContext());
 
 StrutsBackgroundProcess bp = (StrutsBackgroundProcess) new 
StrutsBackgroundProcess(
-invocation,
-"BackgroundProcessTest.testSerializeDeserialize",
-Thread.MIN_PRIORITY
+invocation,
+"BackgroundProcessTest.testSerializeDeserialize",
+Thread.MIN_PRIORITY
 ).prepare();
 executor.execute(bp);
 
@@ -120,6 +122,33 @@ public class StrutsBackgroundProcessTest extends 
StrutsInternalTestCase {
 assertEquals(100, mutableState.get());
 }
 
+public void testErrorableProcesses1() {
+MockActionInvo

(struts) branch feature/WW-5414-after updated (32f9b68c9 -> 7c271f69d)

[lukaszlenart]

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

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


 discard 32f9b68c9 WW-5414 Always call afterInvocation even in case of exception
 new 7c271f69d WW-5414 Always call afterInvocation even in case of exception

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (32f9b68c9)
\
 N -- N -- N   refs/heads/feature/WW-5414-after (7c271f69d)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

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:
 core/pom.xml  |  6 ++
 .../interceptor/exec/StrutsBackgroundProcess.java |  1 -
 .../interceptor/exec/StrutsBackgroundProcessTest.java | 19 ---
 pom.xml   |  7 +++
 4 files changed, 21 insertions(+), 12 deletions(-)

(struts) 01/01: WW-5414 Always call afterInvocation even in case of exception

[lukaszlenart]

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

lukaszlenart pushed a commit to branch feature/WW-5414-after
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 32f9b68c94ebe21f814962206e45ff8907a6105b
Author: Lukasz Lenart 
AuthorDate: Sat May 11 08:23:56 2024 +0200

WW-5414 Always call afterInvocation even in case of exception
---
 .../interceptor/exec/StrutsBackgroundProcess.java  | 19 +--
 .../exec/StrutsBackgroundProcessTest.java  | 58 --
 2 files changed, 70 insertions(+), 7 deletions(-)

diff --git 
a/core/src/main/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcess.java
 
b/core/src/main/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcess.java
index 42237262f..3eb7c230f 100644
--- 
a/core/src/main/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcess.java
+++ 
b/core/src/main/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcess.java
@@ -20,8 +20,11 @@ package org.apache.struts2.interceptor.exec;
 
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionInvocation;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.io.Serializable;
+import java.util.concurrent.ExecutionException;
 
 /**
  * Background thread to be executed by the ExecuteAndWaitInterceptor.
@@ -30,6 +33,8 @@ public class StrutsBackgroundProcess implements 
BackgroundProcess, Serializable
 
 private static final long serialVersionUID = 3884464776311686443L;
 
+private static final Logger LOG = 
LogManager.getLogger(StrutsBackgroundProcess.class);
+
 private final String threadName;
 private final int threadPriority;
 
@@ -44,8 +49,8 @@ public class StrutsBackgroundProcess implements 
BackgroundProcess, Serializable
 /**
  * Constructs a background process
  *
- * @param invocation The action invocation
- * @param threadName The name of background thread
+ * @param invocation The action invocation
+ * @param threadName The name of background thread
  * @param threadPriority The priority of background thread
  */
 public StrutsBackgroundProcess(ActionInvocation invocation, String 
threadName, int threadPriority) {
@@ -61,11 +66,17 @@ public class StrutsBackgroundProcess implements 
BackgroundProcess, Serializable
 try {
 beforeInvocation();
 result = invocation.invokeActionOnly();
-afterInvocation();
 } catch (Exception e) {
+LOG.warn("Exception during invokeActionOnly() execution", 
e);
 exception = e;
 } finally {
-  done = true;
+try {
+afterInvocation();
+} catch (Exception ex) {
+exception = ex;
+LOG.warn("Exception during afterInvocation() 
execution", ex);
+}
+done = true;
 }
 });
 processThread.setName(threadName);
diff --git 
a/core/src/test/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcessTest.java
 
b/core/src/test/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcessTest.java
index 5906c995a..bfcfbf175 100644
--- 
a/core/src/test/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcessTest.java
+++ 
b/core/src/test/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcessTest.java
@@ -59,9 +59,9 @@ public class StrutsBackgroundProcessTest extends 
StrutsInternalTestCase {
 invocation.setInvocationContext(ActionContext.getContext());
 
 StrutsBackgroundProcess bp = (StrutsBackgroundProcess) new 
StrutsBackgroundProcess(
-invocation,
-"BackgroundProcessTest.testSerializeDeserialize",
-Thread.MIN_PRIORITY
+invocation,
+"BackgroundProcessTest.testSerializeDeserialize",
+Thread.MIN_PRIORITY
 ).prepare();
 executor.execute(bp);
 
@@ -120,6 +120,33 @@ public class StrutsBackgroundProcessTest extends 
StrutsInternalTestCase {
 assertEquals(100, mutableState.get());
 }
 
+public void testErrorableProcesses1() throws InterruptedException {
+MockActionInvocationWithActionInvoker invocation = new 
MockActionInvocationWithActionInvoker(() -> {
+throw new IllegalStateException("boom");
+});
+
+BackgroundProcess bp = new ErrorableBackgroundProcess(invocation, 
null).prepare();
+executor.execute(bp);
+
+Thread.sleep(100);
+
+assertTrue("afterInvocation not called in case of exception", 
((ErrorableBackgroundProcess) bp).isDoneAfter());
+}
+
+public void testErrorableProcesses2() throws InterruptedException {

(struts) branch feature/WW-5414-after updated (0141068ff -> 32f9b68c9)

[lukaszlenart]

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

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


 discard 0141068ff WW-5414 Always call afterInvocation even in case of exception
 new 32f9b68c9 WW-5414 Always call afterInvocation even in case of exception

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (0141068ff)
\
 N -- N -- N   refs/heads/feature/WW-5414-after (32f9b68c9)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

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:
 .../interceptor/exec/StrutsBackgroundProcess.java  |  7 ++--
 .../exec/StrutsBackgroundProcessTest.java  | 38 +-
 2 files changed, 34 insertions(+), 11 deletions(-)

(struts) 01/01: WW-5414 Always call afterInvocation even in case of exception

[lukaszlenart]

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

lukaszlenart pushed a commit to branch feature/WW-5414-after
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 0141068ff4a5e0c32441fe9895717e88fbf2521b
Author: Lukasz Lenart 
AuthorDate: Sat May 11 08:23:56 2024 +0200

WW-5414 Always call afterInvocation even in case of exception
---
 .../interceptor/exec/StrutsBackgroundProcess.java  | 16 ---
 .../exec/StrutsBackgroundProcessTest.java  | 32 ++
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git 
a/core/src/main/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcess.java
 
b/core/src/main/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcess.java
index 42237262f..dce78730c 100644
--- 
a/core/src/main/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcess.java
+++ 
b/core/src/main/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcess.java
@@ -20,6 +20,8 @@ package org.apache.struts2.interceptor.exec;
 
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionInvocation;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.io.Serializable;
 
@@ -30,6 +32,8 @@ public class StrutsBackgroundProcess implements 
BackgroundProcess, Serializable
 
 private static final long serialVersionUID = 3884464776311686443L;
 
+private static final Logger LOG = 
LogManager.getLogger(StrutsBackgroundProcess.class);
+
 private final String threadName;
 private final int threadPriority;
 
@@ -44,8 +48,8 @@ public class StrutsBackgroundProcess implements 
BackgroundProcess, Serializable
 /**
  * Constructs a background process
  *
- * @param invocation The action invocation
- * @param threadName The name of background thread
+ * @param invocation The action invocation
+ * @param threadName The name of background thread
  * @param threadPriority The priority of background thread
  */
 public StrutsBackgroundProcess(ActionInvocation invocation, String 
threadName, int threadPriority) {
@@ -61,11 +65,15 @@ public class StrutsBackgroundProcess implements 
BackgroundProcess, Serializable
 try {
 beforeInvocation();
 result = invocation.invokeActionOnly();
-afterInvocation();
 } catch (Exception e) {
+try {
+afterInvocation();
+} catch (Exception ex) {
+LOG.warn("Exception during afterInvocation() 
execution", ex);
+}
 exception = e;
 } finally {
-  done = true;
+done = true;
 }
 });
 processThread.setName(threadName);
diff --git 
a/core/src/test/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcessTest.java
 
b/core/src/test/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcessTest.java
index 5906c995a..1e0166951 100644
--- 
a/core/src/test/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcessTest.java
+++ 
b/core/src/test/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcessTest.java
@@ -120,6 +120,19 @@ public class StrutsBackgroundProcessTest extends 
StrutsInternalTestCase {
 assertEquals(100, mutableState.get());
 }
 
+public void testErrorableProcesses() throws InterruptedException {
+MockActionInvocationWithActionInvoker invocation = new 
MockActionInvocationWithActionInvoker(() -> {
+throw new IllegalStateException("boom");
+});
+
+BackgroundProcess bp = new ErrorableBackgroundProcess(invocation, 
"error").prepare();
+executor.execute(bp);
+
+Thread.sleep(100);
+
+assertTrue("afterInvocation not called in case of exception", 
((ErrorableBackgroundProcess) bp).isDoneAfter());
+}
+
 public void testUnpreparedProcess() throws ExecutionException, 
InterruptedException, TimeoutException {
 // given
 MockActionInvocationWithActionInvoker invocation = new 
MockActionInvocationWithActionInvoker(() -> "done");
@@ -177,3 +190,22 @@ class LockBackgroundProcess extends 
StrutsBackgroundProcess {
 lock.notify();
 }
 }
+
+class ErrorableBackgroundProcess extends StrutsBackgroundProcess {
+
+private boolean doneAfter;
+
+public ErrorableBackgroundProcess(ActionInvocation invocation, String 
name) {
+super(invocation, name, Thread.NORM_PRIORITY);
+}
+
+@Override
+protected void afterInvocation() throws Exception {
+super.afterInvocation();
+doneAfter = true;
+}
+
+public boolean isDoneAfter() {
+return doneAfter;
+}
+}

(struts) branch feature/WW-5414-after created (now 0141068ff)

[lukaszlenart]

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

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


  at 0141068ff WW-5414 Always call afterInvocation even in case of exception

This branch includes the following new commits:

 new 0141068ff WW-5414 Always call afterInvocation even in case of exception

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.

(struts) branch fix/WW-5422-trimable updated (627f27a04 -> 3e3111c74)

[lukaszlenart]

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

lukaszlenart pushed a change to branch fix/WW-5422-trimable
in repository https://gitbox.apache.org/repos/asf/struts.git


 discard 627f27a04 WW-5422 Fixes support for trimable locale string in request
 new 3e3111c74 WW-5422 Fixes support for trimable locale string in request

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (627f27a04)
\
 N -- N -- N   refs/heads/fix/WW-5422-trimable (3e3111c74)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

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:
 .../org/apache/struts2/interceptor/I18nInterceptorTest.java  | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(struts) 01/01: WW-5422 Fixes support for trimable locale string in request

[lukaszlenart]

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

lukaszlenart pushed a commit to branch fix/WW-5422-trimable
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 3e3111c746205ecf2754d07141ae209f479c4790
Author: Lukasz Lenart 
AuthorDate: Sat May 11 07:23:22 2024 +0200

WW-5422 Fixes support for trimable locale string in request
---
 .../com/opensymphony/xwork2/ActionSupport.java |  5 +
 .../opensymphony/xwork2/DefaultLocaleProvider.java | 13 ++-
 .../com/opensymphony/xwork2/LocaleProvider.java| 16 ++
 .../validator/DelegatingValidatorContext.java  | 12 ++-
 .../struts2/interceptor/I18nInterceptor.java   | 25 --
 .../struts2/interceptor/I18nInterceptorTest.java   | 20 +
 6 files changed, 73 insertions(+), 18 deletions(-)

diff --git a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java 
b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
index 8c7e15e60..ab1a18099 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
@@ -90,6 +90,11 @@ public class ActionSupport implements Action, Validateable, 
ValidationAware, Tex
 return getLocaleProvider().isValidLocale(locale);
 }
 
+@Override
+public Locale toLocale(String localeStr) {
+return getLocaleProvider().toLocale(localeStr);
+}
+
 @Override
 public boolean hasKey(String key) {
 return getTextProvider().hasKey(key);
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java 
b/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java
index da89306c0..18dd119dc 100644
--- a/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java
+++ b/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java
@@ -48,7 +48,7 @@ public class DefaultLocaleProvider implements LocaleProvider {
 public boolean isValidLocaleString(String localeStr) {
 Locale locale = null;
 try {
-locale = LocaleUtils.toLocale(StringUtils.trimToNull(localeStr));
+locale = LocaleUtils.toLocale(localeStr);
 } catch (IllegalArgumentException e) {
 LOG.warn(new ParameterizedMessage("Cannot convert [{}] to proper 
locale", localeStr), e);
 }
@@ -59,4 +59,15 @@ public class DefaultLocaleProvider implements LocaleProvider 
{
 public boolean isValidLocale(Locale locale) {
 return LocaleUtils.isAvailableLocale(locale);
 }
+
+@Override
+public Locale toLocale(String localeStr) {
+Locale locale = null;
+try {
+locale = LocaleUtils.toLocale(StringUtils.trimToNull(localeStr));
+} catch (IllegalArgumentException e) {
+LOG.warn(new ParameterizedMessage("Cannot convert [{}] to proper 
locale", localeStr), e);
+}
+return locale;
+}
 }
diff --git a/core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java 
b/core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java
index 67972af34..00a41a25b 100644
--- a/core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java
+++ b/core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java
@@ -18,6 +18,9 @@
  */
 package com.opensymphony.xwork2;
 
+import org.apache.commons.lang3.LocaleUtils;
+import org.apache.commons.lang3.StringUtils;
+
 import java.util.Locale;
 
 
@@ -58,4 +61,17 @@ public interface LocaleProvider {
  */
 boolean isValidLocale(Locale locale);
 
+/**
+ * Tries to convert provided locale string into {@link Locale} or returns 
null
+ * @param localeStr a String representing locale, e.g.: en_EN
+ * @return instance of {@link Locale} or null
+ * @since Struts 6.5.0
+ */
+default Locale toLocale(String localeStr) {
+try {
+return LocaleUtils.toLocale(StringUtils.trimToNull(localeStr));
+} catch (IllegalArgumentException e) {
+return null;
+}
+}
 }
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
 
b/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
index 5c7f2c136..bc8c88875 100644
--- 
a/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
+++ 
b/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
@@ -122,10 +122,15 @@ public class DelegatingValidatorContext implements 
ValidatorContext {
 return localeProvider.isValidLocale(locale);
 }
 
+@Override
+public Locale toLocale(String localeStr) {
+return localeProvider.toLocale(localeStr);
+}
+
 public boolean hasKey(String key) {
return textProvider.hasKey(key);
 }
-
+
 public String getText(String aTextName) {
 return textProvider.getText(aTextName);
 }
@@ -280,6 +28

(struts) branch fix/WW-5422-trimable created (now 627f27a04)

[lukaszlenart]

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

lukaszlenart pushed a change to branch fix/WW-5422-trimable
in repository https://gitbox.apache.org/repos/asf/struts.git


  at 627f27a04 WW-5422 Fixes support for trimable locale string in request

This branch includes the following new commits:

 new 627f27a04 WW-5422 Fixes support for trimable locale string in request

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.

(struts) 01/01: WW-5422 Fixes support for trimable locale string in request

[lukaszlenart]

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

lukaszlenart pushed a commit to branch fix/WW-5422-trimable
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 627f27a040e3689c39a474a85332fb7b9eb05579
Author: Lukasz Lenart 
AuthorDate: Sat May 11 07:23:22 2024 +0200

WW-5422 Fixes support for trimable locale string in request
---
 .../com/opensymphony/xwork2/ActionSupport.java |  5 +
 .../opensymphony/xwork2/DefaultLocaleProvider.java | 13 ++-
 .../com/opensymphony/xwork2/LocaleProvider.java| 16 ++
 .../validator/DelegatingValidatorContext.java  | 12 ++-
 .../struts2/interceptor/I18nInterceptor.java   | 25 --
 .../struts2/interceptor/I18nInterceptorTest.java   | 10 +
 6 files changed, 63 insertions(+), 18 deletions(-)

diff --git a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java 
b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
index 8c7e15e60..ab1a18099 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
@@ -90,6 +90,11 @@ public class ActionSupport implements Action, Validateable, 
ValidationAware, Tex
 return getLocaleProvider().isValidLocale(locale);
 }
 
+@Override
+public Locale toLocale(String localeStr) {
+return getLocaleProvider().toLocale(localeStr);
+}
+
 @Override
 public boolean hasKey(String key) {
 return getTextProvider().hasKey(key);
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java 
b/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java
index da89306c0..18dd119dc 100644
--- a/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java
+++ b/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java
@@ -48,7 +48,7 @@ public class DefaultLocaleProvider implements LocaleProvider {
 public boolean isValidLocaleString(String localeStr) {
 Locale locale = null;
 try {
-locale = LocaleUtils.toLocale(StringUtils.trimToNull(localeStr));
+locale = LocaleUtils.toLocale(localeStr);
 } catch (IllegalArgumentException e) {
 LOG.warn(new ParameterizedMessage("Cannot convert [{}] to proper 
locale", localeStr), e);
 }
@@ -59,4 +59,15 @@ public class DefaultLocaleProvider implements LocaleProvider 
{
 public boolean isValidLocale(Locale locale) {
 return LocaleUtils.isAvailableLocale(locale);
 }
+
+@Override
+public Locale toLocale(String localeStr) {
+Locale locale = null;
+try {
+locale = LocaleUtils.toLocale(StringUtils.trimToNull(localeStr));
+} catch (IllegalArgumentException e) {
+LOG.warn(new ParameterizedMessage("Cannot convert [{}] to proper 
locale", localeStr), e);
+}
+return locale;
+}
 }
diff --git a/core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java 
b/core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java
index 67972af34..00a41a25b 100644
--- a/core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java
+++ b/core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java
@@ -18,6 +18,9 @@
  */
 package com.opensymphony.xwork2;
 
+import org.apache.commons.lang3.LocaleUtils;
+import org.apache.commons.lang3.StringUtils;
+
 import java.util.Locale;
 
 
@@ -58,4 +61,17 @@ public interface LocaleProvider {
  */
 boolean isValidLocale(Locale locale);
 
+/**
+ * Tries to convert provided locale string into {@link Locale} or returns 
null
+ * @param localeStr a String representing locale, e.g.: en_EN
+ * @return instance of {@link Locale} or null
+ * @since Struts 6.5.0
+ */
+default Locale toLocale(String localeStr) {
+try {
+return LocaleUtils.toLocale(StringUtils.trimToNull(localeStr));
+} catch (IllegalArgumentException e) {
+return null;
+}
+}
 }
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
 
b/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
index 5c7f2c136..bc8c88875 100644
--- 
a/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
+++ 
b/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
@@ -122,10 +122,15 @@ public class DelegatingValidatorContext implements 
ValidatorContext {
 return localeProvider.isValidLocale(locale);
 }
 
+@Override
+public Locale toLocale(String localeStr) {
+return localeProvider.toLocale(localeStr);
+}
+
 public boolean hasKey(String key) {
return textProvider.hasKey(key);
 }
-
+
 public String getText(String aTextName) {
 return textProvider.getText(aTextName);
 }
@@ -280,6 +28

(struts) branch dependabot/maven/javax.portlet-portlet-api-3.0.1 deleted (was aab9a3d43)

[lukaszlenart]

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

lukaszlenart pushed a change to branch 
dependabot/maven/javax.portlet-portlet-api-3.0.1
in repository https://gitbox.apache.org/repos/asf/struts.git


 was aab9a3d43 Bump javax.portlet:portlet-api from 2.0 to 3.0.1

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 dependabot/maven/org.apache.tomcat-tomcat-juli-10.1.23 deleted (was 9de2ef812)

[lukaszlenart]

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

lukaszlenart pushed a change to branch 
dependabot/maven/org.apache.tomcat-tomcat-juli-10.1.23
in repository https://gitbox.apache.org/repos/asf/struts.git


 was 9de2ef812 Bump org.apache.tomcat:tomcat-juli from 8.5.53 to 10.1.23

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 dependabot/maven/org.testng-testng-7.10.2 deleted (was 672f039a2)

[lukaszlenart]

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

lukaszlenart pushed a change to branch dependabot/maven/org.testng-testng-7.10.2
in repository https://gitbox.apache.org/repos/asf/struts.git


 was 672f039a2 Bump org.testng:testng from 7.5.1 to 7.10.2

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 dependabot/maven/org.eclipse.jetty-jetty-maven-plugin-11.0.20 deleted (was 4f8867c00)

[lukaszlenart]

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

lukaszlenart pushed a change to branch 
dependabot/maven/org.eclipse.jetty-jetty-maven-plugin-11.0.20
in repository https://gitbox.apache.org/repos/asf/struts.git


 was 4f8867c00 Bump org.eclipse.jetty:jetty-maven-plugin

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) 01/01: Merge pull request #913 from eschulma/master

[lukaszlenart]

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 649760d8b0d2c481784ba93f7be66ce843b11493
Merge: 49b8eedf1 6ac8b04ad
Author: Lukasz Lenart 
AuthorDate: Sat May 11 06:36:33 2024 +0200

Merge pull request #913 from eschulma/master

WW-5400 Extend default configuration options for the CSP interceptor.

 .../struts2/interceptor/csp/CspInterceptor.java| 52 +-
 .../struts2/interceptor/csp/CspSettings.java   |  8 +++
 .../interceptor/csp/DefaultCspSettings.java| 34 +++--
 .../struts2/interceptor/CspInterceptorTest.java| 83 +++---
 4 files changed, 159 insertions(+), 18 deletions(-)

(struts) branch master updated (49b8eedf1 -> 649760d8b)

[lukaszlenart]

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 49b8eedf1 Merge pull request #920 from apache/fix/WW-5419-tiles
 add 758174c52 WW-5400 Extend default configuration options for the CSP 
interceptor. Previously, it was impossible to set global options for the CSP 
interceptor. The only options was to have every action individually implement 
CspSettingsAware.
 add 0151bdeb9 WW-5400 Better toString formatting
 add 6ac8b04ad WW-5400 Added @since Struts 6.5.0 to new properties as 
requested
 new 649760d8b Merge pull request #913 from eschulma/master

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:
 .../struts2/interceptor/csp/CspInterceptor.java| 52 +-
 .../struts2/interceptor/csp/CspSettings.java   |  8 +++
 .../interceptor/csp/DefaultCspSettings.java| 34 +++--
 .../struts2/interceptor/CspInterceptorTest.java| 83 +++---
 4 files changed, 159 insertions(+), 18 deletions(-)

(struts) branch dependabot/maven/org.apache.felix-org.apache.felix.framework-7.0.5 deleted (was 1ab49d3a0)

[lukaszlenart]

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

lukaszlenart pushed a change to branch 
dependabot/maven/org.apache.felix-org.apache.felix.framework-7.0.5
in repository https://gitbox.apache.org/repos/asf/struts.git


 was 1ab49d3a0 Bump org.apache.felix:org.apache.felix.framework from 6.0.3 
to 7.0.5

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 master updated (c0d1217d7 -> 49b8eedf1)

[lukaszlenart]

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 c0d1217d7 Merge pull request #924 from apache/feature/WW-5420-text
 add a88cb741d WW-5419 Fixes support for loading Tiles definitions
 add 49b8eedf1 Merge pull request #920 from apache/fix/WW-5419-tiles

No new revisions were added by this update.

Summary of changes:
 plugins/tiles/pom.xml  | 10 +++
 .../struts2/tiles/StrutsTilesContainerFactory.java | 16 ++---
 .../StrutsWildcardServletApplicationContext.java   |  9 ++-
 .../tiles/StrutsTilesContainerFactoryTest.java |  9 ++-
 ...trutsWildcardServletApplicationContextTest.java | 79 ++
 .../tiles-defs-2.1_it.xml => WEB-INF/tiles.xml}| 22 +++---
 .../core/config/{defs1.xml => tiles_defs1.xml} |  0
 7 files changed, 116 insertions(+), 29 deletions(-)
 create mode 100644 
plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContextTest.java
 copy 
plugins/tiles/src/test/resources/{org/apache/tiles/core/config/tiles-defs-2.1_it.xml
 => WEB-INF/tiles.xml} (56%)
 copy plugins/tiles/src/test/resources/org/apache/tiles/core/config/{defs1.xml 
=> tiles_defs1.xml} (100%)

(struts) branch fix/WW-5419-tiles deleted (was a88cb741d)

[lukaszlenart]

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

lukaszlenart pushed a change to branch fix/WW-5419-tiles
in repository https://gitbox.apache.org/repos/asf/struts.git


 was a88cb741d WW-5419 Fixes support for loading Tiles definitions

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-examples) branch dependabot/maven/rest-angular/org.springframework-spring-web-6.1.6 deleted (was 06457d9)

[lukaszlenart]

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

lukaszlenart pushed a change to branch 
dependabot/maven/rest-angular/org.springframework-spring-web-6.1.6
in repository https://gitbox.apache.org/repos/asf/struts-examples.git


 was 06457d9  Bump org.springframework:spring-web from 6.1.4 to 6.1.6 in 
/rest-angular

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-examples) 01/01: Merge pull request #348 from apache/dependabot/maven/rest-angular/org.springframework-spring-web-6.1.6

[lukaszlenart]

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-examples.git

commit 72344ad3ae465c37df6a3a5959910c38c4841fca
Merge: 056ba68 06457d9
Author: Lukasz Lenart 
AuthorDate: Mon May 6 09:53:07 2024 +0200

Merge pull request #348 from 
apache/dependabot/maven/rest-angular/org.springframework-spring-web-6.1.6

Bump org.springframework:spring-web from 6.1.4 to 6.1.6 in /rest-angular

(struts-examples) branch master updated (056ba68 -> 72344ad)

[lukaszlenart]

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-examples.git


from 056ba68  Merge pull request #340 from 
apache/dependabot/maven/org.springframework-spring-web-6.1.6
 add 06457d9  Bump org.springframework:spring-web from 6.1.4 to 6.1.6 in 
/rest-angular
 new 72344ad  Merge pull request #348 from 
apache/dependabot/maven/rest-angular/org.springframework-spring-web-6.1.6

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:

(struts-examples) branch dependabot/maven/org.springframework-spring-web-6.1.6 deleted (was eddbf75)

[lukaszlenart]

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

lukaszlenart pushed a change to branch 
dependabot/maven/org.springframework-spring-web-6.1.6
in repository https://gitbox.apache.org/repos/asf/struts-examples.git


 was eddbf75  Bump org.springframework:spring-web from 6.1.4 to 6.1.6

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-examples) branch master updated (4a01f6d -> 056ba68)

[lukaszlenart]

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-examples.git


from 4a01f6d  Merge pull request #339 from 
apache/dependabot/maven/org.slf4j-slf4j-simple-2.0.13
 add eddbf75  Bump org.springframework:spring-web from 6.1.4 to 6.1.6
 new 056ba68  Merge pull request #340 from 
apache/dependabot/maven/org.springframework-spring-web-6.1.6

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:
 rest-angular/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts-examples) 01/01: Merge pull request #340 from apache/dependabot/maven/org.springframework-spring-web-6.1.6

[lukaszlenart]

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-examples.git

commit 056ba686bc80a652234575cf55349a3ca6a1574c
Merge: 4a01f6d eddbf75
Author: Lukasz Lenart 
AuthorDate: Mon May 6 09:46:52 2024 +0200

Merge pull request #340 from 
apache/dependabot/maven/org.springframework-spring-web-6.1.6

Bump org.springframework:spring-web from 6.1.4 to 6.1.6

 rest-angular/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts-examples) branch dependabot/maven/org.slf4j-slf4j-simple-2.0.13 deleted (was d7fc663)

[lukaszlenart]

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

lukaszlenart pushed a change to branch 
dependabot/maven/org.slf4j-slf4j-simple-2.0.13
in repository https://gitbox.apache.org/repos/asf/struts-examples.git


 was d7fc663  Bump org.slf4j:slf4j-simple from 2.0.12 to 2.0.13

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-examples) branch master updated (3793d6d -> 4a01f6d)

[lukaszlenart]

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-examples.git


from 3793d6d  Merge pull request #347 from 
apache/dependabot/maven/io.quarkus-quarkus-universe-bom-3.10.0
 add d7fc663  Bump org.slf4j:slf4j-simple from 2.0.12 to 2.0.13
 add 4a01f6d  Merge pull request #339 from 
apache/dependabot/maven/org.slf4j-slf4j-simple-2.0.13

No new revisions were added by this update.

Summary of changes:
 portlet/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts-examples) branch dependabot/maven/io.quarkus-quarkus-universe-bom-3.10.0 deleted (was d16dc12)

[lukaszlenart]

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

lukaszlenart pushed a change to branch 
dependabot/maven/io.quarkus-quarkus-universe-bom-3.10.0
in repository https://gitbox.apache.org/repos/asf/struts-examples.git


 was d16dc12  Bump io.quarkus:quarkus-universe-bom from 3.7.3 to 3.10.0

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-examples) branch master updated (c8dfabb -> 3793d6d)

[lukaszlenart]

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-examples.git


from c8dfabb  Merge pull request #345 from 
apache/dependabot/github_actions/actions/checkout-4.1.4
 add d16dc12  Bump io.quarkus:quarkus-universe-bom from 3.7.3 to 3.10.0
 add 3793d6d  Merge pull request #347 from 
apache/dependabot/maven/io.quarkus-quarkus-universe-bom-3.10.0

No new revisions were added by this update.

Summary of changes:
 quarkus/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts-examples) branch dependabot/github_actions/actions/checkout-4.1.4 deleted (was f751df7)

[lukaszlenart]

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

lukaszlenart pushed a change to branch 
dependabot/github_actions/actions/checkout-4.1.4
in repository https://gitbox.apache.org/repos/asf/struts-examples.git


 was f751df7  Bump actions/checkout from 4.1.1 to 4.1.4

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-examples) branch master updated (f79be27 -> c8dfabb)

[lukaszlenart]

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-examples.git


from f79be27  Merge pull request #336 from 
apache/dependabot/github_actions/actions/cache-4.0.2
 add f751df7  Bump actions/checkout from 4.1.1 to 4.1.4
 add c8dfabb  Merge pull request #345 from 
apache/dependabot/github_actions/actions/checkout-4.1.4

No new revisions were added by this update.

Summary of changes:
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts-examples) branch master updated (74045bd -> f79be27)

[lukaszlenart]

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-examples.git


from 74045bd  Merge pull request #327 from 
apache/dependabot/maven/shiro.version-2.0.0
 add 2be5be5  Bump actions/cache from 4.0.0 to 4.0.2
 add f79be27  Merge pull request #336 from 
apache/dependabot/github_actions/actions/cache-4.0.2

No new revisions were added by this update.

Summary of changes:
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts-examples) branch dependabot/github_actions/actions/cache-4.0.2 deleted (was 2be5be5)

[lukaszlenart]

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

lukaszlenart pushed a change to branch 
dependabot/github_actions/actions/cache-4.0.2
in repository https://gitbox.apache.org/repos/asf/struts-examples.git


 was 2be5be5  Bump actions/cache from 4.0.0 to 4.0.2

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-examples) branch master updated (d16600b -> 74045bd)

[lukaszlenart]

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-examples.git


from d16600b  Merge pull request #331 from 
apache/dependabot/maven/log4j2.version-2.23.1
 add 7028728  Bump shiro.version from 1.13.0 to 2.0.0
 add 74045bd  Merge pull request #327 from 
apache/dependabot/maven/shiro.version-2.0.0

No new revisions were added by this update.

Summary of changes:
 shiro-basic/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts-examples) branch master updated (542ab9e -> d16600b)

[lukaszlenart]

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-examples.git


from 542ab9e  Merge pull request #346 from fp024/dev-2024-05-03
 add 22d065e  Bump log4j2.version from 2.22.1 to 2.23.1
 add d16600b  Merge pull request #331 from 
apache/dependabot/maven/log4j2.version-2.23.1

No new revisions were added by this update.

Summary of changes:
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts-examples) branch dependabot/maven/shiro.version-2.0.0 deleted (was 7028728)

[lukaszlenart]

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

lukaszlenart pushed a change to branch dependabot/maven/shiro.version-2.0.0
in repository https://gitbox.apache.org/repos/asf/struts-examples.git


 was 7028728  Bump shiro.version from 1.13.0 to 2.0.0

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-examples) branch dependabot/maven/log4j2.version-2.23.1 deleted (was 22d065e)

[lukaszlenart]

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

lukaszlenart pushed a change to branch dependabot/maven/log4j2.version-2.23.1
in repository https://gitbox.apache.org/repos/asf/struts-examples.git


 was 22d065e  Bump log4j2.version from 2.22.1 to 2.23.1

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-examples) 01/01: Merge pull request #346 from fp024/dev-2024-05-03

[lukaszlenart]

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-examples.git

commit 542ab9e9a5af0a83c31431446886ca4e0eeb7024
Merge: 9f2e536 40697f5
Author: Lukasz Lenart 
AuthorDate: Mon May 6 09:45:28 2024 +0200

Merge pull request #346 from fp024/dev-2024-05-03

jasperreports example - Jetty Upgrade to 12.x

 jasperreports/pom.xml  | 14 +++---
 .../example/jasperreports/service/JasperInitializer.java   |  8 +---
 2 files changed, 16 insertions(+), 6 deletions(-)

(struts-examples) branch master updated (9f2e536 -> 542ab9e)

[lukaszlenart]

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-examples.git


from 9f2e536  Merge pull request #324 from 
apache/feature/upgrade-mvn-wrapper
 add 40697f5  jasperreports example - Jetty Upgrade 12.x
 new 542ab9e  Merge pull request #346 from fp024/dev-2024-05-03

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:
 jasperreports/pom.xml  | 14 +++---
 .../example/jasperreports/service/JasperInitializer.java   |  8 +---
 2 files changed, 16 insertions(+), 6 deletions(-)

(struts) branch feature/WW-5420-text deleted (was 36275b9e0)

[lukaszlenart]

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

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


 was 36275b9e0 WW-5420 Upgrades commons-text to ver. 1.12.0

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) 01/01: Merge pull request #924 from apache/feature/WW-5420-text

[lukaszlenart]

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 c0d1217d7cffa67a70b38ff125eca05f06ab1c89
Merge: f2e93d017 36275b9e0
Author: Lukasz Lenart 
AuthorDate: Mon Apr 29 06:24:29 2024 +0200

Merge pull request #924 from apache/feature/WW-5420-text

WW-5420 Upgrades commons-text to ver. 1.12.0

 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts) branch master updated (f2e93d017 -> c0d1217d7)

[lukaszlenart]

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 f2e93d017 Merge pull request #905 from 
apache/dependabot/maven/org.apache.maven.plugins-maven-failsafe-plugin-3.2.5
 add 36275b9e0 WW-5420 Upgrades commons-text to ver. 1.12.0
 new c0d1217d7 Merge pull request #924 from apache/feature/WW-5420-text

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:
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts) branch dependabot/maven/org.apache.maven.plugins-maven-failsafe-plugin-3.2.5 deleted (was ac409d6cb)

[lukaszlenart]

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

lukaszlenart pushed a change to branch 
dependabot/maven/org.apache.maven.plugins-maven-failsafe-plugin-3.2.5
in repository https://gitbox.apache.org/repos/asf/struts.git


 was ac409d6cb Bump org.apache.maven.plugins:maven-failsafe-plugin

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) 01/01: Merge pull request #905 from apache/dependabot/maven/org.apache.maven.plugins-maven-failsafe-plugin-3.2.5

[lukaszlenart]

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 f2e93d017b7bbd026afeb4e37893a6f837464723
Merge: 3ed212a1f ac409d6cb
Author: Lukasz Lenart 
AuthorDate: Mon Apr 29 06:23:48 2024 +0200

Merge pull request #905 from 
apache/dependabot/maven/org.apache.maven.plugins-maven-failsafe-plugin-3.2.5

Bump org.apache.maven.plugins:maven-failsafe-plugin from 3.0.0-M6 to 3.2.5

 apps/showcase/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts) branch master updated (3ed212a1f -> f2e93d017)

[lukaszlenart]

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 3ed212a1f Merge pull request #907 from 
apache/dependabot/maven/asm.version-9.7
 add ac409d6cb Bump org.apache.maven.plugins:maven-failsafe-plugin
 new f2e93d017 Merge pull request #905 from 
apache/dependabot/maven/org.apache.maven.plugins-maven-failsafe-plugin-3.2.5

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:
 apps/showcase/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts) branch dependabot/maven/spring.platformVersion-6.1.5 deleted (was 8ef5f8fb4)

[lukaszlenart]

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

lukaszlenart pushed a change to branch 
dependabot/maven/spring.platformVersion-6.1.5
in repository https://gitbox.apache.org/repos/asf/struts.git


 was 8ef5f8fb4 Bump spring.platformVersion from 5.3.31 to 6.1.5

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 master updated (ed3786c6b -> 3ed212a1f)

[lukaszlenart]

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 ed3786c6b Merge pull request #926 from 
apache/dependabot/github_actions/actions/upload-artifact-4.3.3
 add ccd5f5d53 Bump asm.version from 9.6 to 9.7
 add 3ed212a1f Merge pull request #907 from 
apache/dependabot/maven/asm.version-9.7

No new revisions were added by this update.

Summary of changes:
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts) branch dependabot/maven/asm.version-9.7 deleted (was ccd5f5d53)

[lukaszlenart]

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

lukaszlenart pushed a change to branch dependabot/maven/asm.version-9.7
in repository https://gitbox.apache.org/repos/asf/struts.git


 was ccd5f5d53 Bump asm.version from 9.6 to 9.7

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 dependabot/github_actions/actions/upload-artifact-4.3.3 deleted (was 2d9af47a9)

[lukaszlenart]

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

lukaszlenart pushed a change to branch 
dependabot/github_actions/actions/upload-artifact-4.3.3
in repository https://gitbox.apache.org/repos/asf/struts.git


 was 2d9af47a9 Bump actions/upload-artifact from 4.3.2 to 4.3.3

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) 01/01: Merge pull request #926 from apache/dependabot/github_actions/actions/upload-artifact-4.3.3

[lukaszlenart]

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 ed3786c6b08e4a936b87d814ac20b392120a9793
Merge: 5cd935604 2d9af47a9
Author: Lukasz Lenart 
AuthorDate: Mon Apr 29 06:21:16 2024 +0200

Merge pull request #926 from 
apache/dependabot/github_actions/actions/upload-artifact-4.3.3

Bump actions/upload-artifact from 4.3.2 to 4.3.3

 .github/workflows/scorecards-analysis.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts) branch master updated (5cd935604 -> ed3786c6b)

[lukaszlenart]

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 5cd935604 Merge pull request #925 from 
apache/dependabot/maven/org.codehaus.mojo-exec-maven-plugin-3.2.0
 add 2d9af47a9 Bump actions/upload-artifact from 4.3.2 to 4.3.3
 new ed3786c6b Merge pull request #926 from 
apache/dependabot/github_actions/actions/upload-artifact-4.3.3

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:
 .github/workflows/scorecards-analysis.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts) branch dependabot/maven/org.codehaus.mojo-exec-maven-plugin-3.2.0 deleted (was c1c6a463a)

[lukaszlenart]

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

lukaszlenart pushed a change to branch 
dependabot/maven/org.codehaus.mojo-exec-maven-plugin-3.2.0
in repository https://gitbox.apache.org/repos/asf/struts.git


 was c1c6a463a Bump org.codehaus.mojo:exec-maven-plugin from 3.1.0 to 3.2.0

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 master updated (3cde66859 -> 5cd935604)

[lukaszlenart]

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 3cde66859 Merge pull request #922 from 
apache/dependabot/maven/org.codehaus.mojo-versions-maven-plugin-2.16.2
 add c1c6a463a Bump org.codehaus.mojo:exec-maven-plugin from 3.1.0 to 3.2.0
 add 5cd935604 Merge pull request #925 from 
apache/dependabot/maven/org.codehaus.mojo-exec-maven-plugin-3.2.0

No new revisions were added by this update.

Summary of changes:
 plugins/tiles/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts) branch feature/WW-5420-text created (now 36275b9e0)

[lukaszlenart]

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

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


  at 36275b9e0 WW-5420 Upgrades commons-text to ver. 1.12.0

This branch includes the following new commits:

 new 36275b9e0 WW-5420 Upgrades commons-text to ver. 1.12.0

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.

(struts) 01/01: WW-5420 Upgrades commons-text to ver. 1.12.0

[lukaszlenart]

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

lukaszlenart pushed a commit to branch feature/WW-5420-text
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 36275b9e0470c5ace87e2e82d0d70ae708949b24
Author: Lukasz Lenart 
AuthorDate: Thu Apr 25 08:25:09 2024 +0200

WW-5420 Upgrades commons-text to ver. 1.12.0
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c86b1290f..b8dd012b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -864,7 +864,7 @@
 
 org.apache.commons
 commons-text
-1.11.0
+1.12.0
 
 
 commons-el

(struts-site) 01/01: Merge pull request #238 from Hritik14/patch-1

[lukaszlenart]

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-site.git

commit 0e9f420c26947d142c9f2eda0952cec15babb6e1
Merge: 4ac7942b0 4b80c076a
Author: Lukasz Lenart 
AuthorDate: Thu Apr 25 06:39:32 2024 +0200

Merge pull request #238 from Hritik14/patch-1

Correct static url value

 source/plugins/plugins-architecture.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts-site) branch master updated (4ac7942b0 -> 0e9f420c2)

[lukaszlenart]

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-site.git


from 4ac7942b0 Merge pull request #234 from apache/WW-5407-docs
 add 4b80c076a Correct static url value
 new 0e9f420c2 Merge pull request #238 from Hritik14/patch-1

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:
 source/plugins/plugins-architecture.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts-site) 01/01: Merge pull request #237 from apache/fix/announce-2024

[lukaszlenart]

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-site.git

commit f8f712d0df39818382cc6dcc58ce91def2d9
Merge: 47cbae9fc 770927ab3
Author: Lukasz Lenart 
AuthorDate: Mon Apr 22 20:01:35 2024 +0200

Merge pull request #237 from apache/fix/announce-2024

Fixes link to the announcement page

 source/_includes/header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts-site) branch master updated (47cbae9fc -> f8f712d0d)

[lukaszlenart]

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-site.git


from 47cbae9fc Merge pull request #236 from apache/fix/sitemesh
 add 770927ab3 Fixes link to the announcement page
 new f8f712d0d Merge pull request #237 from apache/fix/announce-2024

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:
 source/_includes/header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(struts-site) branch fix/announce-2024 deleted (was 770927ab3)

[lukaszlenart]

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

lukaszlenart pushed a change to branch fix/announce-2024
in repository https://gitbox.apache.org/repos/asf/struts-site.git


 was 770927ab3 Fixes link to the announcement page

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-site) branch fix/announce-2024 created (now 770927ab3)

[lukaszlenart]

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

lukaszlenart pushed a change to branch fix/announce-2024
in repository https://gitbox.apache.org/repos/asf/struts-site.git


  at 770927ab3 Fixes link to the announcement page

This branch includes the following new commits:

 new 770927ab3 Fixes link to the announcement page

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.