Adds announcement about 2.5.18
diff --git a/_config.yml b/_config.yml
index dca449a..1a5dfe8 100644
--- a/_config.yml
+++ b/_config.yml
@@ -10,15 +10,15 @@
syntax_highlighter: rouge
# Simplifies introducing changes related to the latest release
-current_version: 2.5.17
-current_version_short: 2517
+current_version: 2.5.18
+current_version_short: 2518
prev_version: 2.3.35
prev_version_short: 2335
archetype_version: 2.5.14
current_beta_version: 2.5-BETA3
current_beta_version_short: 25B3
-release_date: 22 August 2018
-release_date_short: 20180822
+release_date: 15 October 2018
+release_date_short: 20181015
prev_release_date: 22 August 2018
prev_release_date_short: 20180822
beta_release_date_short: 20160126
diff --git a/source/announce.md b/source/announce.md
index 805e44d..c81b624 100644
--- a/source/announce.md
+++ b/source/announce.md
@@ -13,6 +13,41 @@
Skip to: <a href="announce-2017.html">Announcements - 2017</a>
</p>
+#### 15 October 2018 - Struts 2.5.18 General Availability {#a20181015-1}
+
+The Apache Struts group is pleased to announce that Struts 2.5.18 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 is designed to streamline the full development cycle, from building, to deploying,
+to maintaining applications over time.
+
+Below is a full list of all changes:
+
+ - `jar_cache` Some jar_cache******.tmp files are generated into a temporary directory(/tmp) during web service start
+ - Struts 2.5.16 is creating jar_cache files in temp folder
+ - MD5 and SHA1 should no longer be provided on download pages
+ - xml-validation fails since struts 2.5.17
+
+Internal Changes:
+
+- XWorkList was moved into a com.opensymphony.xwork2.conversion.impl package as com.opensymphony.xwork2.util package is excluded
+ by the Internal Security Mechanism.
+
+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.
+
+**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.
+
#### 22 August 2018 - CVE-2018-11776 Apache Struts 2.3 to 2.3.34 and 2.5 to 2.5.16 {#a20180822-0}
CVEID:CVE-2018-11776
diff --git a/source/index.html b/source/index.html
index ecbf42b..494dbc7 100644
--- a/source/index.html
+++ b/source/index.html
@@ -22,11 +22,6 @@
<div class="container important-notes">
<div class="col-md-12">
<div class="row">
- <a href="https://www.apache.org/events/current-event.html">
- <img src="https://www.apache.org/events/current-event-234x60.png" class="center-block"/>
- </a>
- </div>
- <div class="row">
<div class="column col-md-4">
<h2>Google's Patch Reward program</h2>
<p>During <a href="http://www.meetup.com/sfhtml5/">SFHTML5</a> Google announced that
diff --git a/source/releases.html b/source/releases.html
index 1badc7b..298cf40 100644
--- a/source/releases.html
+++ b/source/releases.html
@@ -107,6 +107,17 @@
<tbody>
<tr>
<td class="no-wrap">
+ Struts 2.5.17
+ </td>
+ <td class="no-wrap">22 August 2018</td>
+ <td>
+ </td>
+ <td>
+ <a href="{{ site.wiki_url }}/Version+Notes+2.5.17">Version notes</a>
+ </td>
+ </tr>
+ <tr>
+ <td class="no-wrap">
Struts 2.5.16
</td>
<td class="no-wrap">16 March 2018</td>