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/06/18 05:21:10 UTC

svn commit: r990876 - in /websites/production/struts/content: ./ docs/

Author: lukaszlenart
Date: Sat Jun 18 05:21:09 2016
New Revision: 990876

Log:
Updates production

Modified:
    websites/production/struts/content/announce-2002.html
    websites/production/struts/content/announce-2003.html
    websites/production/struts/content/announce-2004.html
    websites/production/struts/content/announce-2005.html
    websites/production/struts/content/announce-2006.html
    websites/production/struts/content/announce-2007.html
    websites/production/struts/content/announce-2008.html
    websites/production/struts/content/announce-2009.html
    websites/production/struts/content/announce-2010.html
    websites/production/struts/content/announce-2011.html
    websites/production/struts/content/announce-2012.html
    websites/production/struts/content/announce-2013.html
    websites/production/struts/content/announce-2014.html
    websites/production/struts/content/announce-2015.html
    websites/production/struts/content/announce.html
    websites/production/struts/content/archetype-catalog.xml
    websites/production/struts/content/birdseye.html
    websites/production/struts/content/builds.html
    websites/production/struts/content/bylaws.html
    websites/production/struts/content/coding-standards.html
    websites/production/struts/content/dev-mail.html
    websites/production/struts/content/docs/security.html
    websites/production/struts/content/download.html
    websites/production/struts/content/downloads.html
    websites/production/struts/content/helping.html
    websites/production/struts/content/index.html
    websites/production/struts/content/kickstart.html
    websites/production/struts/content/mail.html
    websites/production/struts/content/primer.html
    websites/production/struts/content/releases.html
    websites/production/struts/content/security.html
    websites/production/struts/content/struts1eol-announcement.html
    websites/production/struts/content/struts1eol-press.html
    websites/production/struts/content/submitting-patches.html
    websites/production/struts/content/volunteers.html
    websites/production/struts/content/youatstruts.html

Modified: websites/production/struts/content/announce-2002.html
==============================================================================
--- websites/production/struts/content/announce-2002.html (original)
+++ websites/production/struts/content/announce-2002.html Sat Jun 18 05:21:09 2016
@@ -379,7 +379,7 @@
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/announce-2003.html
==============================================================================
--- websites/production/struts/content/announce-2003.html (original)
+++ websites/production/struts/content/announce-2003.html Sat Jun 18 05:21:09 2016
@@ -226,7 +226,7 @@
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/announce-2004.html
==============================================================================
--- websites/production/struts/content/announce-2004.html (original)
+++ websites/production/struts/content/announce-2004.html Sat Jun 18 05:21:09 2016
@@ -279,7 +279,7 @@
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/announce-2005.html
==============================================================================
--- websites/production/struts/content/announce-2005.html (original)
+++ websites/production/struts/content/announce-2005.html Sat Jun 18 05:21:09 2016
@@ -724,7 +724,7 @@
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/announce-2006.html
==============================================================================
--- websites/production/struts/content/announce-2006.html (original)
+++ websites/production/struts/content/announce-2006.html Sat Jun 18 05:21:09 2016
@@ -783,7 +783,7 @@
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/announce-2007.html
==============================================================================
--- websites/production/struts/content/announce-2007.html (original)
+++ websites/production/struts/content/announce-2007.html Sat Jun 18 05:21:09 2016
@@ -759,7 +759,7 @@
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/announce-2008.html
==============================================================================
--- websites/production/struts/content/announce-2008.html (original)
+++ websites/production/struts/content/announce-2008.html Sat Jun 18 05:21:09 2016
@@ -285,7 +285,7 @@
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/announce-2009.html
==============================================================================
--- websites/production/struts/content/announce-2009.html (original)
+++ websites/production/struts/content/announce-2009.html Sat Jun 18 05:21:09 2016
@@ -182,7 +182,7 @@
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/announce-2010.html
==============================================================================
--- websites/production/struts/content/announce-2010.html (original)
+++ websites/production/struts/content/announce-2010.html Sat Jun 18 05:21:09 2016
@@ -226,7 +226,7 @@
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/announce-2011.html
==============================================================================
--- websites/production/struts/content/announce-2011.html (original)
+++ websites/production/struts/content/announce-2011.html Sat Jun 18 05:21:09 2016
@@ -307,7 +307,7 @@ Besides that, various other bug fixes, i
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/announce-2012.html
==============================================================================
--- websites/production/struts/content/announce-2012.html (original)
+++ websites/production/struts/content/announce-2012.html Sat Jun 18 05:21:09 2016
@@ -406,7 +406,7 @@
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/announce-2013.html
==============================================================================
--- websites/production/struts/content/announce-2013.html (original)
+++ websites/production/struts/content/announce-2013.html Sat Jun 18 05:21:09 2016
@@ -615,7 +615,7 @@ Please check the Version Notes to see mo
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/announce-2014.html
==============================================================================
--- websites/production/struts/content/announce-2014.html (original)
+++ websites/production/struts/content/announce-2014.html Sat Jun 18 05:21:09 2016
@@ -335,7 +335,7 @@ added:</p>
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/announce-2015.html
==============================================================================
--- websites/production/struts/content/announce-2015.html (original)
+++ websites/production/struts/content/announce-2015.html Sat Jun 18 05:21:09 2016
@@ -292,7 +292,7 @@ please post your comments to the user li
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/announce.html
==============================================================================
--- websites/production/struts/content/announce.html (original)
+++ websites/production/struts/content/announce.html Sat Jun 18 05:21:09 2016
@@ -124,6 +124,48 @@
   Skip to: <a href="announce-2015.html">Announcements - 2015</a>
 </p>
 
