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 2016/05/11 04:34:14 UTC

svn commit: r987949 - in /websites/production/struts/content: announce.html archetype-catalog.xml docs/action-configuration.html docs/version-notes-25.html download.html downloads.html index.html

Author: lukaszlenart
Date: Wed May 11 04:34:13 2016
New Revision: 987949

Log:
Updates production

Modified:
    websites/production/struts/content/announce.html
    websites/production/struts/content/archetype-catalog.xml
    websites/production/struts/content/docs/action-configuration.html
    websites/production/struts/content/docs/version-notes-25.html
    websites/production/struts/content/download.html
    websites/production/struts/content/downloads.html
    websites/production/struts/content/index.html

Modified: websites/production/struts/content/announce.html
==============================================================================
--- websites/production/struts/content/announce.html (original)
+++ websites/production/struts/content/announce.html Wed May 11 04:34:13 2016
@@ -124,6 +124,54 @@
   Skip to: <a href="announce-2015.html">Announcements - 2015</a>
 </p>
 
+<h4 id="a20160509">9 May 2016 - Struts 2.5 General Availability</h4>
+
+<p>The Apache Struts group is pleased to announce that Struts 2.5 is available as a “General Availability”
+release. The GA designation is our highest quality grade.</p>
+
+<p>Apache Struts 2 is an elegant, extensible framework for creating enterprise-ready Java web applications.
+The framework is designed to streamline the full development cycle, from building, to deploying,
+to maintaining applications over time.</p>
+
+<p>This release contains several breaking changes and improvements just to mention few of them:</p>
+
+<ul>
+  <li>XWork source was merged into Struts Core source, it means that there be no more xwork artifact nor dedicated jar</li>
+  <li>Spring dependency for tests and spring plugin was upgraded to version 4.1.6, see WW-4510.</li>
+  <li>Struts2 internal logging api was marked as deprecated and was replaced with new Log4j2 api as logging layer, see WW-4504.</li>
+  <li>Struts2 is now build with JDK7, see WW-4503.</li>
+  <li>New plugin to support bean validation is now part of the distribution, see WW-4505.</li>
+  <li>Deprecated plugins are now removed from the distribution and are not longer supported anymore.
+    <ul>
+      <li>Dojo Plugin</li>
+      <li>Codebehind Plugin</li>
+      <li>JSF Plugin</li>
+      <li>Struts1 Plugin</li>
+    </ul>
+  </li>
+  <li>New security option was added - Strict Method Invocation (also known as Strict DMI), see WW-4540</li>
+  <li>Added support for latest stable AngularJS in Maven archetype, see WW-4522</li>
+  <li>Dropped support for id and name - replaced with var, see WW-2069</li>
+  <li>Dedicated archive with a minimal set of dependencies was introduced, see WW-4570</li>
+  <li>It is possible to use multiple names when defining a result, see WW-4590</li>
+  <li>Rest plugin honors Accept header, see WW-4588</li>
+  <li>New result ‘JSONActionRedirectResult’ in json-plugin was defined, see WW-4591</li>
+  <li>Tiles plugin was upgrade to the latest Tiles 3 and tiles3-plugin was dropped, see WW-4584</li>
+  <li>JasperReports plugins was upgraded to JasperReport 6.0, see WW-4381</li>
+  <li>OGNL was upgraded to version 3.1.4 and it breaks access to properties as it follows Java Bean Specification, see WW-4207 and WW-3909</li>
+  <li>Annotations to configure Tiles, see WW-4594 and Tiles Plugin</li>
+</ul>
+
+<p><strong>All developers are strongly advised to perform this action.</strong></p>
+
+<p>The 2.5.x series of the Apache Struts framework has a minimum requirement of the following specification versions:
+Servlet API 2.4, JSP API 2.0, and Java 7.</p>
+
+<p>Should any issues arise with your use of any version of the Struts framework, please post your comments
+to the user list, and, if appropriate, file a tracking ticket.</p>
+
+<p>You can download this version from our <a href="download.html#struts-ga">download</a> page.</p>
+
 <h4 id="a20160419">19 April 2016 - Struts 2.3.28.1 General Availability with Security Fixes Release</h4>
 
 <p>The Apache Struts group is pleased to announce that Struts 2.3.28.1 is available as a “General Availability”

