diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index 358a31212..395dcb80f 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -29,7 +29,7 @@ struts2-osgi-admin-bundle bundle - DEPRECATED: Struts 2 OSGi Admin Bundle - since 2.6 + DEPRECATED: Struts 2 OSGi Admin Bundle - since 6.0.0 diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index 6c878046b..7258e0dd7 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -29,7 +29,7 @@ struts2-osgi-demo-bundle bundle - DEPRECATED: Struts 2 OSGi Demo Bundle - since 2.6 + DEPRECATED: Struts 2 OSGi Demo Bundle - since 6.0.0 diff --git a/bundles/pom.xml b/bundles/pom.xml index cf23b9673..af4fd2d53 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -29,7 +29,7 @@ struts2-osgi-bundles pom - DEPRECATED: Struts 2 OSGi Bundles - since 2.6 + DEPRECATED: Struts 2 OSGi Bundles - since 6.0.0 admin diff --git a/core/pom.xml b/core/pom.xml index 137c34801..d7cee0c16 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -31,7 +31,7 @@ Struts 2 Core - 2.6 + 6.0 UTF-8 diff --git a/core/src/main/java/com/opensymphony/xwork2/AsyncManager.java b/core/src/main/java/com/opensymphony/xwork2/AsyncManager.java index 5bada9c77..a4dd07161 100644 --- a/core/src/main/java/com/opensymphony/xwork2/AsyncManager.java +++ b/core/src/main/java/com/opensymphony/xwork2/AsyncManager.java @@ -24,7 +24,7 @@ import java.util.concurrent.Callable; * Adds support for invoke async actions. This allows us to support action methods that return {@link Callable} * as well as invoking them in separate not-container thread then executing the result in another container thread. * - * @since 2.6 + * @since 6.0.0 */ public interface AsyncManager { boolean hasAsyncActionResult(); diff --git a/core/src/main/java/com/opensymphony/xwork2/security/NotExcludedAcceptedPatternsChecker.java b/core/src/main/java/com/opensymphony/xwork2/security/NotExcludedAcceptedPatternsChecker.java index 030b5b67e..48cd22cae 100644 --- a/core/src/main/java/com/opensymphony/xwork2/security/NotExcludedAcceptedPatternsChecker.java +++ b/core/src/main/java/com/opensymphony/xwork2/security/NotExcludedAcceptedPatternsChecker.java @@ -21,7 +21,7 @@ package com.opensymphony.xwork2.security; /** * Used across different places to check if given string is not excluded and is accepted * @see here - * @since 2.6 + * @since 6.0.0 */ public interface NotExcludedAcceptedPatternsChecker extends ExcludedPatternsChecker, AcceptedPatternsChecker { diff --git a/core/src/main/java/com/opensymphony/xwork2/util/AbstractLocalizedTextProvider.java b/core/src/main/java/com/opensymphony/xwork2/util/AbstractLocalizedTextProvider.java index 5685d5e30..2d6a7c678 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/AbstractLocalizedTextProvider.java +++ b/core/src/main/java/com/opensymphony/xwork2/util/AbstractLocalizedTextProvider.java @@ -235,7 +235,7 @@ abstract class AbstractLocalizedTextProvider implements LocalizedTextProvider { * * @param bundleName The bundle to remove from the bundle map * - * @deprecated A "no-op" since 2.6. Use {@link #clearBundle(java.lang.String, java.util.Locale)} instead. + * @deprecated A "no-op" since 6.0.0. Use {@link #clearBundle(java.lang.String, java.util.Locale)} instead. */ public void clearBundle(final String bundleName) { LOG.debug("No-op. Did NOT clear resource bundle [{}], result: false.", bundleName); @@ -248,7 +248,7 @@ abstract class AbstractLocalizedTextProvider implements LocalizedTextProvider { * @param bundleName The bundle (combined with locale) to remove from the bundle map * @param locale Provides the locale to combine with the bundle to get the key * - * @since 2.6 + * @since 6.0.0 */ protected void clearBundle(final String bundleName, Locale locale) { final String key = createMissesKey(String.valueOf(getCurrentThreadContextClassLoader().hashCode()), bundleName, locale); @@ -266,7 +266,7 @@ abstract class AbstractLocalizedTextProvider implements LocalizedTextProvider { * {@link AbstractLocalizedTextProvider} has already been used for failed bundle * lookups of a given key, or some transitory state made a bundle lookup fail. * - * @since 2.6 + * @since 6.0.0 */ protected void clearMissingBundlesCache() { missingBundles.clear(); @@ -313,7 +313,7 @@ abstract class AbstractLocalizedTextProvider implements LocalizedTextProvider { * The clearCache() methods have been available since Java 1.6, so * it is anticipated the logic will work on any subsequent JVM versions. * - * @since 2.6 + * @since 6.0.0 */ private void clearResourceBundleClassloaderCaches() { final ClassLoader ccl = getCurrentThreadContextClassLoader(); @@ -436,7 +436,7 @@ abstract class AbstractLocalizedTextProvider implements LocalizedTextProvider { * * @param searchDefaultBundlesFirst provide {@link String} "true" or "false" to set the flag state accordingly. * - * @since 2.6 + * @since 6.0.0 */ @Inject(value = StrutsConstants.STRUTS_I18N_SEARCH_DEFAULTBUNDLES_FIRST, required = false) public void setSearchDefaultBundlesFirst(String searchDefaultBundlesFirst) { diff --git a/core/src/main/java/org/apache/struts2/StrutsConstants.java b/core/src/main/java/org/apache/struts2/StrutsConstants.java index 865d5b950..710062269 100644 --- a/core/src/main/java/org/apache/struts2/StrutsConstants.java +++ b/core/src/main/java/org/apache/struts2/StrutsConstants.java @@ -43,7 +43,7 @@ public final class StrutsConstants { * Note: This control flag may not be meaningful to all provider implementations, and should be false by default. *

* - * @since 2.6 + * @since 6.0.0 */ public static final String STRUTS_I18N_SEARCH_DEFAULTBUNDLES_FIRST = "struts.i18n.search.defaultbundles.first"; @@ -254,7 +254,7 @@ public final class StrutsConstants { * Specifies an OGNL expression cache factory implementation. A default implementation is provided, but * could be replaced by a custom one if desired. * - * @since 2.6 + * @since 6.0.0 */ public static final String STRUTS_OGNL_EXPRESSION_CACHE_FACTORY = "struts.ognl.expressionCacheFactory"; @@ -262,7 +262,7 @@ public final class StrutsConstants { * Specifies an OGNL BeanInfo cache factory implementation. A default implementation is provided, but * could be replaced by a custom one if desired. * - * @since 2.6 + * @since 6.0.0 */ public static final String STRUTS_OGNL_BEANINFO_CACHE_FACTORY = "struts.ognl.beanInfoCacheFactory"; @@ -275,7 +275,7 @@ public final class StrutsConstants { * For the optional LRU cache, once the maximum is reached, the least-recently-used (LRU) entry will be * removed when a new entry needs to be added (cache is fully-utilized). * - * @since 2.6 + * @since 6.0.0 */ public static final String STRUTS_OGNL_BEANINFO_CACHE_MAXSIZE = "struts.ognl.beanInfoCacheMaxSize"; @@ -287,32 +287,32 @@ public final class StrutsConstants { * Note: When enabling LRU cache mode you must also set a maximum size (via {@link #STRUTS_OGNL_BEANINFO_CACHE_MAXSIZE}) * for it to be effective. Otherwise, there is no condition to evict a LRU entry (cache has no limit). * - * @since 2.6 + * @since 6.0.0 */ public static final String STRUTS_OGNL_BEANINFO_CACHE_LRU_MODE = "struts.ognl.beanInfoCacheLRUMode"; /** * Logs properties that are not found (very verbose) - * @since 2.6 + * @since 6.0.0 */ public static final String STRUTS_OGNL_LOG_MISSING_PROPERTIES = "struts.ognl.logMissingProperties"; /** * Logs properties that are not found (very verbose) - * @deprecated as of 2.6. Use {@link #STRUTS_OGNL_LOG_MISSING_PROPERTIES} instead. + * @deprecated as of 6.0.0. Use {@link #STRUTS_OGNL_LOG_MISSING_PROPERTIES} instead. */ @Deprecated public static final String STRUTS_LOG_MISSING_PROPERTIES = STRUTS_OGNL_LOG_MISSING_PROPERTIES; /** * Enables caching of parsed OGNL expressions - * @since 2.6 + * @since 6.0.0 */ public static final String STRUTS_OGNL_ENABLE_EXPRESSION_CACHE = "struts.ognl.enableExpressionCache"; /** * Enables caching of parsed OGNL expressions - * @deprecated as of 2.6. Use {@link #STRUTS_OGNL_ENABLE_EXPRESSION_CACHE} instead. + * @deprecated as of 6.0.0. Use {@link #STRUTS_OGNL_ENABLE_EXPRESSION_CACHE} instead. */ public static final String STRUTS_ENABLE_OGNL_EXPRESSION_CACHE = STRUTS_OGNL_ENABLE_EXPRESSION_CACHE; @@ -325,7 +325,7 @@ public final class StrutsConstants { * For the optional LRU cache, once the maximum is reached, the least-recently-used (LRU) entry will be * removed when a new entry needs to be added (cache is fully-utilized). * - * @since 2.6 + * @since 6.0.0 */ public static final String STRUTS_OGNL_EXPRESSION_CACHE_MAXSIZE = "struts.ognl.expressionCacheMaxSize"; @@ -337,19 +337,19 @@ public final class StrutsConstants { * Note: When enabling LRU cache mode you must also set a maximum size (via {@link #STRUTS_OGNL_EXPRESSION_CACHE_MAXSIZE}) * for it to be effective. Otherwise, there is no condition to evict a LRU entry (cache has no limit). * - * @since 2.6 + * @since 6.0.0 */ public static final String STRUTS_OGNL_EXPRESSION_CACHE_LRU_MODE = "struts.ognl.expressionCacheLRUMode"; /** * Enables evaluation of OGNL expressions - * @since 2.6 + * @since 6.0.0 */ public static final String STRUTS_OGNL_ENABLE_EVAL_EXPRESSION = "struts.ognl.enableEvalExpression"; /** * Enables evaluation of OGNL expressions - * @deprecated as of 2.6. Use {@link #STRUTS_OGNL_ENABLE_EVAL_EXPRESSION} instead. + * @deprecated as of 6.0.0. Use {@link #STRUTS_OGNL_ENABLE_EVAL_EXPRESSION} instead. */ public static final String STRUTS_ENABLE_OGNL_EVAL_EXPRESSION = STRUTS_OGNL_ENABLE_EVAL_EXPRESSION; diff --git a/core/src/main/java/org/apache/struts2/action/CookiesAware.java b/core/src/main/java/org/apache/struts2/action/CookiesAware.java index ba753869a..487c961ab 100644 --- a/core/src/main/java/org/apache/struts2/action/CookiesAware.java +++ b/core/src/main/java/org/apache/struts2/action/CookiesAware.java @@ -29,7 +29,7 @@ import java.util.Map; * Please note that the {@link CookieInterceptor} needs to be * activated to receive a cookies map. * - * @since 2.6 + * @since 6.0.0 */ public interface CookiesAware { /** @@ -37,4 +37,4 @@ public interface CookiesAware { * @param cookies the cookies */ void withCookies(Map cookies); -} \ No newline at end of file +} diff --git a/core/src/main/java/org/apache/struts2/action/ParametersAware.java b/core/src/main/java/org/apache/struts2/action/ParametersAware.java index 475d603c0..8cbf45ef6 100644 --- a/core/src/main/java/org/apache/struts2/action/ParametersAware.java +++ b/core/src/main/java/org/apache/struts2/action/ParametersAware.java @@ -28,7 +28,7 @@ import org.apache.struts2.dispatcher.HttpParameters; * One common use for this is to have the action propagate parameters to internally instantiated data * objects. * - * @since 2.6 + * @since 6.0.0 */ public interface ParametersAware { diff --git a/core/src/main/java/org/apache/struts2/action/ServletContextAware.java b/core/src/main/java/org/apache/struts2/action/ServletContextAware.java index 09a99d081..d9c5161e2 100644 --- a/core/src/main/java/org/apache/struts2/action/ServletContextAware.java +++ b/core/src/main/java/org/apache/struts2/action/ServletContextAware.java @@ -23,7 +23,7 @@ import javax.servlet.ServletContext; /** * For components that have a dependence on the Servlet context. * - * @since 2.6 + * @since 6.0.0 */ public interface ServletContextAware { diff --git a/core/src/main/java/org/apache/struts2/components/Component.java b/core/src/main/java/org/apache/struts2/components/Component.java index f45dac07d..579087098 100644 --- a/core/src/main/java/org/apache/struts2/components/Component.java +++ b/core/src/main/java/org/apache/struts2/components/Component.java @@ -538,7 +538,7 @@ public class Component { * Override to set if body content should be HTML-escaped. * * @return always true (default) for this component. - * @since 2.6 + * @since 6.0.0 */ public boolean escapeHtmlBody() { return escapeHtmlBody; @@ -600,7 +600,7 @@ public class Component { * * @param expression of the component * @return true|false - * @since 2.6 + * @since 6.0.0 */ protected boolean isAcceptableExpression(String expression) { NotExcludedAcceptedPatternsChecker.IsAllowed isAllowed = notExcludedAcceptedPatterns.isAllowed(expression); diff --git a/core/src/main/java/org/apache/struts2/components/Date.java b/core/src/main/java/org/apache/struts2/components/Date.java index ad174fd11..8734fcc69 100644 --- a/core/src/main/java/org/apache/struts2/components/Date.java +++ b/core/src/main/java/org/apache/struts2/components/Date.java @@ -59,7 +59,7 @@ import java.util.List; *

* *

- * Note: Since Struts 2.6 a new Java 8 API has been used to format the Date, it's based on + * Note: Since Struts 6.0.0 a new Java 8 API has been used to format the Date, it's based on * DateTimeFormatter * which uses a bit different patterns. *

diff --git a/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java b/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java index f876d0632..168a9224b 100644 --- a/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java +++ b/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java @@ -83,14 +83,14 @@ public class StrutsXmlConfigurationProvider extends XmlConfigurationProvider { dtdMappings.put("-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN", "struts-2.1.7.dtd"); dtdMappings.put("-//Apache Software Foundation//DTD Struts Configuration 2.3//EN", "struts-2.3.dtd"); dtdMappings.put("-//Apache Software Foundation//DTD Struts Configuration 2.5//EN", "struts-2.5.dtd"); - dtdMappings.put("-//Apache Software Foundation//DTD Struts Configuration 2.6//EN", "struts-2.6.dtd"); + dtdMappings.put("-//Apache Software Foundation//DTD Struts Configuration 6.0//EN", "struts-6.0.dtd"); setDtdMappings(dtdMappings); File file = new File(filename); if (file.getParent() != null) { this.baseDir = file.getParentFile(); } } - + /* (non-Javadoc) * @see com.opensymphony.xwork2.config.providers.XmlConfigurationProvider#register(com.opensymphony.xwork2.inject.ContainerBuilder, java.util.Properties) */ @@ -175,7 +175,7 @@ public class StrutsXmlConfigurationProvider extends XmlConfigurationProvider { } } - + public String toString() { return ("Struts XML configuration provider ("+filename+")"); } diff --git a/core/src/main/java/org/apache/struts2/result/StreamResult.java b/core/src/main/java/org/apache/struts2/result/StreamResult.java index 131614dd9..86efd7530 100644 --- a/core/src/main/java/org/apache/struts2/result/StreamResult.java +++ b/core/src/main/java/org/apache/struts2/result/StreamResult.java @@ -295,7 +295,7 @@ public class StreamResult extends StrutsResultSupport { * * @param expression of result * @return true|false - * @since 2.6 + * @since 6.0.0 */ protected boolean isAcceptableExpression(String expression) { NotExcludedAcceptedPatternsChecker.IsAllowed isAllowed = notExcludedAcceptedPatterns.isAllowed(expression); diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java index 0e181d5c6..12482ab02 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java @@ -154,7 +154,7 @@ public class AnchorTag extends AbstractClosingTag { * * @param escapeHtmlBody * - * @since 2.6 + * @since 6.0.0 */ public void setEscapeHtmlBody(String escapeHtmlBody) { this.escapeHtmlBody = escapeHtmlBody; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java index 2bfd6a91e..6f77e92b9 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java @@ -81,7 +81,7 @@ public class SubmitTag extends AbstractClosingTag { * * @param escapeHtmlBody * - * @since 2.6 + * @since 6.0.0 */ public void setEscapeHtmlBody(boolean escapeHtmlBody) { this.escapeHtmlBody = escapeHtmlBody; diff --git a/core/src/main/resources/struts-2.6.dtd b/core/src/main/resources/struts-6.0.dtd similarity index 96% rename from core/src/main/resources/struts-2.6.dtd rename to core/src/main/resources/struts-6.0.dtd index 964fd691b..3df027de9 100644 --- a/core/src/main/resources/struts-2.6.dtd +++ b/core/src/main/resources/struts-6.0.dtd @@ -26,8 +26,8 @@ Use the following DOCTYPE + "-//Apache Software Foundation//DTD Struts Configuration 6.0//EN" + "http://struts.apache.org/dtds/struts-6.0.dtd"> --> diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml index f493fceac..7edadc729 100644 --- a/core/src/main/resources/struts-default.xml +++ b/core/src/main/resources/struts-default.xml @@ -31,8 +31,8 @@ and {@link com.opensymphony.xwork2.inject.Inject} --> + "-//Apache Software Foundation//DTD Struts Configuration 6.0//EN" + "struts-6.0.dtd"> diff --git a/core/src/test/java/com/opensymphony/xwork2/util/StrutsLocalizedTextProviderTest.java b/core/src/test/java/com/opensymphony/xwork2/util/StrutsLocalizedTextProviderTest.java index f7669b1f5..b86923db1 100644 --- a/core/src/test/java/com/opensymphony/xwork2/util/StrutsLocalizedTextProviderTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/util/StrutsLocalizedTextProviderTest.java @@ -264,7 +264,7 @@ public class StrutsLocalizedTextProviderTest extends XWorkTestCase { * Unit test to confirm expected behaviour of "clearing methods" provided to * StrutsLocalizedTextProvider (from AbstractLocalizedTextProvider). * - * @since 2.6 + * @since 6.0.0 */ public void testLocalizedTextProviderClearingMethods() { TestStrutsLocalizedTextProvider testStrutsLocalizedTextProvider = new TestStrutsLocalizedTextProvider(); @@ -331,7 +331,7 @@ public class StrutsLocalizedTextProviderTest extends XWorkTestCase { * Unit test to confirm the basic behaviour of bundle reload methods provided to * StrutsLocalizedTextProvider (from AbstractLocalizedTextProvider). * - * @since 2.6 + * @since 6.0.0 */ public void testLocalizedTextProviderReloadMethods() { TestStrutsLocalizedTextProvider testStrutsLocalizedTextProvider = new TestStrutsLocalizedTextProvider(); @@ -582,7 +582,7 @@ public class StrutsLocalizedTextProviderTest extends XWorkTestCase { /** * Basic test class to allow specific testing of StrutsLocalizedTextProvider. * - * @since 2.6 + * @since 6.0.0 */ class TestStrutsLocalizedTextProvider extends StrutsLocalizedTextProvider { diff --git a/core/src/test/resources/org/apache/struts2/dispatcher/ng/struts-no-op.xml b/core/src/test/resources/org/apache/struts2/dispatcher/ng/struts-no-op.xml index 55a8f3206..e9cf3be11 100644 --- a/core/src/test/resources/org/apache/struts2/dispatcher/ng/struts-no-op.xml +++ b/core/src/test/resources/org/apache/struts2/dispatcher/ng/struts-no-op.xml @@ -20,6 +20,6 @@ */ --> - \ No newline at end of file + "-//Apache Software Foundation//DTD Struts Configuration 6.0//EN" + "struts-6.0.dtd"> + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/WW3090-struts.xml b/core/src/test/resources/org/apache/struts2/views/jsp/WW3090-struts.xml index 8e23a208f..974d4bfab 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/WW3090-struts.xml +++ b/core/src/test/resources/org/apache/struts2/views/jsp/WW3090-struts.xml @@ -21,14 +21,14 @@ --> + "-//Apache Software Foundation//DTD Struts Configuration 6.0//EN" + "struts-6.0.dtd"> - - - + + + diff --git a/core/src/test/resources/struts-escape-body.xml b/core/src/test/resources/struts-escape-body.xml index d3f708469..186ba9760 100644 --- a/core/src/test/resources/struts-escape-body.xml +++ b/core/src/test/resources/struts-escape-body.xml @@ -20,8 +20,8 @@ */ --> + "-//Apache Software Foundation//DTD Struts Configuration 6.0//EN" + "struts-6.0.dtd"> diff --git a/core/src/test/resources/struts.xml b/core/src/test/resources/struts.xml index 0cf1ab00f..59197aab3 100644 --- a/core/src/test/resources/struts.xml +++ b/core/src/test/resources/struts.xml @@ -20,8 +20,8 @@ */ --> + "-//Apache Software Foundation//DTD Struts Configuration 6.0//EN" + "struts-6.0.dtd"> @@ -56,25 +56,25 @@ - + org/apache/struts2/views/freemarker/callActionFreeMarker2.ftl - + org/apache/struts2/views/freemarker/dynaAttributes.ftl - + org/apache/struts2/views/freemarker/manual-list.ftl - + org/apache/struts2/views/freemarker/customTextField.ftl diff --git a/plugins/async/src/main/java/org/apache/struts2/async/AsyncAction.java b/plugins/async/src/main/java/org/apache/struts2/async/AsyncAction.java index 1edf5d45a..447953b29 100644 --- a/plugins/async/src/main/java/org/apache/struts2/async/AsyncAction.java +++ b/plugins/async/src/main/java/org/apache/struts2/async/AsyncAction.java @@ -24,7 +24,7 @@ import java.util.concurrent.Executor; /** * A {@link Callable} with a timeout value and an {@link Executor}. * - * @since 2.6 + * @since 6.0.0 */ public class AsyncAction implements Callable { diff --git a/plugins/async/src/main/java/org/apache/struts2/async/DefaultAsyncManager.java b/plugins/async/src/main/java/org/apache/struts2/async/DefaultAsyncManager.java index 8543590bb..827783dd8 100644 --- a/plugins/async/src/main/java/org/apache/struts2/async/DefaultAsyncManager.java +++ b/plugins/async/src/main/java/org/apache/struts2/async/DefaultAsyncManager.java @@ -35,7 +35,7 @@ import java.util.concurrent.atomic.AtomicInteger; /** * Implements {@link AsyncManager} to add support for invoke async actions via Servlet 3's API. * - * @since 2.6 + * @since 6.0.0 */ public class DefaultAsyncManager implements AsyncManager, AsyncListener { private static final Logger LOG = LogManager.getLogger(DefaultAsyncManager.class); diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml index bae094598..9da33bbc1 100644 --- a/plugins/embeddedjsp/pom.xml +++ b/plugins/embeddedjsp/pom.xml @@ -29,7 +29,7 @@ struts2-embeddedjsp-plugin jar - DEPRECATED: Struts 2 Embedded JSP Plugin (since 2.6) + DEPRECATED: Struts 2 Embedded JSP Plugin, since 6.0.0 diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml index d22a7372f..d64ae471a 100644 --- a/plugins/gxp/pom.xml +++ b/plugins/gxp/pom.xml @@ -29,7 +29,7 @@ struts2-gxp-plugin jar - DEPRECATED: Struts 2 GXP Plugin - since 2.6 + DEPRECATED: Struts 2 GXP Plugin - since 6.0.0 diff --git a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java index 8a67556c7..088267829 100644 --- a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java +++ b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java @@ -512,7 +512,7 @@ public class JasperReportsResult extends StrutsResultSupport implements JasperRe * * @param expression of result * @return true|false - * @since 2.6 + * @since 6.0.0 */ protected boolean isAcceptableExpression(String expression) { NotExcludedAcceptedPatternsChecker.IsAllowed isAllowed = notExcludedAcceptedPatterns.isAllowed(expression); diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml index 8b8867df2..98a251676 100644 --- a/plugins/osgi/pom.xml +++ b/plugins/osgi/pom.xml @@ -29,7 +29,7 @@ struts2-osgi-plugin jar - DEPRECATED: Struts 2 OSGi Plugin - since 2.6 + DEPRECATED: Struts 2 OSGi Plugin - since 6.0.0 diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml index e825f8bfd..ca58f500e 100644 --- a/plugins/plexus/pom.xml +++ b/plugins/plexus/pom.xml @@ -29,7 +29,7 @@ struts2-plexus-plugin jar - DEPRECATED: Struts 2 Plexus Plugin - since 2.6 + DEPRECATED: Struts 2 Plexus Plugin - since 6.0.0 diff --git a/plugins/portlet-mocks/pom.xml b/plugins/portlet-mocks/pom.xml index 90d3ea389..a3e42df93 100644 --- a/plugins/portlet-mocks/pom.xml +++ b/plugins/portlet-mocks/pom.xml @@ -29,7 +29,7 @@ struts2-portlet-mocks-plugin jar - DEPRECATED: Struts 2 Portlet Mocks Plugin - since 2.6 + DEPRECATED: Struts 2 Portlet Mocks Plugin - since 6.0.0 diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml index 89f478f60..c13e058e5 100644 --- a/plugins/portlet-tiles/pom.xml +++ b/plugins/portlet-tiles/pom.xml @@ -29,7 +29,7 @@ struts2-portlet-tiles-plugin jar - DEPRECATED: Struts 2 Portlet Tiles Plugin - since 2.6 + DEPRECATED: Struts 2 Portlet Tiles Plugin - since 6.0.0 diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml index b45babc93..151dab478 100644 --- a/plugins/portlet/pom.xml +++ b/plugins/portlet/pom.xml @@ -29,7 +29,7 @@ struts2-portlet-plugin jar - DEPRECATED: Struts 2 Portlet Plugin - since 2.6 + DEPRECATED: Struts 2 Portlet Plugin - since 6.0.0 diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/action/PortletContextAware.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/action/PortletContextAware.java index c34039794..38a9f6f62 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/action/PortletContextAware.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/action/PortletContextAware.java @@ -21,7 +21,7 @@ package org.apache.struts2.portlet.action; import javax.portlet.PortletContext; /** - * @since 2.6 + * @since 6.0.0 */ public interface PortletContextAware { diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/action/PortletPreferencesAware.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/action/PortletPreferencesAware.java index da20c023b..0bc1723e5 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/action/PortletPreferencesAware.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/action/PortletPreferencesAware.java @@ -26,7 +26,7 @@ import javax.portlet.PortletPreferences; * implement this interface. If running in a servlet environment, an * appropriate testing implementation will be provided. * - * @since 2.6 + * @since 6.0.0 */ public interface PortletPreferencesAware { diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/action/PortletRequestAware.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/action/PortletRequestAware.java index b7537fe87..53eb3bc1b 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/action/PortletRequestAware.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/action/PortletRequestAware.java @@ -21,7 +21,7 @@ package org.apache.struts2.portlet.action; import javax.portlet.PortletRequest; /** - * @since 2.6 + * @since 6.0.0 */ public interface PortletRequestAware { diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/action/PortletResponseAware.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/action/PortletResponseAware.java index 007a65bb5..1a30072fb 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/action/PortletResponseAware.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/action/PortletResponseAware.java @@ -21,7 +21,7 @@ package org.apache.struts2.portlet.action; import javax.portlet.PortletResponse; /** - * @since 2.6 + * @since 6.0.0 */ public interface PortletResponseAware { diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml index 848e2e727..e0492252f 100644 --- a/plugins/sitemesh/pom.xml +++ b/plugins/sitemesh/pom.xml @@ -29,7 +29,7 @@ struts2-sitemesh-plugin jar - DEPRECATED: Struts 2 Sitemesh Plugin - since 2.6 + DEPRECATED: Struts 2 Sitemesh Plugin - since 6.0.0 diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java index 0b4bc73a2..b04dddc3c 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java @@ -36,7 +36,7 @@ public class StrutsVelocityContext extends VelocityContext { * * @param chainedContexts Existing Velocity contexts to chain to * @param stack Struts ValueStack - * @since 2.6 + * @since 6.0.0 */ public StrutsVelocityContext(List chainedContexts, ValueStack stack) { this.chainedContexts = chainedContexts; diff --git a/plugins/velocity/src/main/resources/struts-plugin.xml b/plugins/velocity/src/main/resources/struts-plugin.xml index 39112ba39..30084ed3d 100644 --- a/plugins/velocity/src/main/resources/struts-plugin.xml +++ b/plugins/velocity/src/main/resources/struts-plugin.xml @@ -20,18 +20,18 @@ */ --> - + "-//Apache Software Foundation//DTD Struts Configuration 6.0//EN" + "struts-6.0.dtd"> + - + + class="org.apache.struts2.views.velocity.template.VelocityTemplateEngine"/> + class="org.apache.struts2.views.velocity.VelocityTagLibrary"/>