+<h4 id="a20160618">18 June 2016 - Struts 2.5.1 General Availability</h4>
+
+<p>The Apache Struts group is pleased to announce that Struts 2.5.1 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 addresses one potential security vulnerability:</p>
+
+<ul>
+  <li><a href="/docs/s2-041.html">S2-041</a>
+Possible DoS attack when using URLValidator</li>
+</ul>
+
+<p>Also all security patches applied to version Struts 2.3.29 were also applied to this version (just in case).</p>
+
+<p>This release contains several improvements just to mention few of them:</p>
+
+<ul>
+  <li>contentType override ignored for JSONInterceptor - see WW-4558</li>
+  <li>MessageStorePreResultListener does not store messages for 3rd-party RedirectResult subclasses - see WW-4618</li>
+  <li>EmailValidator flags .cat emails as invalid - see WW-4626</li>
+  <li>SMI cannot be disabled - see WW-4632</li>
+  <li>Centre alignment does not seem to work in Velocity tags - see WW-4634</li>
+  <li>Unable to process Jar entry (javassist-3.20.0-GA.jar) - see WW-4637</li>
+  <li>Strict Method Invocation breaks Action-Less Results - see WW-4643</li>
+  <li>When method is not allowed throw exception with meaningful message - see WW-4640</li>
+  <li>update struts2 bom - see WW-4644</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="a20160617">17 June 2016 - Struts 2.3.29 General Availability with Security Fixes Release</h4>
 
 <p>The Apache Struts group is pleased to announce that Struts 2.3.29 is available as a “General Availability”
@@ -133,7 +175,7 @@ release. The GA designation is our highe
 The framework is designed to streamline the full development cycle, from building, to deploying,
 to maintaining applications over time.</p>
 
-<p>This release addresses two potential security vulnerabilities:</p>
+<p>This release addresses these potential security vulnerabilities:</p>
 
 <ul>
   <li>
@@ -429,7 +471,7 @@ to the user list, and, if appropriate, f
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

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