Modified: websites/production/struts/content/archetype-catalog.xml
==============================================================================
Binary files - no diff available.

Modified: websites/production/struts/content/docs/action-configuration.html
==============================================================================
--- websites/production/struts/content/docs/action-configuration.html (original)
+++ websites/production/struts/content/docs/action-configuration.html Wed May 11 04:34:13 2016
@@ -139,11 +139,11 @@ under the License.
     <div class="pagecontent">
         <div class="wiki-content">
             <div id="ConfluenceContent"><p>The action mappings are the basic "unit-of-work" in the framework. Essentially, the action maps an identifier to a handler class. When a request matches the action's name, the framework uses the mapping to determine how to process the request.</p><p><style type="text/css">/*<![CDATA[*/
-div.rbtoc1462453925234 {padding: 0px;}
-div.rbtoc1462453925234 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1462453925234 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1462940751946 {padding: 0px;}
+div.rbtoc1462940751946 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1462940751946 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style></p><div class="toc-macro rbtoc1462453925234">
+/*]]>*/</style></p><div class="toc-macro rbtoc1462940751946">
 <ul class="toc-indentation"><li><a shape="rect" href="#ActionConfiguration-ActionMappings">Action Mappings</a></li><li><a shape="rect" href="#ActionConfiguration-ActionNames">Action Names</a></li><li><a shape="rect" href="#ActionConfiguration-ActionMethods">Action Methods</a></li><li><a shape="rect" href="#ActionConfiguration-WildcardMethod">Wildcard Method</a></li><li><a shape="rect" href="#ActionConfiguration-DynamicMethodInvocation">Dynamic Method Invocation</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#ActionConfiguration-StrictDMI">Strict DMI</a></li><li><a shape="rect" href="#ActionConfiguration-StrictMethodInvocation">Strict Method Invocation</a></li></ul>
 </li><li><a shape="rect" href="#ActionConfiguration-ActionSupportDefault">ActionSupport Default</a></li><li><a shape="rect" href="#ActionConfiguration-Post-BackDefault">Post-Back Default</a></li><li><a shape="rect" href="#ActionConfiguration-ActionDefault">Action Default</a>
@@ -246,9 +246,9 @@ public class ClassLevelAllowedMethodsAct
     }
 }</pre>
 </div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>SMI via annotation on package level (in package-info.java)</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">@org.apache.struts2.convention.annotation.AllowedMethods("home,start")
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">@org.apache.struts2.convention.annotation.AllowedMethods({"home", "start"})
 package org.apache.struts2.convention.actions.allowedmethods;</pre>
