(struts) branch dependabot/maven/maven-surefire-plugin.version-3.5.2 created (now 03ed3a4a7)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/maven-surefire-plugin.version-3.5.2 in repository https://gitbox.apache.org/repos/asf/struts.git at 03ed3a4a7 Bump maven-surefire-plugin.version from 3.5.1 to 3.5.2 No new revisions were added by this update.
(struts) branch dependabot/maven/net.sf.jasperreports-jasperreports-7.0.1 created (now 2e3207256)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/net.sf.jasperreports-jasperreports-7.0.1 in repository https://gitbox.apache.org/repos/asf/struts.git at 2e3207256 Bump net.sf.jasperreports:jasperreports from 6.21.3 to 7.0.1 No new revisions were added by this update.
(struts) branch dependabot/maven/org.apache.maven.plugins-maven-project-info-reports-plugin-3.8.0 created (now c388cff64)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-project-info-reports-plugin-3.8.0 in repository https://gitbox.apache.org/repos/asf/struts.git at c388cff64 Bump org.apache.maven.plugins:maven-project-info-reports-plugin No new revisions were added by this update.
(struts) branch dependabot/maven/jackson.version-2.18.1 created (now 17183cd9c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/jackson.version-2.18.1 in repository https://gitbox.apache.org/repos/asf/struts.git at 17183cd9c Bump jackson.version from 2.18.0 to 2.18.1 No new revisions were added by this update.
(struts-examples) branch dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.10.1 deleted (was cdd8b66)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.10.1 in repository https://gitbox.apache.org/repos/asf/struts-examples.git was cdd8b66 Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.3 to 3.10.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) branch dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.11.1 created (now 37b8777)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.11.1 in repository https://gitbox.apache.org/repos/asf/struts-examples.git at 37b8777 Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.3 to 3.11.1 No new revisions were added by this update.
(struts) branch release/struts-7-0-x updated (957783b8a -> 058a4495b)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git from 957783b8a Merge pull request #1112 from apache/feature/WW-5459-restructure add 80dab5294 WW-5481 Moves text related classes into org.apache.struts2.text add e6c7ced60 WW-5481 Extracts duplicated code add 058a4495b Merge pull request #1113 from apache/feature/WW-5481-text No new revisions were added by this update. Summary of changes: .../java/org/apache/struts2/ActionSupport.java | 2 + .../org/apache/struts2/DefaultActionProxy.java | 1 + .../java/org/apache/struts2/LocaleProvider.java| 5 +- .../org/apache/struts2/LocalizedTextProvider.java | 49 --- .../java/org/apache/struts2/components/Date.java | 2 +- .../java/org/apache/struts2/components/I18n.java | 6 +- .../config/StrutsBeanSelectionProvider.java| 6 +- .../struts2/config/impl/DefaultConfiguration.java | 12 +- .../struts2/conversion/impl/DateConverter.java | 2 +- .../struts2/conversion/impl/XWorkConverter.java| 2 +- .../interceptor/AbstractFileUploadInterceptor.java | 6 +- .../struts2/interceptor/AliasInterceptor.java | 2 +- .../interceptor/StaticParametersInterceptor.java | 2 +- .../struts2/interceptor/TokenInterceptor.java | 6 +- .../org/apache/struts2/ognl/OgnlValueStack.java| 2 +- .../apache/struts2/ognl/OgnlValueStackFactory.java | 2 +- .../AbstractLocalizedTextProvider.java | 220 ++-- .../struts2/{ => text}/CompositeTextProvider.java | 2 +- .../struts2/{ => text}/DefaultTextProvider.java| 4 +- .../struts2/text/GlobalLocalizedTextProvider.java | 82 + .../LocalizedTextProvider.java}| 192 +-- .../{ => text}/ResourceBundleTextProvider.java | 6 +- .../struts2/text/StrutsLocalizedTextProvider.java | 213 .../{ => text}/StrutsTextProviderFactory.java | 5 +- .../apache/struts2/{ => text}/TextProvider.java| 8 +- .../struts2/{ => text}/TextProviderFactory.java| 4 +- .../struts2/{ => text}/TextProviderSupport.java| 66 ++-- .../java/org/apache/struts2/util/DebugUtils.java | 2 +- .../struts2/util/StrutsLocalizedTextProvider.java | 382 - .../apache/struts2/util/TextProviderHelper.java| 3 +- .../java/org/apache/struts2/util/TokenHelper.java | 2 +- .../validator/DefaultActionValidatorManager.java | 2 +- .../validator/DelegatingValidatorContext.java | 6 +- .../apache/struts2/validator/ValidatorContext.java | 2 +- .../validator/validators/ValidatorSupport.java | 2 +- .../validators/VisitorFieldValidator.java | 4 +- core/src/main/resources/struts-beans.xml | 14 +- .../java/org/apache/struts2/ActionSupportTest.java | 1 + .../java/org/apache/struts2/LocaleAwareTest.java | 1 + .../java/org/apache/struts2/ModelDrivenAction.java | 2 +- .../java/org/apache/struts2/ObjectFactoryTest.java | 1 + .../apache/struts2/components/ComponentTest.java | 2 +- .../org/apache/struts2/config/SettingsTest.java| 2 +- .../config/StrutsBeanSelectionProviderTest.java| 3 +- .../ConfigurationProviderOgnlAllowlistTest.java| 6 +- .../struts2/conversion/impl/DateConverterTest.java | 2 +- .../conversion/impl/XWorkBasicConverterTest.java | 2 +- .../conversion/impl/XWorkConverterTest.java| 4 +- .../apache/struts2/dispatcher/DispatcherTest.java | 2 +- .../parameter/ParametersInterceptorTest.java | 2 +- .../org/apache/struts2/mock/DummyTextProvider.java | 2 +- .../org/apache/struts2/mock/InjectableAction.java | 2 +- .../java/org/apache/struts2/ognl/OgnlUtilTest.java | 2 +- .../apache/struts2/ognl/OgnlValueStackTest.java| 2 +- .../apache/struts2/test/ModelDrivenAction2.java| 1 - .../{ => text}/CompositeTextProviderTest.java | 46 +-- .../{ => text}/DefaultTextProviderTest.java| 32 +- .../StrutsLocalizedTextProviderTest.java | 111 +++--- .../struts2/{ => text}/StubTextProvider.java | 2 +- .../{ => text}/TextProviderSupportTest.java| 33 +- .../AnnotationActionValidatorManagerTest.java | 2 +- .../ConversionErrorFieldValidatorTest.java | 2 +- .../validator/DoubleRangeFieldValidatorTest.java | 2 +- .../struts2/validator/DummyValidatorContext.java | 2 +- .../struts2/validator/EmailValidatorTest.java | 2 +- .../struts2/validator/ExpressionValidatorTest.java | 2 +- .../struts2/validator/RegexFieldValidatorTest.java | 3 +- ...teConversionErrorFieldValidatorSupportTest.java | 2 +- .../validator/SimpleActionValidationTest.java | 4 +- .../validator/StringLengthFieldValidatorTest.java | 2 +- .../struts2/validator/StringValidatorTest.java | 2 +- .../apache/struts2/validator/URLValidatorTest.java | 2 +
(struts) branch feature/WW-5482-locale updated (f7b6bc23a -> 0c2d275dc)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5482-locale in repository https://gitbox.apache.org/repos/asf/struts.git discard f7b6bc23a WW-5482 Moves locale related code into org.apache.struts2.locale discard 026c992c0 WW-5481 Extracts duplicated code discard dc62488bc WW-5481 Moves text related classes into org.apache.struts2.text add ced44650e WW-5480 Warn against potential templating bug add 22036174c Merge pull request #1108 from apache/WW-5480-templating-warning add d351843ec WW-3714 Move new Result class into result package add 01d953b1e Merge remote-tracking branch 'origin/WW-3714-result-repackage' into 7.0.x/merge-master-2024-11-03 add b0f2f0a8b Merge pull request #1110 from apache/7.0.x/merge-master-2024-11-03 add 957783b8a Merge pull request #1112 from apache/feature/WW-5459-restructure add 80dab5294 WW-5481 Moves text related classes into org.apache.struts2.text add e6c7ced60 WW-5481 Extracts duplicated code add 058a4495b Merge pull request #1113 from apache/feature/WW-5481-text add 0c2d275dc WW-5482 Moves locale related code into org.apache.struts2.locale 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 (f7b6bc23a) \ N -- N -- N refs/heads/feature/WW-5482-locale (0c2d275dc) 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. No new revisions were added by this update. Summary of changes: .../java/org/apache/struts2/components/UIBean.java | 9 +++- .../org/apache/struts2/components/UIBeanTest.java | 48 ++ 2 files changed, 47 insertions(+), 10 deletions(-)
(struts) branch feature/WW-5481-text deleted (was e6c7ced60)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5481-text in repository https://gitbox.apache.org/repos/asf/struts.git was e6c7ced60 WW-5481 Extracts duplicated code 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 (8d6ecee84 -> 1e2517b59)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts.git from 8d6ecee84 Merge pull request #1116 from apache/WW-5459-repkg-action-chain-2 add 6fbd9e532 WW-3714 Ensure correct delegation of new Result API add be82a7240 WW-3714 Ensure correct delegation of new Interceptor API new 1e2517b59 Merge pull request #1117 from apache/WW-3714-overriding-behaviour 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/DefaultActionInvocation.java | 8 .../xwork2/interceptor/AbstractInterceptor.java | 7 ++- .../java/org/apache/struts2/dispatcher/Dispatcher.java | 2 +- .../interceptor/TokenSessionStoreInterceptor.java| 16 .../org/apache/struts2/rest/RestActionInvocation.java| 4 ++-- 5 files changed, 21 insertions(+), 16 deletions(-)
(struts) 01/01: Merge pull request #1117 from apache/WW-3714-overriding-behaviour
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git commit 1e2517b59ecb4f401962c696f32e82e4400d67d1 Merge: 8d6ecee84 be82a7240 Author: Kusal Kithul-Godage AuthorDate: Sun Nov 3 21:06:59 2024 +1100 Merge pull request #1117 from apache/WW-3714-overriding-behaviour WW-3714 Ensure correct delegation of deprecated API methods .../com/opensymphony/xwork2/DefaultActionInvocation.java | 8 .../xwork2/interceptor/AbstractInterceptor.java | 7 ++- .../java/org/apache/struts2/dispatcher/Dispatcher.java | 2 +- .../interceptor/TokenSessionStoreInterceptor.java| 16 .../org/apache/struts2/rest/RestActionInvocation.java| 4 ++-- 5 files changed, 21 insertions(+), 16 deletions(-)
(struts) branch WW-3714-overriding-behaviour deleted (was be82a7240)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-3714-overriding-behaviour in repository https://gitbox.apache.org/repos/asf/struts.git was be82a7240 WW-3714 Ensure correct delegation of new Interceptor API 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/02: Merge remote-tracking branch 'origin/release/struts-7-0-x' into 7.0.x/merge-master-2024-11-03-v2
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch 7.0.x/merge-master-2024-11-03-v2 in repository https://gitbox.apache.org/repos/asf/struts.git commit 7eb198cbe6858fc22498e028875bacf98f3173d3 Merge: 93e4f2718 957783b8a Author: Kusal Kithul-Godage AuthorDate: Sun Nov 3 21:07:26 2024 +1100 Merge remote-tracking branch 'origin/release/struts-7-0-x' into 7.0.x/merge-master-2024-11-03-v2
(struts) 02/02: Merge remote-tracking branch 'origin/master' into 7.0.x/merge-master-2024-11-03-v2
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch 7.0.x/merge-master-2024-11-03-v2 in repository https://gitbox.apache.org/repos/asf/struts.git commit 2582a783ef4b06c1ca73a0ca48c970a922fdf238 Merge: 7eb198cbe 1e2517b59 Author: Kusal Kithul-Godage AuthorDate: Sun Nov 3 21:07:33 2024 +1100 Merge remote-tracking branch 'origin/master' into 7.0.x/merge-master-2024-11-03-v2
(struts) branch 7.0.x/merge-master-2024-11-03-v2 updated (93e4f2718 -> 2582a783e)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch 7.0.x/merge-master-2024-11-03-v2 in repository https://gitbox.apache.org/repos/asf/struts.git from 93e4f2718 Merge remote-tracking branch 'origin/WW-3714-overriding-behaviour' into 7.0.x/merge-master-2024-11-03-v2 add 957783b8a Merge pull request #1112 from apache/feature/WW-5459-restructure new 7eb198cbe Merge remote-tracking branch 'origin/release/struts-7-0-x' into 7.0.x/merge-master-2024-11-03-v2 add 570bf46a7 Merge pull request #1115 from apache/WW-5459-repkg-action-chain add 8d6ecee84 Merge pull request #1116 from apache/WW-5459-repkg-action-chain-2 add 1e2517b59 Merge pull request #1117 from apache/WW-3714-overriding-behaviour new 2582a783e Merge remote-tracking branch 'origin/master' into 7.0.x/merge-master-2024-11-03-v2 The 2 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) branch release/struts-7-0-x updated (058a4495b -> 803a85735)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git from 058a4495b Merge pull request #1113 from apache/feature/WW-5481-text add 3a27b2a00 Merge remote-tracking branch 'origin/feature/WW-5459-restructure' into 7.0.x/merge-master-2024-11-03-v2 add 2beac8eba Merge pull request #1109 from apache/WW-3714-result-repackage add b001c61f8 WW-5459 Move new Action class into action package add b0a4c4f41 WW-5459 Deprecate and repackage ActionChainResult add 6fbd9e532 WW-3714 Ensure correct delegation of new Result API add be82a7240 WW-3714 Ensure correct delegation of new Interceptor API add 93e4f2718 Merge remote-tracking branch 'origin/WW-3714-overriding-behaviour' into 7.0.x/merge-master-2024-11-03-v2 add 7eb198cbe Merge remote-tracking branch 'origin/release/struts-7-0-x' into 7.0.x/merge-master-2024-11-03-v2 add 570bf46a7 Merge pull request #1115 from apache/WW-5459-repkg-action-chain add 8d6ecee84 Merge pull request #1116 from apache/WW-5459-repkg-action-chain-2 add 1e2517b59 Merge pull request #1117 from apache/WW-3714-overriding-behaviour add 2582a783e Merge remote-tracking branch 'origin/master' into 7.0.x/merge-master-2024-11-03-v2 add 803a85735 Merge pull request #1118 from apache/7.0.x/merge-master-2024-11-03-v2 No new revisions were added by this update. Summary of changes:
(struts) branch 7.0.x/merge-master-2024-11-03-v2 deleted (was 2582a783e)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch 7.0.x/merge-master-2024-11-03-v2 in repository https://gitbox.apache.org/repos/asf/struts.git was 2582a783e Merge remote-tracking branch 'origin/master' into 7.0.x/merge-master-2024-11-03-v2 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
svn commit: r72764 - /dev/struts/7.0.0-M10/
Author: lukaszlenart Date: Sun Nov 3 14:04:33 2024 New Revision: 72764 Log: Updates test release 7.0.0-M10 Added: dev/struts/7.0.0-M10/ dev/struts/7.0.0-M10/struts-7.0.0-M10-all.zip (with props) dev/struts/7.0.0-M10/struts-7.0.0-M10-all.zip.asc dev/struts/7.0.0-M10/struts-7.0.0-M10-all.zip.sha256 dev/struts/7.0.0-M10/struts-7.0.0-M10-all.zip.sha512 dev/struts/7.0.0-M10/struts-7.0.0-M10-apps.zip (with props) dev/struts/7.0.0-M10/struts-7.0.0-M10-apps.zip.asc dev/struts/7.0.0-M10/struts-7.0.0-M10-apps.zip.sha256 dev/struts/7.0.0-M10/struts-7.0.0-M10-apps.zip.sha512 dev/struts/7.0.0-M10/struts-7.0.0-M10-docs.zip (with props) dev/struts/7.0.0-M10/struts-7.0.0-M10-docs.zip.asc dev/struts/7.0.0-M10/struts-7.0.0-M10-docs.zip.sha256 dev/struts/7.0.0-M10/struts-7.0.0-M10-docs.zip.sha512 dev/struts/7.0.0-M10/struts-7.0.0-M10-lib.zip (with props) dev/struts/7.0.0-M10/struts-7.0.0-M10-lib.zip.asc dev/struts/7.0.0-M10/struts-7.0.0-M10-lib.zip.sha256 dev/struts/7.0.0-M10/struts-7.0.0-M10-lib.zip.sha512 dev/struts/7.0.0-M10/struts-7.0.0-M10-min-lib.zip (with props) dev/struts/7.0.0-M10/struts-7.0.0-M10-min-lib.zip.asc dev/struts/7.0.0-M10/struts-7.0.0-M10-min-lib.zip.sha256 dev/struts/7.0.0-M10/struts-7.0.0-M10-min-lib.zip.sha512 dev/struts/7.0.0-M10/struts-7.0.0-M10-src.zip (with props) dev/struts/7.0.0-M10/struts-7.0.0-M10-src.zip.asc dev/struts/7.0.0-M10/struts-7.0.0-M10-src.zip.sha256 dev/struts/7.0.0-M10/struts-7.0.0-M10-src.zip.sha512 Added: dev/struts/7.0.0-M10/struts-7.0.0-M10-all.zip == Binary file - no diff available. Propchange: dev/struts/7.0.0-M10/struts-7.0.0-M10-all.zip -- svn:mime-type = application/octet-stream Added: dev/struts/7.0.0-M10/struts-7.0.0-M10-all.zip.asc == --- dev/struts/7.0.0-M10/struts-7.0.0-M10-all.zip.asc (added) +++ dev/struts/7.0.0-M10/struts-7.0.0-M10-all.zip.asc Sun Nov 3 14:04:33 2024 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- + +iQJMBAABCgA2FiEEDgCGmDROYrkGM7fGKEFhBmOvux8FAmcngQkYHGx1a2Fzemxl +bmFydEBhcGFjaGUub3JnAAoJEChBYQZjr7sfsaAQAK+95nRCwUpjAt1mDi4FDQPE +EPGTeah7LVlewPyNQVve6EBwSYOTLndBvOm1W1SorqOsQCmfG6FSwjD2gjpj0Vhi +2KKdImOvil+EW8RW+dHkXFnuonh0XjTi5CwywAH9uMIakegcv9/hskCMNdfK2FZ3 +hJu28PtKGVCpg6Al1ocbcyGmDdhnVv+yv5zzrFeU8g5sDhdm/V+kqgAf2/x19XxF +wAwdNL7GBft756kJOFx0sdMnoifudoa5jWNMbMpUM5oTZAnDNJGUX+rHU62ZOvsx +GYpmjGwzoJiC2/PkBPM1TIN2vU9VnQiiGa8IMBrQakPcThIxbCbIERfhAsUoj/mB +whZHNukCLO1tlaRe8SZKl11ZD1RKePudxLtsJvNc5funZShbA/wlklLYLK3Iz1Fw +mJOSot6qzALy8XvqFHlGlwdRq1ZLh3rUJMAjNTmBri4wVNI0IAHYY3e1DWKyed0k +2akzVHf64V+X8+VubH1dXdXKiaU2hQwCStZ2xeQMffSlbOnevphdMQ2PesWP9CtS +j/Ko7CwKAtBVYiMoIrmPI7g3iEOgKqTKUnsH8p7hBANmPcmJcRYuGctn4JnfaQGJ +GRmgCo6QdaVhU3r4mlXJYQpQZk2VSyTQUdgkrhEEMkCD+2goxhn9XwMBUz4VWm1F +o8WukN/UEf2m5ZBqdEEl +=OhUA +-END PGP SIGNATURE- Added: dev/struts/7.0.0-M10/struts-7.0.0-M10-all.zip.sha256 == --- dev/struts/7.0.0-M10/struts-7.0.0-M10-all.zip.sha256 (added) +++ dev/struts/7.0.0-M10/struts-7.0.0-M10-all.zip.sha256 Sun Nov 3 14:04:33 2024 @@ -0,0 +1 @@ +f68dcdbf3075ca03b417ec78b201ffa29839f5dd2d0d1e91b34fc0fb1e0437b4 struts-7.0.0-M10-all.zip Added: dev/struts/7.0.0-M10/struts-7.0.0-M10-all.zip.sha512 == --- dev/struts/7.0.0-M10/struts-7.0.0-M10-all.zip.sha512 (added) +++ dev/struts/7.0.0-M10/struts-7.0.0-M10-all.zip.sha512 Sun Nov 3 14:04:33 2024 @@ -0,0 +1 @@ +549a5a0bfb045a8cc1fdc70d8032a66ccb3668b44cd4a03b26701c8e223d79d04b18cba279c217531af8cf535e5b559d5cd0dd87e45b5347bb23d478e1d44e5e struts-7.0.0-M10-all.zip Added: dev/struts/7.0.0-M10/struts-7.0.0-M10-apps.zip == Binary file - no diff available. Propchange: dev/struts/7.0.0-M10/struts-7.0.0-M10-apps.zip -- svn:mime-type = application/octet-stream Added: dev/struts/7.0.0-M10/struts-7.0.0-M10-apps.zip.asc == --- dev/struts/7.0.0-M10/struts-7.0.0-M10-apps.zip.asc (added) +++ dev/struts/7.0.0-M10/struts-7.0.0-M10-apps.zip.asc Sun Nov 3 14:04:33 2024 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- + +iQJLBAABCgA2FiEEDgCGmDROYrkGM7fGKEFhBmOvux8FAmcngQoYHGx1a2Fzemxl +bmFydEBhcGFjaGUub3JnAAoJEChBYQZjr7sfZS4P92v1veUbMSXeY+PH4cVxwlMw +edS2WCDs9Sl9FkG+kBRZ8W4pZo9qX5fGJRylLeR1j+54TQ5kg+JaAfJgLRHkG5B5 +GmnLdJR7LBgQRRkfdMQteOWgDBVzwMDq9WF8tlTuafke8Jlj+6cfGBCJOgkMIbs7 +jOg3wuJm4qNOW4e4jy+fNAfoc9VxzOz4szjwdYQJ5shfBdpScOMgECUXdyWZoAql +42ZOykkzCgPhHZp6F0x3xWxVagMqM82VF5gFTB53
(struts) branch release/struts-7-0-x updated (803a85735 -> 7fc0c41b1)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git from 803a85735 Merge pull request #1118 from apache/7.0.x/merge-master-2024-11-03-v2 add 0c2d275dc WW-5482 Moves locale related code into org.apache.struts2.locale add 7fc0c41b1 Merge pull request #1114 from apache/feature/WW-5482-locale No new revisions were added by this update. Summary of changes: .../java/org/apache/struts2/ActionSupport.java | 2 + .../java/org/apache/struts2/StrutsConstants.java | 383 +++-- .../java/org/apache/struts2/components/I18n.java | 4 +- .../config/StrutsBeanSelectionProvider.java| 2 +- .../struts2/config/impl/DefaultConfiguration.java | 4 +- .../conversion/impl/DefaultTypeConverter.java | 2 +- .../org/apache/struts2/dispatcher/Dispatcher.java | 2 +- .../multipart/MultiPartRequestWrapper.java | 2 +- .../interceptor/AbstractFileUploadInterceptor.java | 4 +- .../struts2/interceptor/I18nInterceptor.java | 5 +- .../{ => locale}/DefaultLocaleProvider.java| 3 +- .../{ => locale}/DefaultLocaleProviderFactory.java | 2 +- .../struts2/{ => locale}/LocaleProvider.java | 9 +- .../{ => locale}/LocaleProviderFactory.java| 4 +- .../struts2/text/ResourceBundleTextProvider.java | 2 +- .../struts2/text/StrutsTextProviderFactory.java| 2 +- .../java/org/apache/struts2/text/TextProvider.java | 7 +- .../apache/struts2/text/TextProviderSupport.java | 4 +- .../validator/DelegatingValidatorContext.java | 4 +- .../apache/struts2/validator/ValidatorContext.java | 2 +- .../struts2/views/freemarker/FreemarkerResult.java | 2 +- core/src/main/resources/struts-beans.xml | 4 +- .../org/apache/struts2/LocaleProviderTest.java | 1 + .../ConfigurationProviderOgnlAllowlistTest.java| 6 +- .../ActionFileUploadInterceptorTest.java | 2 +- .../struts2/interceptor/I18nInterceptorTest.java | 2 +- .../{ => locale}/DefaultLocaleProviderTest.java| 3 +- .../struts2/text/TextProviderSupportTest.java | 2 +- .../struts2/tiles/StrutsTilesLocaleResolver.java | 2 +- 29 files changed, 333 insertions(+), 140 deletions(-) rename core/src/main/java/org/apache/struts2/{ => locale}/DefaultLocaleProvider.java (96%) rename core/src/main/java/org/apache/struts2/{ => locale}/DefaultLocaleProviderFactory.java (96%) rename core/src/main/java/org/apache/struts2/{ => locale}/LocaleProvider.java (96%) rename core/src/main/java/org/apache/struts2/{ => locale}/LocaleProviderFactory.java (94%) rename core/src/test/java/org/apache/struts2/{ => locale}/DefaultLocaleProviderTest.java (98%)
(struts) branch feature/WW-5482-locale deleted (was 0c2d275dc)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5482-locale in repository https://gitbox.apache.org/repos/asf/struts.git was 0c2d275dc WW-5482 Moves locale related code into org.apache.struts2.locale 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) annotated tag STRUTS_7_0_0_M10 created (now 2b9b5c59e)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to annotated tag STRUTS_7_0_0_M10 in repository https://gitbox.apache.org/repos/asf/struts.git at 2b9b5c59e (tag) tagging 5760d45a3efa5ec3c7a9d70678d1a4e02289d1c7 (commit) replaces STRUTS_6_6_1 by Lukasz Lenart on Sun Nov 3 14:50:57 2024 +0100 - Log - [maven-release-plugin] copy for tag STRUTS_7_0_0_M10 --- No new revisions were added by this update.
(struts) branch release/struts-7-0-x updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/release/struts-7-0-x by this push: new 90c9dfa92 [maven-release-plugin] prepare for next development iteration 90c9dfa92 is described below commit 90c9dfa9236f22bcf34544e7282077629a5d6214 Author: Lukasz Lenart AuthorDate: Sun Nov 3 14:51:02 2024 +0100 [maven-release-plugin] prepare for next development iteration --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 8 core/pom.xml| 2 +- jakarta/pom.xml | 2 +- jakarta/velocity-tools-jsp-jakarta/pom.xml | 2 +- jakarta/velocity-tools-view-jakarta/pom.xml | 2 +- plugins/async/pom.xml | 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/velocity/pom.xml| 2 +- plugins/xslt/pom.xml| 2 +- pom.xml | 6 +++--- 27 files changed, 33 insertions(+), 33 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index 17dae8f2f..aea4b5665 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M10 +7.0.0-M11-SNAPSHOT struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 7ece9726e..c54f7cb2c 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -7.0.0-M10 +7.0.0-M11-SNAPSHOT struts2-rest-showcase war -7.0.0-M10 +7.0.0-M11-SNAPSHOT Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 754896d3e..fb0eeebe0 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -7.0.0-M10 +7.0.0-M11-SNAPSHOT struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 0015c9455..a0fa44047 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M10 +7.0.0-M11-SNAPSHOT struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index 0cf1c5f26..48f8e9e0a 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -7.0.0-M10 +7.0.0-M11-SNAPSHOT struts2-bom -7.0.0-M10 +7.0.0-M11-SNAPSHOT pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -7.0.0-M10 +7.0.0-M11-SNAPSHOT true true @@ -160,7 +160,7 @@ -STRUTS_7_0_0_M10 +HEAD scm:git:https://gitbox.apache.org/repos/asf/struts.git scm:git:https://gitbox.apache.org/repos/asf/struts.git https://github.com/apache/struts/ diff --git a/core/pom.xml b/core/pom.xml index 12985376d..84278205d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M10 +7.0.0-M11-SNAPSHOT struts2-core jar diff --git a/jakarta/pom.xml b/jakarta/pom.xml index 7730d11ff..e85691232 100644 --- a/jakarta/pom.xml +++ b/jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M10 +7.0.0-M11-SNAPSHOT struts2-jakarta pom diff --git a/jakarta/velocity-tools-jsp-jakarta/pom.xml b/jakarta/velocity-tools-jsp-jakarta/pom.xml index 1ee2913db..a59b0f548 100644 --- a/jakarta/velocity-tools-jsp-jakarta/pom.xml +++ b/jakarta/velocity-tools-jsp-jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-jakarta -7.0.0-M10 +7.0.0-M11-SNAPSHOT struts2-velocity-tools-jsp-jakarta jar diff --git a/jakarta/
(struts) branch release/struts-7-0-x updated: [maven-release-plugin] prepare release STRUTS_7_0_0_M10
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/release/struts-7-0-x by this push: new 5760d45a3 [maven-release-plugin] prepare release STRUTS_7_0_0_M10 5760d45a3 is described below commit 5760d45a3efa5ec3c7a9d70678d1a4e02289d1c7 Author: Lukasz Lenart AuthorDate: Sun Nov 3 14:50:53 2024 +0100 [maven-release-plugin] prepare release STRUTS_7_0_0_M10 --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 8 core/pom.xml| 2 +- jakarta/pom.xml | 2 +- jakarta/velocity-tools-jsp-jakarta/pom.xml | 2 +- jakarta/velocity-tools-view-jakarta/pom.xml | 2 +- plugins/async/pom.xml | 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/velocity/pom.xml| 2 +- plugins/xslt/pom.xml| 2 +- pom.xml | 6 +++--- 27 files changed, 33 insertions(+), 33 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index 56d26ea3e..17dae8f2f 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M10-SNAPSHOT +7.0.0-M10 struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index a27cccaf8..7ece9726e 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -7.0.0-M10-SNAPSHOT +7.0.0-M10 struts2-rest-showcase war -7.0.0-M10-SNAPSHOT +7.0.0-M10 Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index a7bfa8694..754896d3e 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -7.0.0-M10-SNAPSHOT +7.0.0-M10 struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index ba9cde474..0015c9455 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M10-SNAPSHOT +7.0.0-M10 struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index 900eb1e7e..0cf1c5f26 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -7.0.0-M10-SNAPSHOT +7.0.0-M10 struts2-bom -7.0.0-M10-SNAPSHOT +7.0.0-M10 pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -7.0.0-M10-SNAPSHOT +7.0.0-M10 true true @@ -160,7 +160,7 @@ -HEAD +STRUTS_7_0_0_M10 scm:git:https://gitbox.apache.org/repos/asf/struts.git scm:git:https://gitbox.apache.org/repos/asf/struts.git https://github.com/apache/struts/ diff --git a/core/pom.xml b/core/pom.xml index 965351898..12985376d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M10-SNAPSHOT +7.0.0-M10 struts2-core jar diff --git a/jakarta/pom.xml b/jakarta/pom.xml index c48f0a61b..7730d11ff 100644 --- a/jakarta/pom.xml +++ b/jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M10-SNAPSHOT +7.0.0-M10 struts2-jakarta pom diff --git a/jakarta/velocity-tools-jsp-jakarta/pom.xml b/jakarta/velocity-tools-jsp-jakarta/pom.xml index bdf9e8777..1ee2913db 100644 --- a/jakarta/velocity-tools-jsp-jakarta/pom.xml +++ b/jakarta/velocity-tools-jsp-jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-jakarta -7.0.0-M10-SNAPSHOT +7.0.0-M10 struts2-velocity-tools-jsp-jakarta jar diff --git a/jakarta/velocity-too
(struts) branch release/struts-7-0-x updated (b0f2f0a8b -> 957783b8a)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git from b0f2f0a8b Merge pull request #1110 from apache/7.0.x/merge-master-2024-11-03 add dd6bb139f WW-5459 Moves Action interface into org.apache.struts2.action package add 83cb936c3 WW-5459 Moves ActionChainResult into org.apache.struts2.result package add 7e3b3e58c Uses proper default package name add f4f828814 WW-5459 Updates content of zipped XMLs add b835e8978 Creates temp folder in target folder add 957783b8a Merge pull request #1112 from apache/feature/WW-5459-restructure No new revisions were added by this update. Summary of changes: .../apache/struts2/showcase/action/JSPEvalAction.java | 2 +- .../apache/struts2/showcase/ajax/AjaxTestAction.java | 2 +- .../showcase/chat/ChatAuthenticationInterceptor.java | 2 +- .../apache/struts2/showcase/chat/ChatInterceptor.java | 2 +- .../showcase/filedownload/FileDownloadAction.java | 2 +- .../main/java/org/apache/struts2/ActionContext.java| 1 + .../main/java/org/apache/struts2/ActionInvocation.java | 2 ++ .../main/java/org/apache/struts2/ActionSupport.java| 1 + .../org/apache/struts2/DefaultActionInvocation.java| 2 ++ .../java/org/apache/struts2/{ => action}/Action.java | 2 +- .../config/providers/XmlDocConfigurationProvider.java | 2 +- .../struts2/interceptor/ChainingInterceptor.java | 2 +- .../interceptor/DefaultWorkflowInterceptor.java| 2 +- .../struts2/interceptor/ExecuteAndWaitInterceptor.java | 3 +-- .../org/apache/struts2/interceptor/Interceptor.java| 5 +++-- .../apache/struts2/interceptor/PreResultListener.java | 4 ++-- .../struts2/interceptor/annotations/InputConfig.java | 2 +- .../struts2/interceptor/parameter/StrutsParameter.java | 4 +++- .../apache/struts2/{ => result}/ActionChainResult.java | 12 .../main/java/org/apache/struts2/result/Result.java| 2 +- .../org/apache/struts2/util/AppendIteratorFilter.java | 2 +- .../org/apache/struts2/util/IteratorGenerator.java | 2 +- .../org/apache/struts2/util/MergeIteratorFilter.java | 2 +- .../org/apache/struts2/util/SortIteratorFilter.java| 2 +- .../org/apache/struts2/util/SubsetIteratorFilter.java | 2 +- core/src/main/resources/struts-default.xml | 2 +- core/src/main/resources/xwork-default.xml | 2 +- .../java/org/apache/struts2/ActionChainResultTest.java | 1 + .../java/org/apache/struts2/ActionNestingTest.java | 1 + .../java/org/apache/struts2/ActionSupportTest.java | 1 + .../test/java/org/apache/struts2/ChainResultTest.java | 2 +- .../apache/struts2/DefaultActionInvocationTest.java| 1 + .../org/apache/struts2/ExternalReferenceAction.java| 2 ++ .../src/test/java/org/apache/struts2/NestedAction.java | 1 + .../test/java/org/apache/struts2/SimpleFooAction.java | 2 ++ core/src/test/java/org/apache/struts2/TestAction.java | 3 +-- .../org/apache/struts2/TestConfigurationProvider.java | 5 + .../java/org/apache/struts2/components/FormTest.java | 2 +- .../java/org/apache/struts2/config/SettingsTest.java | 2 +- .../ConfigurationProviderOgnlAllowlistTest.java| 10 +- .../config/providers/MockConfigurationProvider.java| 4 ++-- .../config/providers/NoNoArgsConstructorAction.java| 2 +- .../config/providers/PrivateConstructorAction.java | 2 +- .../XmlConfigurationProviderExceptionMappingsTest.java | 2 +- .../XmlConfigurationProviderMultilevelTest.java| 2 +- .../providers/XmlConfigurationProviderResultsTest.java | 4 ++-- .../XmlConfigurationProviderWildCardIncludeTest.java | 4 ++-- .../struts2/conversion/ConversionTestAction.java | 2 +- .../struts2/interceptor/AliasInterceptorTest.java | 2 +- .../struts2/interceptor/ChainingInterceptorTest.java | 4 ++-- .../interceptor/ChainingInterceptorWithConfigTest.java | 4 ++-- .../interceptor/ConversionErrorInterceptorTest.java| 2 +- .../struts2/interceptor/CookieInterceptorTest.java | 2 +- .../interceptor/DefaultWorkflowInterceptorTest.java| 2 +- .../interceptor/ExceptionMappingInterceptorTest.java | 2 +- .../struts2/interceptor/ExecuteAndWaitDelayAction.java | 2 +- .../interceptor/ExecuteAndWaitInterceptorTest.java | 2 +- .../struts2/interceptor/I18nInterceptorTest.java | 2 +- .../interceptor/MessageStoreInterceptorTest.java | 3 +-- .../interceptor/MessageStorePreResultListenerTest.java | 2 +- .../interceptor/ModelDrivenInterceptorTest.java| 2 +- .../struts2/interceptor/PreResultListenerTest.java | 2 +- .../struts2/interceptor/PrepareInterceptorTest.java| 2 +- .../interceptor/ScopedModelDrivenInterceptorTest.java | 2 +- .../interceptor/ServletConf
(struts) branch feature/WW-5459-restructure deleted (was b835e8978)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5459-restructure in repository https://gitbox.apache.org/repos/asf/struts.git was b835e8978 Creates temp folder in target folder 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 (2beac8eba -> 570bf46a7)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts.git from 2beac8eba Merge pull request #1109 from apache/WW-3714-result-repackage add b001c61f8 WW-5459 Move new Action class into action package new 570bf46a7 Merge pull request #1115 from apache/WW-5459-repkg-action-chain 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/src/main/java/com/opensymphony/xwork2/Action.java | 4 ++-- core/src/main/java/org/apache/struts2/ActionContext.java| 1 + core/src/main/java/org/apache/struts2/ActionInvocation.java | 1 + core/src/main/java/org/apache/struts2/ActionSupport.java| 1 + core/src/main/java/org/apache/struts2/{ => action}/Action.java | 2 +- core/src/main/java/org/apache/struts2/result/Result.java| 2 +- .../config/providers/ConfigurationProviderOgnlAllowlistTest.java| 6 +++--- 7 files changed, 10 insertions(+), 7 deletions(-) rename core/src/main/java/org/apache/struts2/{ => action}/Action.java (98%)
(struts) 01/01: Merge pull request #1115 from apache/WW-5459-repkg-action-chain
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git commit 570bf46a7f1dc14c328d66cbf1f60d0246999e03 Merge: 2beac8eba b001c61f8 Author: Kusal Kithul-Godage AuthorDate: Sun Nov 3 18:52:42 2024 +1100 Merge pull request #1115 from apache/WW-5459-repkg-action-chain core/src/main/java/com/opensymphony/xwork2/Action.java | 4 ++-- core/src/main/java/org/apache/struts2/ActionContext.java| 1 + core/src/main/java/org/apache/struts2/ActionInvocation.java | 1 + core/src/main/java/org/apache/struts2/ActionSupport.java| 1 + core/src/main/java/org/apache/struts2/{ => action}/Action.java | 2 +- core/src/main/java/org/apache/struts2/result/Result.java| 2 +- .../config/providers/ConfigurationProviderOgnlAllowlistTest.java| 6 +++--- 7 files changed, 10 insertions(+), 7 deletions(-)
(struts) branch WW-5459-repkg-action-chain deleted (was b001c61f8)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5459-repkg-action-chain in repository https://gitbox.apache.org/repos/asf/struts.git was b001c61f8 WW-5459 Move new Action class into action package The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(struts) branch WW-5459-repkg-action-chain-2 deleted (was b0a4c4f41)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5459-repkg-action-chain-2 in repository https://gitbox.apache.org/repos/asf/struts.git was b0a4c4f41 WW-5459 Deprecate and repackage ActionChainResult 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 (570bf46a7 -> 8d6ecee84)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts.git from 570bf46a7 Merge pull request #1115 from apache/WW-5459-repkg-action-chain add b0a4c4f41 WW-5459 Deprecate and repackage ActionChainResult add 8d6ecee84 Merge pull request #1116 from apache/WW-5459-repkg-action-chain-2 No new revisions were added by this update. Summary of changes: .../com/opensymphony/xwork2/ActionChainResult.java | 254 + .../xwork2/DefaultActionInvocation.java| 1 + .../xwork2/interceptor/ChainingInterceptor.java| 4 +- .../java/org/apache/struts2/ActionInvocation.java | 2 +- .../struts2/interceptor/ChainingInterceptor.java | 2 +- .../apache/struts2/result}/ActionChainResult.java | 9 +- .../ConfigurationProviderOgnlAllowlistTest.java| 2 + 7 files changed, 20 insertions(+), 254 deletions(-) copy core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2/result}/ActionChainResult.java (97%)
(struts) branch feature/WW-5481-text updated (026c992c0 -> e6c7ced60)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5481-text in repository https://gitbox.apache.org/repos/asf/struts.git omit 026c992c0 WW-5481 Extracts duplicated code omit dc62488bc WW-5481 Moves text related classes into org.apache.struts2.text add ced44650e WW-5480 Warn against potential templating bug add 22036174c Merge pull request #1108 from apache/WW-5480-templating-warning add d351843ec WW-3714 Move new Result class into result package add 01d953b1e Merge remote-tracking branch 'origin/WW-3714-result-repackage' into 7.0.x/merge-master-2024-11-03 add b0f2f0a8b Merge pull request #1110 from apache/7.0.x/merge-master-2024-11-03 add 957783b8a Merge pull request #1112 from apache/feature/WW-5459-restructure add 80dab5294 WW-5481 Moves text related classes into org.apache.struts2.text add e6c7ced60 WW-5481 Extracts duplicated code 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 (026c992c0) \ N -- N -- N refs/heads/feature/WW-5481-text (e6c7ced60) 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. No new revisions were added by this update. Summary of changes: .../java/org/apache/struts2/components/UIBean.java | 9 +++- .../org/apache/struts2/components/UIBeanTest.java | 48 ++ 2 files changed, 47 insertions(+), 10 deletions(-)