Modified: websites/production/struts/content/birdseye.html
==============================================================================
--- websites/production/struts/content/birdseye.html (original)
+++ websites/production/struts/content/birdseye.html Sat Jun 18 05:21:09 2016
@@ -211,7 +211,7 @@ you are better with the Struts-approach.
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/builds.html
==============================================================================
--- websites/production/struts/content/builds.html (original)
+++ websites/production/struts/content/builds.html Sat Jun 18 05:21:09 2016
@@ -239,7 +239,7 @@ specific language governing permissions
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/bylaws.html
==============================================================================
--- websites/production/struts/content/bylaws.html (original)
+++ websites/production/struts/content/bylaws.html Sat Jun 18 05:21:09 2016
@@ -318,7 +318,7 @@ any committer may submit experimental ma
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/coding-standards.html
==============================================================================
--- websites/production/struts/content/coding-standards.html (original)
+++ websites/production/struts/content/coding-standards.html Sat Jun 18 05:21:09 2016
@@ -222,7 +222,7 @@ readability</em> and follow that path to
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/dev-mail.html
==============================================================================
--- websites/production/struts/content/dev-mail.html (original)
+++ websites/production/struts/content/dev-mail.html Sat Jun 18 05:21:09 2016
@@ -165,7 +165,7 @@ There are many other archives out there
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/docs/security.html
==============================================================================
--- websites/production/struts/content/docs/security.html (original)
+++ websites/production/struts/content/docs/security.html Sat Jun 18 05:21:09 2016
@@ -139,13 +139,13 @@ under the License.
     <div class="pagecontent">
         <div class="wiki-content">
             <div id="ConfluenceContent"><p><style type="text/css">/*<![CDATA[*/
-div.rbtoc1464698397043 {padding: 0px;}
-div.rbtoc1464698397043 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1464698397043 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1466227216669 {padding: 0px;}
+div.rbtoc1466227216669 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1466227216669 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style></p><div class="toc-macro rbtoc1464698397043">
+/*]]>*/</style></p><div class="toc-macro rbtoc1466227216669">
 <ul class="toc-indentation"><li><a shape="rect" href="#Security-Securitytips">Security tips</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#Security-RestrictaccesstotheConfigBrowser">Restrict access to the Config Browser</a></li><li><a shape="rect" href="#Security-Don'tmixdifferentaccesslevelsinthesamenamespace">Don't mix different access levels in the same namespace</a></li><li><a shape="rect" href="#Security-NeverexposeJSPfilesdirectly">Never expose JSP files directly</a></li><li><a shape="rect" href="#Security-DisabledevMode">Disable devMode</a></li><li><a shape="rect" href="#Security-Reducelogginglevel">Reduce logging level</a></li><li><a shape="rect" href="#Security-UseUTF-8encoding">Use UTF-8 encoding</a></li></ul>
+<ul class="toc-indentation"><li><a shape="rect" href="#Security-RestrictaccesstotheConfigBrowser">Restrict access to the Config Browser</a></li><li><a shape="rect" href="#Security-Don'tmixdifferentaccesslevelsinthesamenamespace">Don't mix different access levels in the same namespace</a></li><li><a shape="rect" href="#Security-NeverexposeJSPfilesdirectly">Never expose JSP files directly</a></li><li><a shape="rect" href="#Security-DisabledevMode">Disable devMode</a></li><li><a shape="rect" href="#Security-Reducelogginglevel">Reduce logging level</a></li><li><a shape="rect" href="#Security-UseUTF-8encoding">Use UTF-8 encoding</a></li><li><a shape="rect" href="#Security-Donotdefinedsetterswhennotneeded">Do not defined setters when not needed</a></li></ul>
 </li><li><a shape="rect" href="#Security-Internalsecuritymechanism">Internal security mechanism</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#Security-Accessingstaticmethods">Accessing static methods</a></li><li><a shape="rect" href="#Security-OGNLisusedtocallaction'smethods">OGNL is used to call action's methods</a></li><li><a shape="rect" href="#Security-Accepted/Excludedpatterns">Accepted / Excluded patterns</a></li><li><a shape="rect" href="#Security-StrictMethodInvocation">Strict Method Invocation</a></li></ul>
 </li></ul>