-</div></div><p>Allowed methods can be defined as:</p><ul style="list-style-type: square;"><li>literals ie.&#160;<code>execute,cancel</code></li><li>patterns when using with wildcard mapping, i.e <code>&lt;action ... method="do{2}"/&gt;</code></li><li>RegExs using <code>regex:</code>&#160;prefix, ie:&#160;<code>&lt;global-allowed-methods&gt;execute,input,cancel,regex:user([A-Z]*)&lt;/global-allowed-methods&gt;</code></li></ul><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please be aware when using your own <code>Configurationprovider</code> that the logic to set allowed methods is defined in built-in providers - <code>XmlConfigurationProvider</code> and <code>PackageBasedActionConfigBuilder</code> - and you must replicate such logic in your code as by default only <code>execute</code> method is allowed, eve
 n when SMI is disabled.</p></div></div><h2 id="ActionConfiguration-ActionSupportDefault">ActionSupport Default</h2><p>If the class attribute in an action mapping is left blank, the <code>com.opensymphony.xwork2.ActionSupport</code> class is used as a default.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div></div><p>Allowed methods can be defined as:</p><ul style="list-style-type: square;"><li><p>literals ie. in xml: <code>execute,cancel </code>or in annotation:<code> {"<code>execute</code>", "<code>cancel</code>"}<br clear="none"></code></p></li><li>patterns when using with wildcard mapping, i.e <code>&lt;action ... method="do{2}"/&gt;</code></li><li>RegExs using <code>regex:</code>&#160;prefix, ie:&#160;<code>&lt;global-allowed-methods&gt;execute,input,cancel,regex:user([A-Z]*)&lt;/global-allowed-methods&gt;</code></li></ul><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please be aware when using your own <code>Configurationprovider</code> that the logic to set allowed methods is defined in built-in providers - <code>XmlConfigurationProvider</code> and <code>PackageBasedActionConfigBuilder</code> - and
  you must replicate such logic in your code as by default only <code>execute</code> method is allowed, even when SMI is disabled.</p></div></div><h2 id="ActionConfiguration-ActionSupportDefault">ActionSupport Default</h2><p>If the class attribute in an action mapping is left blank, the <code>com.opensymphony.xwork2.ActionSupport</code> class is used as a default.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;action name="Hello"&gt;
    // ...
 &lt;/action&gt;

Modified: websites/production/struts/content/docs/version-notes-25.html
==============================================================================
--- websites/production/struts/content/docs/version-notes-25.html (original)
+++ websites/production/struts/content/docs/version-notes-25.html Wed May 11 04:34:13 2016
@@ -138,11 +138,11 @@ under the License.
 
     <div class="pagecontent">
         <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.5 distribution.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="version-notes-2324.html">Version Notes 2.3.24</a></p><ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-2-maven-archetypes.html">Maven Archetype</a>.</li></ul><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
+            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.5 distribution.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="version-notes-23281.html">Version Notes 2.3.28.1</a></p><ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-2-maven-archetypes.html">Maven Archetype</a>.</li></ul><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl
 ">
 <pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
   &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.5-BETA2&lt;/version&gt;
+  &lt;version&gt;2.5&lt;/version&gt;
 &lt;/dependency&gt;
 </pre>
 </div></div><p>You can also use Struts Archetype Catalog like below</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
@@ -155,7 +155,7 @@ under the License.
     &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
   &lt;/repository&gt;
 &lt;/repositories&gt;</pre>
