Merge pull request #150 from apache/release-2525
Adds release info about Struts 2.5.25
diff --git a/_config.yml b/_config.yml
index eba921b..7060655 100644
--- a/_config.yml
+++ b/_config.yml
@@ -9,15 +9,15 @@
syntax_highlighter: rouge
# Simplifies introducing changes related to the latest release
-current_version: 2.5.22
-current_version_short: 2522
+current_version: 2.5.25
+current_version_short: 2525
prev_version: 2.3.37
prev_version_short: 2337
-archetype_version: 2.5.14
+archetype_version: 2.5.22
current_beta_version: 2.5-BETA3
current_beta_version_short: 25B3
-release_date: 29 November 2019
-release_date_short: 20191129
+release_date: 28 September 2020
+release_date_short: 20200928
prev_release_date: 30 December 2018
prev_release_date_short: 20181230
beta_release_date_short: 20160126
diff --git a/source/announce.md b/source/announce.md
index a6a543c..94f2988 100644
--- a/source/announce.md
+++ b/source/announce.md
@@ -13,6 +13,37 @@
Skip to: <a href="announce-2019.html">Announcements - 2019</a>
</p>
+#### 28 September 2020 - Struts 2.5.25 General Availability {#a20200928}
+
+The Apache Struts group is pleased to announce that Struts 2.5.25 is available as a "General Availability"
+release. The GA designation is our highest quality grade.
+
+Apache Struts 2 is an elegant, extensible framework for creating enterprise-ready Java web applications.
+The framework has been designed to streamline the full development cycle, from building, to deploying,
+to maintaining applications over time.
+
+Below is a full list of all changes:
+
+ - Package Level Properties in Global Results
+ - AbstractMatcher adds values to the map passed into replaceParameters
+ - Minor bug in single file upload example of the Showcase application
+ - Unable to set long pathname variables
+ - s:set with empty body
+ - AliasInterceptor doesn't properly handle Parameter.Empty
+ - Improve build behaviour on JDK9+
+ - Update multiple Struts 2.5.x libraries / Maven build plugin versions
+ - Upgrade OSGi to the latest version
+
+**All developers are strongly advised to perform this action.**
+
+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.
+
+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.
+
+You can download this version from our [download](download.cgi#struts-ga) page.
+
#### 13 August 2020 - Security Advice: Announcing CVE-2019-0230 (Possible RCE) and CVE-2019-0233 (DoS) security issues {#a20200813}
Two new [Struts Security Bulletins](https://cwiki.apache.org/confluence/display/WW/Security+Bulletin) have been issued for Struts 2 by the Apache Struts Security Team:
diff --git a/source/index.html b/source/index.html
index 821aee3..338a37e 100644
--- a/source/index.html
+++ b/source/index.html
@@ -43,7 +43,7 @@
<p>
Apache Struts {{ site.current_version }} GA has been released<br/>on {{ site.release_date }}.
</p>
- Read more in <a href="announce-2019.html#a{{ site.release_date_short }}">Announcement</a> or in
+ Read more in <a href="announce.html#a{{ site.release_date_short }}">Announcement</a> or in
<a href="{{ site.wiki_url }}/Version+Notes+{{ site.current_version }}">Version notes</a>
</div>
</div>
diff --git a/source/releases.html b/source/releases.html
index 7e42139..9ae3b91 100644
--- a/source/releases.html
+++ b/source/releases.html
@@ -42,7 +42,7 @@
<strong>Trunk Snapshots</strong> - <em>Get involved with the latest and greatest fixes and improvements</em>
<ul>
<li>
- <a href="https://builds.apache.org/view/S-Z/view/Struts/job/Struts-JDK6-develop/lastSuccessfulBuild/org.apache.struts$struts2-assembly/">
+ <a href="https://repository.apache.org/content/repositories/snapshots/org/apache/struts/struts2-assembly/2.6-SNAPSHOT/">
Struts 2 Latest Snapshots from Jenkins CI
</a>
</li>
@@ -107,6 +107,17 @@
<tbody>
<tr>
<td class="no-wrap">
+ Struts 2.5.22
+ </td>
+ <td class="no-wrap">19 November 2019</td>
+ <td>
+ </td>
+ <td>
+ <a href="{{ site.wiki_url }}/Version+Notes+2.5.22">Version notes</a>
+ </td>
+ </tr>
+ <tr>
+ <td class="no-wrap">
Struts 2.5.20
</td>
<td class="no-wrap">14 January 2019</td>