@@ -195,7 +195,7 @@ div.rbtoc1464698397043 li {margin-left:
 &lt;/Configuration&gt;</pre>
 </div></div><h4 id="Security-UseUTF-8encoding">Use UTF-8 encoding</h4><p>Always use&#160;<code>UTF-8</code> encoding when building an application with the Apache Struts 2, when using JSPs please add the following header to each JSP file</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;%@ page contentType="text/html; charset=UTF-8" %&gt;</pre>
-</div></div><h3 id="Security-Internalsecuritymechanism">Internal security mechanism</h3><p>The Apache Struts 2 contains internal security manager which blocks access to particular classes and Java packages - it's a OGNL-wide mechanism which means it affects any aspect of the framework ie. incoming parameters, expressions used in JSPs, etc.</p><p>There are three options that can be used to configure excluded packages and classes:</p><ul style="list-style-type: square;"><li><code>struts.excludedClasses</code> - comma-separated list of excluded classes</li><li><code>struts.excludedPackageNamePatterns</code> - patterns used to exclude packages based on RegEx - this option is slower than simple string comparison but it's more flexible</li><li><code>struts.excludedPackageNames</code> - comma-separated list of excluded packages, it is used with simple string comparison via&#160;<code>startWith</code> and&#160;<code>equals</code></li></ul><p>The defaults are as follow:</p><div class="code p
 anel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div></div><h4 id="Security-Donotdefinedsetterswhennotneeded">Do not defined setters when not needed</h4><p>You should carefully design your actions without exposing anything via setters and getters, thus can leads to potential security vulnerabilities. Any action's setter can be used to set incoming untrusted user's value which can contain suspicious expression. Some Struts&#160;<code>Result</code>s automatically populate params based on values in&#160;<code>ValueStack</code> (action in most cases is the root) which means incoming value will be evaluated as an expression during this process.</p><h3 id="Security-Internalsecuritymechanism">Internal security mechanism</h3><p>The Apache Struts 2 contains internal security manager which blocks access to particular classes and Java packages - it's a OGNL-wide mechanism which means it affects any aspect of the framework ie. incoming parameters, expressions used in JSPs, etc.</p><p>There are three options that can be used to configure exc
 luded packages and classes:</p><ul style="list-style-type: square;"><li><code>struts.excludedClasses</code> - comma-separated list of excluded classes</li><li><code>struts.excludedPackageNamePatterns</code> - patterns used to exclude packages based on RegEx - this option is slower than simple string comparison but it's more flexible</li><li><code>struts.excludedPackageNames</code> - comma-separated list of excluded packages, it is used with simple string comparison via&#160;<code>startWith</code> and&#160;<code>equals</code></li></ul><p>The defaults are as follow:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;constant name="struts.excludedClasses"
           value="com.opensymphony.xwork2.ActionContext" /&gt;
 

Modified: websites/production/struts/content/download.html
==============================================================================
--- websites/production/struts/content/download.html (original)
+++ websites/production/struts/content/download.html Sat Jun 18 05:21:09 2016
@@ -177,27 +177,27 @@
 <h1>Full Releases</h1>
 <a class="anchor" name="struts-ga"></a>
 
-<a class="anchor" name="struts25"></a>
-<h2>Struts 2.5</h2>
+<a class="anchor" name="struts251"></a>
+<h2>Struts 2.5.1</h2>
 
 <p>
-  <a href="http://struts.apache.org/">Apache Struts 2.5</a> is an elegant, extensible
+  <a href="http://struts.apache.org/">Apache Struts 2.5.1</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.5 is the "best available" version of Struts in the 2.5 series.
+  Struts 2.5.1 is the "best available" version of Struts in the 2.5 series.
 </p>
 
 <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-251.html">Version Notes</a>
   </li>
 
   <li>Full Distribution:
     <ul>
       <li>
-        <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>]
+        <a href="[preferred]struts/2.5.1/struts-2.5.1-all.zip">struts-2.5.1-all.zip</a> (65MB)
+        [<a href="http://www.apache.org/dist/struts/2.5.1/struts-2.5.1-all.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/2.5.1/struts-2.5.1-all.zip.md5">MD5</a>]
       </li>
     </ul>
   </li>
@@ -205,9 +205,9 @@
   <li>Example Applications:
     <ul>
       <li>
-        <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>]
+        <a href="[preferred]struts/2.5.1/struts-2.5.1-apps.zip">struts-2.5.1-apps.zip</a> (35MB)
+        [<a href="http://www.apache.org/dist/struts/2.5.1/struts-2.5.1-apps.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/2.5.1/struts-2.5.1-apps.zip.md5">MD5</a>]
       </li>
     </ul>
   </li>