-</div></div><h2 id="VersionNotes2.5-InternalChanges">Internal Changes</h2><ul><li>XWork source was merged into Struts Core source, it means that there be no more&#160;<code>xwork</code> artifact nor dedicated jar</li><li><span style="line-height: 1.42857;">Spring dependency for tests and spring plugin was upgraded to version&#160;4.1.6, see </span><a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4510" style="line-height: 1.42857;">WW-4510</a><span style="line-height: 1.42857;">.</span></li><li>Struts2 internal logging api was marked as deprecated and was replaced with new&#160;<a shape="rect" class="external-link" href="http://logging.apache.org/log4j/2.x/">Log4j2</a>&#160;api as logging layer, see <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4504">WW-4504</a>.</li><li>Struts2 is now build with JDK7, see <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4503">WW-4503</a>.</
 li><li>New plugin to support <a shape="rect" href="https://cwiki.apache.org/confluence/display/WW/Bean+Validation+Plugin">bean validation</a> is now part of the distribution, see <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4505">WW-4505</a>.</li><li>Deprecated plugins are now removed from the distribution and are not longer supported anymore.<ul><li>Dojo Plugin</li><li>Codebehind Plugin</li><li>JSF Plugin</li><li>Struts1 Plugin</li></ul></li><li>New security option was added - Strict Method Invocation (also known as Strict DMI), see <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4540">WW-4540</a></li><li>Added support for latest stable AngularJS in Maven&#160;archetype, see <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4522">WW-4522</a></li><li>Dropped support for&#160;<code>id</code> and&#160;<code>name</code> - replaced with&#160;<code>var</code>, see&#160;<a shape
 ="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-2069">WW-2069</a></li><li>Dedicated archive with a minimal set of dependencies was introduced, see&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4570">WW-4570</a></li><li>It is possible to use multiple names when defining a result, see&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4590">WW-4590</a></li><li>Rest plugin honors Accept header, see&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4588">WW-4588</a></li><li><p>New result 'JSONActionRedirectResult' in json-plugin was defined, see&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4591">WW-4591</a></p></li><li>Tiles plugin was upgrade to the latest Tiles 3 and tiles3-plugin was dropped, see&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4584"
 >WW-4584</a></li><li>JasperReports plugins was upgraded to JasperReport 6.0, see&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4381">WW-4381</a></li><li>OGNL was upgraded to version 3.0.11 and it breaks access to properties as it follows Java Bean Specification, see&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4207">WW-4207</a>&#160;and&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-3909">WW-3909</a><ul><li>and then OGNL was upgraded to version 3.1.1, see&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4561">WW-4561</a></li><li>and then OGNL was upgraded to version 3.2.1, see&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4577">WW-4577</a></li></ul></li></ul><h2 id="VersionNotes2.5-IssueDetail"><span style="font-size: 16.0px;line-height: 1.5625;">Issue Detail</span></h2
 ><ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12331974&amp;projectId=12311041">JIRA Release Notes 2.3.24</a>&#160;- TBU</li></ul><h3 id="VersionNotes2.5-IssueList">Issue List</h3><ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12330045">Struts 2.3.24 DONE</a>&#160;- TBU</li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12318399">Struts 2.3.x TODO</a>&#160;- TBU</li></ul><h3 id="VersionNotes2.5-Otherresources">Other resources</h3><ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs</a></li><li><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=struts.git;a=tree;h=refs/heads/develop;hb=develop">Source Code Repository</a></li></ul><div><span style="font-size: 24.0px;line-height: 30.0px;"><br clear="none"
 ></span></div><div><span style="font-size: 24.0px;line-height: 30.0px;background-color: rgb(245,245,245);"><br clear="none"></span></div></div>
+</div></div><h2 id="VersionNotes2.5-InternalChanges">Internal Changes</h2><ul><li>XWork source was merged into Struts Core source, it means that there be no more&#160;<code>xwork</code> artifact nor dedicated jar</li><li><span style="line-height: 1.42857;">Spring dependency for tests and spring plugin was upgraded to version&#160;4.1.6, see </span><a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4510" style="line-height: 1.42857;">WW-4510</a><span style="line-height: 1.42857;">.</span></li><li>Struts2 internal logging api was marked as deprecated and was replaced with new&#160;<a shape="rect" class="external-link" href="http://logging.apache.org/log4j/2.x/">Log4j2</a>&#160;api as logging layer, see <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4504">WW-4504</a>.</li><li>Struts2 is now build with JDK7, see <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4503">WW-4503</a>.</
 li><li>New plugin to support <a shape="rect" href="https://cwiki.apache.org/confluence/display/WW/Bean+Validation+Plugin">bean validation</a> is now part of the distribution, see <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4505">WW-4505</a>.</li><li>Deprecated plugins are now removed from the distribution and are not longer supported anymore.<ul><li>Dojo Plugin</li><li>Codebehind Plugin</li><li>JSF Plugin</li><li>Struts1 Plugin</li></ul></li><li>New security option was added - Strict Method Invocation (also known as Strict DMI), see <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4540">WW-4540</a></li><li>Added support for latest stable AngularJS in Maven&#160;archetype, see <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4522">WW-4522</a></li><li>Dropped support for&#160;<code>id</code> and&#160;<code>name</code> - replaced with&#160;<code>var</code>, see&#160;<a shape
 ="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-2069">WW-2069</a></li><li>Dedicated archive with a minimal set of dependencies was introduced, see&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4570">WW-4570</a></li><li>It is possible to use multiple names when defining a result, see&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4590">WW-4590</a></li><li>Rest plugin honors Accept header, see&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4588">WW-4588</a></li><li><p>New result 'JSONActionRedirectResult' in json-plugin was defined, see&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4591">WW-4591</a></p></li><li>Tiles plugin was upgrade to the latest Tiles 3 and tiles3-plugin was dropped, see&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4584"
 >WW-4584</a></li><li>JasperReports plugins was upgraded to JasperReport 6.0, see&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4381">WW-4381</a></li><li>OGNL was upgraded to version 3.1.4 and it breaks access to properties as it follows Java Bean Specification, see&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4207">WW-4207</a>&#160;and&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-3909">WW-3909</a></li><li>Annotations to configure Tiles, see <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4594">WW-4594</a> and <a shape="rect" href="https://cwiki.apache.org/confluence/display/WW/Tiles+Plugin">Tiles Plugin</a></li></ul><h2 id="VersionNotes2.5-IssueDetail"><span style="font-size: 16.0px;line-height: 1.5625;">Issue Detail</span></h2><ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secur
 e/ReleaseNote.jspa?version=12324447&amp;projectId=12311041">JIRA Release Notes 2.5</a></li></ul><h3 id="VersionNotes2.5-IssueList">Issue List</h3><ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12335472">Struts 2.3.28 DONE</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12335667">Struts 2.5.x TODO</a></li></ul><h3 id="VersionNotes2.5-Otherresources">Other resources</h3><ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs</a></li><li><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=struts.git;a=tree;h=refs/heads/develop;hb=develop">Source Code Repository</a></li></ul><div><span style="font-size: 24.0px;line-height: 30.0px;"><br clear="none"></span></div><div><span style="font-size: 24.0px;line-height: 30.0px;background-color: rgb(245,245,245);"><br clear="none"><
 /span></div></div>
         </div>
 
         

