You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2022/06/21 08:39:55 UTC
[struts] branch master updated (64d054221 -> 62b83021a)
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 64d054221 Merge pull request #566 from apache/WW-5185-struts-resource
add b6b74a46e WW-5188 Replaces since 2.6 with 6.0
new 62b83021a Merge pull request #569 from apache/WW-5188-since-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:
bundles/admin/pom.xml | 2 +-
bundles/demo/pom.xml | 2 +-
bundles/pom.xml | 2 +-
core/pom.xml | 2 +-
.../java/com/opensymphony/xwork2/AsyncManager.java | 2 +-
.../NotExcludedAcceptedPatternsChecker.java | 2 +-
.../xwork2/util/AbstractLocalizedTextProvider.java | 10 ++++-----
.../java/org/apache/struts2/StrutsConstants.java | 26 +++++++++++-----------
.../org/apache/struts2/action/CookiesAware.java | 4 ++--
.../org/apache/struts2/action/ParametersAware.java | 2 +-
.../apache/struts2/action/ServletContextAware.java | 2 +-
.../org/apache/struts2/components/Component.java | 4 ++--
.../java/org/apache/struts2/components/Date.java | 2 +-
.../config/StrutsXmlConfigurationProvider.java | 6 ++---
.../org/apache/struts2/result/StreamResult.java | 2 +-
.../org/apache/struts2/views/jsp/ui/AnchorTag.java | 2 +-
.../org/apache/struts2/views/jsp/ui/SubmitTag.java | 2 +-
.../resources/{struts-2.6.dtd => struts-6.0.dtd} | 4 ++--
core/src/main/resources/struts-default.xml | 4 ++--
.../util/StrutsLocalizedTextProviderTest.java | 6 ++---
.../apache/struts2/dispatcher/ng/struts-no-op.xml | 6 ++---
.../org/apache/struts2/views/jsp/WW3090-struts.xml | 12 +++++-----
core/src/test/resources/struts-escape-body.xml | 4 ++--
core/src/test/resources/struts.xml | 12 +++++-----
.../java/org/apache/struts2/async/AsyncAction.java | 2 +-
.../apache/struts2/async/DefaultAsyncManager.java | 2 +-
plugins/embeddedjsp/pom.xml | 2 +-
plugins/gxp/pom.xml | 2 +-
.../views/jasperreports/JasperReportsResult.java | 2 +-
plugins/osgi/pom.xml | 2 +-
.../apache/struts2/osgi/action/ServiceAware.java | 2 +-
plugins/oval/pom.xml | 2 +-
plugins/plexus/pom.xml | 2 +-
plugins/portlet-mocks/pom.xml | 2 +-
plugins/portlet-tiles/pom.xml | 2 +-
plugins/portlet/pom.xml | 2 +-
.../portlet/action/PortletContextAware.java | 2 +-
.../portlet/action/PortletPreferencesAware.java | 2 +-
.../portlet/action/PortletRequestAware.java | 2 +-
.../portlet/action/PortletResponseAware.java | 2 +-
plugins/sitemesh/pom.xml | 2 +-
.../views/velocity/StrutsVelocityContext.java | 2 +-
.../velocity/src/main/resources/struts-plugin.xml | 12 +++++-----
43 files changed, 85 insertions(+), 85 deletions(-)
rename core/src/main/resources/{struts-2.6.dtd => struts-6.0.dtd} (96%)
[struts] 01/01: Merge pull request #569 from apache/WW-5188-since-6
Posted by lu...@apache.org.
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 62b83021a27a24a96f76e60995f142808f485415
Merge: 64d054221 b6b74a46e
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Tue Jun 21 10:39:47 2022 +0200
Merge pull request #569 from apache/WW-5188-since-6
[WW-5188] Replaces since 2.6 with 6.0
bundles/admin/pom.xml | 2 +-
bundles/demo/pom.xml | 2 +-
bundles/pom.xml | 2 +-
core/pom.xml | 2 +-
.../java/com/opensymphony/xwork2/AsyncManager.java | 2 +-
.../NotExcludedAcceptedPatternsChecker.java | 2 +-
.../xwork2/util/AbstractLocalizedTextProvider.java | 10 ++++-----
.../java/org/apache/struts2/StrutsConstants.java | 26 +++++++++++-----------
.../org/apache/struts2/action/CookiesAware.java | 4 ++--
.../org/apache/struts2/action/ParametersAware.java | 2 +-
.../apache/struts2/action/ServletContextAware.java | 2 +-
.../org/apache/struts2/components/Component.java | 4 ++--
.../java/org/apache/struts2/components/Date.java | 2 +-
.../config/StrutsXmlConfigurationProvider.java | 6 ++---
.../org/apache/struts2/result/StreamResult.java | 2 +-
.../org/apache/struts2/views/jsp/ui/AnchorTag.java | 2 +-
.../org/apache/struts2/views/jsp/ui/SubmitTag.java | 2 +-
.../resources/{struts-2.6.dtd => struts-6.0.dtd} | 4 ++--
core/src/main/resources/struts-default.xml | 4 ++--
.../util/StrutsLocalizedTextProviderTest.java | 6 ++---
.../apache/struts2/dispatcher/ng/struts-no-op.xml | 6 ++---
.../org/apache/struts2/views/jsp/WW3090-struts.xml | 12 +++++-----
core/src/test/resources/struts-escape-body.xml | 4 ++--
core/src/test/resources/struts.xml | 12 +++++-----
.../java/org/apache/struts2/async/AsyncAction.java | 2 +-
.../apache/struts2/async/DefaultAsyncManager.java | 2 +-
plugins/embeddedjsp/pom.xml | 2 +-
plugins/gxp/pom.xml | 2 +-
.../views/jasperreports/JasperReportsResult.java | 2 +-
plugins/osgi/pom.xml | 2 +-
.../apache/struts2/osgi/action/ServiceAware.java | 2 +-
plugins/oval/pom.xml | 2 +-
plugins/plexus/pom.xml | 2 +-
plugins/portlet-mocks/pom.xml | 2 +-
plugins/portlet-tiles/pom.xml | 2 +-
plugins/portlet/pom.xml | 2 +-
.../portlet/action/PortletContextAware.java | 2 +-
.../portlet/action/PortletPreferencesAware.java | 2 +-
.../portlet/action/PortletRequestAware.java | 2 +-
.../portlet/action/PortletResponseAware.java | 2 +-
plugins/sitemesh/pom.xml | 2 +-
.../views/velocity/StrutsVelocityContext.java | 2 +-
.../velocity/src/main/resources/struts-plugin.xml | 12 +++++-----
43 files changed, 85 insertions(+), 85 deletions(-)