@@ -215,9 +215,9 @@
   <li>Essential Dependencies Only:
     <ul>
       <li>
-        <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>]
+        <a href="[preferred]struts/2.5.1/struts-2.5.1-min-lib.zip">struts-2.5.1-min-lib.zip</a> (4MB)
+        [<a href="http://www.apache.org/dist/struts/2.5.1/struts-2.5.1-min-lib.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/2.5.1/struts-2.5.1-min-lib.zip.md5">MD5</a>]
       </li>
     </ul>
   </li>
@@ -225,9 +225,9 @@
   <li>All Dependencies:
     <ul>
       <li>
-        <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>]
+        <a href="[preferred]struts/2.5.1/struts-2.5.1-lib.zip">struts-2.5.1-lib.zip</a> (19MB)
+        [<a href="http://www.apache.org/dist/struts/2.5.1/struts-2.5.1-lib.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/2.5.1/struts-2.5.1-lib.zip.md5">MD5</a>]
       </li>
     </ul>
   </li>
@@ -235,9 +235,9 @@
   <li>Documentation:
     <ul>
       <li>
-        <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>]
+        <a href="[preferred]struts/2.5.1/struts-2.5.1-docs.zip">struts-2.5.1-docs.zip</a> (13MB)
+        [<a href="http://www.apache.org/dist/struts/2.5.1/struts-2.5.1-docs.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/2.5.1/struts-2.5.1-docs.zip.md5">MD5</a>]
       </li>
     </ul>
   </li>
@@ -245,9 +245,9 @@
   <li>Source:
     <ul>
       <li>
-        <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>]
+        <a href="[preferred]struts/2.5.1/struts-2.5.1-src.zip">struts-2.5.1-src.zip</a> (7MB)
+        [<a href="http://www.apache.org/dist/struts/2.5.1/struts-2.5.1-src.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/2.5.1/struts-2.5.1-src.zip.md5">MD5</a>]
       </li>
     </ul>
   </li>
@@ -350,8 +350,8 @@
     <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.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>]
+        [<a href="http://www.apache.org/dist/struts/2.5.1/struts-2.5-BETA3-all.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/2.5.1/struts-2.5-BETA3-all.zip.md5">MD5</a>]
       </li>
     </ul>
   </li>
@@ -528,7 +528,7 @@
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/downloads.html
==============================================================================
--- websites/production/struts/content/downloads.html (original)
+++ websites/production/struts/content/downloads.html Sat Jun 18 05:21:09 2016
@@ -137,7 +137,7 @@
     <ul>
       <li>
         <a href="http://struts.apache.org/download.cgi#struts-ga">
-          Struts 2.5
+          Struts 2.5.1
         </a> ("best available")
       </li>
     </ul>
@@ -222,6 +222,18 @@
   <tbody>
   <tr>
     <td class="no-wrap">
+      Struts 2.5
+    </td>
+    <td class="no-wrap">9 May 2016</td>
+    <td>
+      <a href="/docs/s2-041.html">S2-041</a>
+    </td>
+    <td>
+      <a href="/docs/version-notes-25.html">Version notes</a>
+    </td>
+  </tr>
+  <tr>
+    <td class="no-wrap">
       Struts 2.3.28.1
     </td>
     <td class="no-wrap">19 April 2016</td>
@@ -1327,7 +1339,7 @@
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/helping.html
==============================================================================
--- websites/production/struts/content/helping.html (original)
+++ websites/production/struts/content/helping.html Sat Jun 18 05:21:09 2016
@@ -377,7 +377,7 @@ release.</p>
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/index.html
==============================================================================
--- websites/production/struts/content/index.html (original)
+++ websites/production/struts/content/index.html Sat Jun 18 05:21:09 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#struts25" class="btn btn-primary btn-large">
+    <a href="/download.cgi#struts251" class="btn btn-primary btn-large">
       <img src="img/download-icon.svg"> Download
     </a>
     <a href="primer.html" class="btn btn-info btn-large">
@@ -145,20 +145,20 @@
         </p>
       </div>
       <div class="column col-md-4">