Modified: websites/production/struts/content/download.html
==============================================================================
--- websites/production/struts/content/download.html (original)
+++ websites/production/struts/content/download.html Wed May 11 04:34:13 2016
@@ -177,27 +177,27 @@
 <h1>Full Releases</h1>
 <a class="anchor" name="struts-ga"></a>
 
-<a class="anchor" name="struts23281"></a>
-<h2>Struts 2.3.28.1</h2>
+<a class="anchor" name="struts25"></a>
+<h2>Struts 2.5</h2>
 
 <p>
-  <a href="http://struts.apache.org/">Apache Struts 2.3.28.1</a> is an elegant, extensible
+  <a href="http://struts.apache.org/">Apache Struts 2.5</a> is an elegant, extensible
   framework for creating enterprise-ready Java web applications. It is available in a full distribution,
   or as separate library, source, example and documentation distributions.
-  Struts 2.3.28.1 is the "best available" version of Struts in the 2.3 series.
+  Struts 2.5 is the "best available" version of Struts in the 2.3 series.
 </p>
 
 <ul>
   <li>
-    <a href="http://struts.apache.org/docs/version-notes-23281.html">Version Notes</a>
+    <a href="http://struts.apache.org/docs/version-notes-25.html">Version Notes</a>
   </li>
 
   <li>Full Distribution:
     <ul>
       <li>
-        <a href="[preferred]struts/2.3.28.1/struts-2.3.28.1-all.zip">struts-2.3.28.1-all.zip</a> (65MB)
-        [<a href="http://www.apache.org/dist/struts/2.3.28.1/struts-2.3.28.1-all.zip.asc">PGP</a>]
-        [<a href="http://www.apache.org/dist/struts/2.3.28.1/struts-2.3.28.1-all.zip.md5">MD5</a>]
+        <a href="[preferred]struts/2.5/struts-2.5-all.zip">struts-2.5-all.zip</a> (65MB)
+        [<a href="http://www.apache.org/dist/struts/2.5/struts-2.5-all.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/2.5/struts-2.5-all.zip.md5">MD5</a>]
       </li>
     </ul>
   </li>
@@ -205,9 +205,9 @@
   <li>Example Applications:
     <ul>
       <li>
