Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-06 23:27:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-5188 Replaces since 2.6 with 6.0

Browse Source
This commit is contained in:
Lukasz Lenart
2022-06-14 13:27:46 +02:00
parent ba041e1ee6
commit b6b74a46ea
43 changed files with 85 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/async/src/main/java/org/apache/struts2/async/AsyncAction.java
+1 -1
View File
@@ -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 {
plugins/async/src/main/java/org/apache/struts2/async/DefaultAsyncManager.java
+1 -1
View File
@@ -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);
plugins/embeddedjsp/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<artifactId>struts2-embeddedjsp-plugin</artifactId>
<packaging>jar</packaging>
<name>DEPRECATED: Struts 2 Embedded JSP Plugin (since 2.6)</name>
<name>DEPRECATED: Struts 2 Embedded JSP Plugin, since 6.0.0</name>
<dependencies>
<dependency>
plugins/gxp/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<artifactId>struts2-gxp-plugin</artifactId>
<packaging>jar</packaging>
<name>DEPRECATED: Struts 2 GXP Plugin - since 2.6</name>
<name>DEPRECATED: Struts 2 GXP Plugin - since 6.0.0</name>
<dependencies>
<dependency>
plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
+1 -1
View File
@@ -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);
plugins/osgi/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<artifactId>struts2-osgi-plugin</artifactId>
<packaging>jar</packaging>
<name>DEPRECATED: Struts 2 OSGi Plugin - since 2.6</name>
<name>DEPRECATED: Struts 2 OSGi Plugin - since 6.0.0</name>
<dependencies>
<!-- Define OSGi Core and Compendium dependencies directly here for the plugin.
plugins/osgi/src/main/java/org/apache/struts2/osgi/action/ServiceAware.java
+1 -1
View File
@@ -25,7 +25,7 @@ import java.util.List;
* registered with the type of the parameterized type
*
* @param <T> The type of the service
* @since 2.6
* @since 6.0.0
*/
public interface ServiceAware<T> {
plugins/oval/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<artifactId>struts2-oval-plugin</artifactId>
<packaging>jar</packaging>
<name>DEPRECATED: Struts 2 OVal Plugin (since 2.6)</name>
<name>DEPRECATED: Struts 2 OVal Plugin, since 6.0.0</name>
<dependencies>
<!-- OVal -->
plugins/plexus/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<artifactId>struts2-plexus-plugin</artifactId>
<packaging>jar</packaging>
<name>DEPRECATED: Struts 2 Plexus Plugin - since 2.6</name>
<name>DEPRECATED: Struts 2 Plexus Plugin - since 6.0.0</name>
<dependencies>
<dependency>
plugins/portlet-mocks/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<artifactId>struts2-portlet-mocks-plugin</artifactId>
<packaging>jar</packaging>
<name>DEPRECATED: Struts 2 Portlet Mocks Plugin - since 2.6</name>
<name>DEPRECATED: Struts 2 Portlet Mocks Plugin - since 6.0.0</name>
<dependencies>
<dependency>
plugins/portlet-tiles/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<artifactId>struts2-portlet-tiles-plugin</artifactId>
<packaging>jar</packaging>
<name>DEPRECATED: Struts 2 Portlet Tiles Plugin - since 2.6</name>
<name>DEPRECATED: Struts 2 Portlet Tiles Plugin - since 6.0.0</name>
<dependencies>
<dependency>
plugins/portlet/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<artifactId>struts2-portlet-plugin</artifactId>
<packaging>jar</packaging>
<name>DEPRECATED: Struts 2 Portlet Plugin - since 2.6</name>
<name>DEPRECATED: Struts 2 Portlet Plugin - since 6.0.0</name>
<dependencies>
<!-- junit and related JARs are needed for 'compile'! -->
plugins/portlet/src/main/java/org/apache/struts2/portlet/action/PortletContextAware.java
+1 -1
View File
@@ -21,7 +21,7 @@ package org.apache.struts2.portlet.action;
import javax.portlet.PortletContext;
/**
* @since 2.6
* @since 6.0.0
*/
public interface PortletContextAware {
plugins/portlet/src/main/java/org/apache/struts2/portlet/action/PortletPreferencesAware.java
+1 -1
View File
@@ -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 {
plugins/portlet/src/main/java/org/apache/struts2/portlet/action/PortletRequestAware.java
+1 -1
View File
@@ -21,7 +21,7 @@ package org.apache.struts2.portlet.action;
import javax.portlet.PortletRequest;
/**
* @since 2.6
* @since 6.0.0
*/
public interface PortletRequestAware {
plugins/portlet/src/main/java/org/apache/struts2/portlet/action/PortletResponseAware.java
+1 -1
View File
@@ -21,7 +21,7 @@ package org.apache.struts2.portlet.action;
import javax.portlet.PortletResponse;
/**
* @since 2.6
* @since 6.0.0
*/
public interface PortletResponseAware {
plugins/sitemesh/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<artifactId>struts2-sitemesh-plugin</artifactId>
<packaging>jar</packaging>
<name>DEPRECATED: Struts 2 Sitemesh Plugin - since 2.6</name>
<name>DEPRECATED: Struts 2 Sitemesh Plugin - since 6.0.0</name>
<dependencies>
<dependency>
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java
+1 -1
View File
@@ -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<VelocityContext> chainedContexts, ValueStack stack) {
this.chainedContexts = chainedContexts;
plugins/velocity/src/main/resources/struts-plugin.xml
+6 -6
View File
@@ -20,18 +20,18 @@
*/
-->
<!DOCTYPE struts PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 2.6//EN"
"http://struts.apache.org/dtds/struts-2.6.dtd">
"-//Apache Software Foundation//DTD Struts Configuration 6.0//EN"
"struts-6.0.dtd">
<struts>
<bean name="struts" class="org.apache.struts2.views.velocity.VelocityManager" />
<bean name="struts" class="org.apache.struts2.views.velocity.VelocityManager"/>
<bean type="org.apache.struts2.components.template.TemplateEngine" name="vm"
class="org.apache.struts2.views.velocity.template.VelocityTemplateEngine" />
class="org.apache.struts2.views.velocity.template.VelocityTemplateEngine"/>
<bean type="org.apache.struts2.views.TagLibraryDirectiveProvider" name="s"
class="org.apache.struts2.views.velocity.VelocityTagLibrary" />
class="org.apache.struts2.views.velocity.VelocityTagLibrary"/>
<package name="velocity-default" extends="struts-default">
<result-types>