-        <h2>Apache Struts 2.3.29 GA</h2>
+        <h2>Apache Struts 2.5.1 GA</h2>
         <p>
-          It's the latest release of Struts 2.3.x,
-          read more in <a href="announce.html#a20160617">Announcement</a> or in
-          <a href="/docs/version-notes-2329.html">Version notes</a>
+          Apache Struts 2.5.1 GA has been released<br/>on 18 june 2016.
         </p>
+        Read more in <a href="announce.html#a20160618">Announcement</a> or in
+        <a href="/docs/version-notes-251.html">Version notes</a>
       </div>
       <div class="column col-md-4">
-        <h2>Apache Struts 2.5 GA</h2>
+        <h2>Apache Struts 2.3.29 GA</h2>
         <p>
-          Apache Struts 2.5 GA has been released<br/>on 9 may 2016.
+          It's the latest release of Struts 2.3.x,
+          read more in <a href="announce.html#a20160617">Announcement</a> or in
+          <a href="/docs/version-notes-2329.html">Version notes</a>
         </p>
-        Read more in <a href="announce.html#a20160509">Announcement</a> or in
-        <a href="/docs/version-notes-25.html">Version notes</a>
       </div>
     </div>
     <div class="row">
@@ -197,7 +197,7 @@
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/kickstart.html
==============================================================================
--- websites/production/struts/content/kickstart.html (original)
+++ websites/production/struts/content/kickstart.html Sat Jun 18 05:21:09 2016
@@ -355,7 +355,7 @@
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/mail.html
==============================================================================
--- websites/production/struts/content/mail.html (original)
+++ websites/production/struts/content/mail.html Sat Jun 18 05:21:09 2016
@@ -324,7 +324,7 @@
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/primer.html
==============================================================================
--- websites/production/struts/content/primer.html (original)
+++ websites/production/struts/content/primer.html Sat Jun 18 05:21:09 2016
@@ -495,7 +495,7 @@ data access frameworks. Some popular dat
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/releases.html
==============================================================================
--- websites/production/struts/content/releases.html (original)
+++ websites/production/struts/content/releases.html Sat Jun 18 05:21:09 2016
@@ -235,7 +235,7 @@ and <a href="http://www.amazon.com/exec/
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/security.html
==============================================================================
--- websites/production/struts/content/security.html (original)
+++ websites/production/struts/content/security.html Sat Jun 18 05:21:09 2016
@@ -149,7 +149,7 @@ to consume resources in a non-linear rel
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/struts1eol-announcement.html
==============================================================================
--- websites/production/struts/content/struts1eol-announcement.html (original)
+++ websites/production/struts/content/struts1eol-announcement.html Sat Jun 18 05:21:09 2016
@@ -171,7 +171,7 @@ Struts 1 in projects. See the following
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/struts1eol-press.html
==============================================================================
--- websites/production/struts/content/struts1eol-press.html (original)
+++ websites/production/struts/content/struts1eol-press.html Sat Jun 18 05:21:09 2016
@@ -158,7 +158,7 @@ Spring Web MVC, Grails or Stripes.</p>
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/submitting-patches.html
==============================================================================
--- websites/production/struts/content/submitting-patches.html (original)
+++ websites/production/struts/content/submitting-patches.html Sat Jun 18 05:21:09 2016
@@ -273,7 +273,7 @@ to prepare a new release with your patch
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/volunteers.html
==============================================================================
--- websites/production/struts/content/volunteers.html (original)
+++ websites/production/struts/content/volunteers.html Sat Jun 18 05:21:09 2016
@@ -214,7 +214,7 @@ or committee member.</p>
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">

Modified: websites/production/struts/content/youatstruts.html
==============================================================================
--- websites/production/struts/content/youatstruts.html (original)
+++ websites/production/struts/content/youatstruts.html Sat Jun 18 05:21:09 2016
@@ -181,7 +181,7 @@ more information how you can help us.</p
 
 <footer class="container">
   <div class="col-md-12">
-    Copyright &copy; 2000-2015 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
     All Rights Reserved.
   </div>
   <div class="col-md-12">