-        <a href="[preferred]struts/2.3.28.1/struts-2.3.28.1-apps.zip">struts-2.3.28.1-apps.zip</a> (35MB)
-        [<a href="http://www.apache.org/dist/struts/2.3.28.1/struts-2.3.28.1-apps.zip.asc">PGP</a>]
-        [<a href="http://www.apache.org/dist/struts/2.3.28.1/struts-2.3.28.1-apps.zip.md5">MD5</a>]
+        <a href="[preferred]struts/2.5/struts-2.5-apps.zip">struts-2.5-apps.zip</a> (35MB)
+        [<a href="http://www.apache.org/dist/struts/2.5/struts-2.5-apps.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/2.5/struts-2.5-apps.zip.md5">MD5</a>]
       </li>
     </ul>
   </li>
@@ -215,9 +215,9 @@
   <li>Essential Dependencies Only:
     <ul>
       <li>
-        <a href="[preferred]struts/2.3.28.1/struts-2.3.28.1-min-lib.zip">struts-2.3.28.1-min-lib.zip</a> (4MB)
-        [<a href="http://www.apache.org/dist/struts/2.3.28.1/struts-2.3.28.1-min-lib.zip.asc">PGP</a>]
-        [<a href="http://www.apache.org/dist/struts/2.3.28.1/struts-2.3.28.1-min-lib.zip.md5">MD5</a>]
+        <a href="[preferred]struts/2.5/struts-2.5-min-lib.zip">struts-2.5-min-lib.zip</a> (4MB)
+        [<a href="http://www.apache.org/dist/struts/2.5/struts-2.5-min-lib.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/2.5/struts-2.5-min-lib.zip.md5">MD5</a>]
       </li>
     </ul>
   </li>
@@ -225,9 +225,9 @@
   <li>All Dependencies:
     <ul>
       <li>
-        <a href="[preferred]struts/2.3.28.1/struts-2.3.28.1-lib.zip">struts-2.3.28.1-lib.zip</a> (19MB)
-        [<a href="http://www.apache.org/dist/struts/2.3.28.1/struts-2.3.28.1-lib.zip.asc">PGP</a>]
-        [<a href="http://www.apache.org/dist/struts/2.3.28.1/struts-2.3.28.1-lib.zip.md5">MD5</a>]
+        <a href="[preferred]struts/2.5/struts-2.5-lib.zip">struts-2.5-lib.zip</a> (19MB)
+        [<a href="http://www.apache.org/dist/struts/2.5/struts-2.5-lib.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/2.5/struts-2.5-lib.zip.md5">MD5</a>]
       </li>
     </ul>
   </li>
@@ -235,9 +235,9 @@
   <li>Documentation:
     <ul>
       <li>
-        <a href="[preferred]struts/2.3.28.1/struts-2.3.28.1-docs.zip">struts-2.3.28.1-docs.zip</a> (13MB)
-        [<a href="http://www.apache.org/dist/struts/2.3.28.1/struts-2.3.28.1-docs.zip.asc">PGP</a>]
-        [<a href="http://www.apache.org/dist/struts/2.3.28.1/struts-2.3.28.1-docs.zip.md5">MD5</a>]
+        <a href="[preferred]struts/2.5/struts-2.5-docs.zip">struts-2.5-docs.zip</a> (13MB)
+        [<a href="http://www.apache.org/dist/struts/2.5/struts-2.5-docs.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/2.5/struts-2.5-docs.zip.md5">MD5</a>]
       </li>
     </ul>
   </li>
@@ -245,9 +245,9 @@
   <li>Source:
     <ul>
       <li>
-        <a href="[preferred]struts/2.3.28.1/struts-2.3.28.1-src.zip">struts-2.3.28.1-src.zip</a> (7MB)
-        [<a href="http://www.apache.org/dist/struts/2.3.28.1/struts-2.3.28.1-src.zip.asc">PGP</a>]
-        [<a href="http://www.apache.org/dist/struts/2.3.28.1/struts-2.3.28.1-src.zip.md5">MD5</a>]
+        <a href="[preferred]struts/2.5/struts-2.5-src.zip">struts-2.5-src.zip</a> (7MB)
+        [<a href="http://www.apache.org/dist/struts/2.5/struts-2.5-src.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/2.5/struts-2.5-src.zip.md5">MD5</a>]
       </li>
     </ul>
   </li>
@@ -393,15 +393,15 @@
 
 <ul>
   <li>
-    <a href="http://struts.apache.org/docs/version-notes-25.html">Version Notes</a>
+    <a href="http://struts.apache.org/docs/version-notes-25B3.html">Version Notes</a>
   </li>
 
   <li>Full Distribution:
     <ul>
       <li>
         <a href="[preferred]struts/2.5-BETA3/struts-2.5-BETA3-all.zip">struts-2.5-BETA3-all.zip</a> (65MB)
-        [<a href="http://www.apache.org/dist/struts/2.3.28.1/struts-2.5-BETA3-all.zip.asc">PGP</a>]
-        [<a href="http://www.apache.org/dist/struts/2.3.28.1/struts-2.5-BETA3-all.zip.md5">MD5</a>]
+        [<a href="http://www.apache.org/dist/struts/2.5/struts-2.5-BETA3-all.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/2.5/struts-2.5-BETA3-all.zip.md5">MD5</a>]
       </li>
     </ul>
   </li>

Modified: websites/production/struts/content/downloads.html
==============================================================================
--- websites/production/struts/content/downloads.html (original)
+++ websites/production/struts/content/downloads.html Wed May 11 04:34:13 2016
@@ -137,7 +137,7 @@
     <ul>
       <li>
         <a href="http://struts.apache.org/download.cgi#struts-ga">
-          Struts 2.3.28.1
+          Struts 2.5
         </a> ("best available")
       </li>
     </ul>

Modified: websites/production/struts/content/index.html
==============================================================================
--- websites/production/struts/content/index.html (original)
+++ websites/production/struts/content/index.html Wed May 11 04:34:13 2016
@@ -125,7 +125,7 @@
       extensible using a plugin architecture, and ships with plugins to support
       REST, AJAX and JSON.
     </p>
-    <a href="/download.cgi#struts23281" class="btn btn-primary btn-large">
+    <a href="/download.cgi#struts25" class="btn btn-primary btn-large">
       <img src="img/download-icon.svg"> Download
     </a>
     <a href="primer.html" class="btn btn-info btn-large">
@@ -137,12 +137,12 @@
   <div class="col-md-12">
     <div class="row">
       <div class="column col-md-4">
-        <h2>Struts 2.3.28.1 GA</h2>
+        <h2>Struts 2.5 GA</h2>
         <p>
-          Apache Struts 2.3.28.1 GA has been released<br/>on 19 april 2016.
+          Apache Struts 2.5 GA has been released<br/>on 9 may 2016.
         </p>
-        Read more in <a href="announce.html#a20160419">Announcement</a> or in
-        <a href="/docs/version-notes-23281.html">Version notes</a>
+        Read more in <a href="announce.html#a20160509">Announcement</a> or in
+        <a href="/docs/version-notes-25.html">Version notes</a>
       </div>
       <div class="column col-md-4">
         <h2>Google's Patch Reward program</h2>
@@ -153,11 +153,11 @@
         </p>
       </div>
       <div class="column col-md-4">
-        <h2>Apache Struts 2.5 BETA3</h2>
+        <h2>Apache Struts 2.3.28.1 GA</h2>
         <p>
-          It's a second release of upcoming Struts 2.5.
-          Read more in <a href="announce.html#a20160126">Announcement</a> or in
-          <a href="/docs/version-notes-25.html">Version notes</a>
+          It's the latest release of Struts 2.3.x,
+          read more in <a href="announce.html#aa20160419">Announcement</a> or in
+          <a href="/docs/version-notes-23281.html">Version notes</a>
         </p>
       </div>
     </div>