Merge pull request #198 from apache/feature/announcement-620
Adds Apache Struts 6.2.0 announcement
diff --git a/_config.yml b/_config.yml
index 28aae28..796df99 100644
--- a/_config.yml
+++ b/_config.yml
@@ -9,15 +9,18 @@
syntax_highlighter: rouge
# Simplifies introducing changes related to the latest release
-current_version: 6.1.2.1
-current_version_short: 6121
-prev_version: 2.5.31
-prev_version_short: 2531
+current_version: 6.2.0
+current_version_short: 620
+prev_version: 6.1.2.1
+prev_25_version: 2.5.31
+prev_version_short: 6121
archetype_version: 6.0.0
-release_date: 13 June 2023
+release_date: 10 June 2023
prev_release_date: 13 June 2023
-release_date_short: 20230613-1
-prev_release_date_short: 20230613-2
+prev_25_release_date: 13 June 2023
+release_date_short: 20230710
+prev_release_date_short: 20230613-1
+prev_25_release_date_short: 20230613-2
beta_release_date_short: 20160126
# Allows directly edit pages on GitHub
diff --git a/source/announce-2023.md b/source/announce-2023.md
index e4cd470..2456cf1 100644
--- a/source/announce-2023.md
+++ b/source/announce-2023.md
@@ -13,6 +13,94 @@
Skip to: <a href="announce-2022">Announcements - 2022</a>
</p>
+#### 10 July 2023 - Apache Struts version 6.2.0 General Availability {#a20230710}
+
+The Apache Struts group is pleased to announce that Apache Struts version 6.2.0 is available as a "General Availability"
+release. The GA designation is our highest quality grade.
+
+The Apache Struts 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:
+
+**Bug**
+
+- WW-4434 - datetextfield.ftl is missing
+- WW-5199 - StrutsPrepareFilter and StrutsExecuteFilter do not support forwarding to another action
+- WW-5263 - CSP related interceptors have wrong short names
+- WW-5270 - Forwarding from a Struts excluded URL to an Action not working
+- WW-5271 - Select tag NOT working when using list="#{ ... }"
+- WW-5272 - java.lang.UnsupportedOperationException in the Time component
+- WW-5276 - Cleanup method of request is not called
+- WW-5289 - Execute and Wait Interceptor prevents JVM shutdown
+- WW-5295 - s:date ignores LocalTime
+- WW-5296 - Wrong DTD version
+- WW-5301 - Impossible to select alternate default VelocityManager bean
+- WW-5302 - Autogenerated html ID bases on unevaluated value of the name/action/method attributes
+- WW-5307 - Confusing documentation about ognl
+- WW-5309 - NamedVariablePatternMatcher throws when pattern begins with a variable
+- WW-5310 - s:url does not handle equal sign correctly
+- WW-5311 - NamedVariablePatternMatcher throws an IllegalArgumentException when named variable is not the last part of the sequence
+- WW-5312 - ExecuteAndWaitInterceptor inconsistent wait processing behaviour
+
+**New Feature**
+
+- WW-5275 - Allow to configure more flexible Content-Security-Policy
+
+**Improvement**
+
+- WW-4404 - Implement HttpInterceptor
+- WW-5196 - Make RequestMap and ApplicationMap to use generics, also correct SessionMap to always be of type <String, Object>
+- WW-5243 - Removes support for "struts.mapper.action.prefix.crossNamespaces"
+- WW-5251 - Remove deprecated interfaces used with ServletConfigInterceptor
+- WW-5253 - Remove deprecated methods from DefaultUrlHelper
+- WW-5261 - Refactor TagUtils#getStack()
+- WW-5262 - Extract excluded classes and beans out of struts-default.xml
+- WW-5264 - Extract XSLT result into a dedicated plugin
+- WW-5265 - Allow removal of a single/specific container provider
+- WW-5266 - Add configuration option for a per-file max size for multipart requests
+- WW-5268 - Add configuration option to exempt classes from OGNL package exclusions
+- WW-5273 - Support fileupload using native Servlet API 3.1 logic
+- WW-5280 - Cleanup NoParameters interfaces
+- WW-5283 - Update Struts Archetypes
+- WW-5285 - Upgrade commons-fileupload to ver 1.5 and add option to limit number of accepted files
+- WW-5288 - Make excluded package exemption logic more strict
+- WW-5290 - Refactor ConfigurationManager
+- WW-5292 - Allow overriding of Operations classes in two filter setup and assorted clean up
+- WW-5293 - Allow loading XML configuration from other than filesystem
+- WW-5304 - Drop deprecated methods from ActionContext
+- WW-5308 - Add minlength and maxlength to textarea on javatemplates plugin
+- WW-5314 - Do not log warnings for bad user input from JakartaMultiPartRequest
+
+**Task**
+
+- WW-5278 - Clean up duplicated code across ActionValidatorManagers
+- WW-5279 - Improve readability of XmlConfigurationProvider class
+- WW-5284 - Further clean up ActionValidatorManager implementations
+- WW-5298 - Clean up StrutsVelocityContext
+- WW-5299 - Clean up ActionChainResult
+- WW-5300 - Make Dispatcher methods overridable
+
+**Dependency**
+
+- WW-5269 - Upgrade Jackson to version 2.14.1
+- WW-5274 - Mark Pell Multipart plugin as deprecated
+- WW-5277 - Upgrade Freemarker to version 3.2.32
+
+> Please read the [Version Notes]({{ site.wiki_url }}/Version+Notes+6.2.0) to find more details about performed
+> bug fixes and improvements.
+
+**All developers are strongly advised to perform this upgrade.**
+
+The 6.x series of the Apache Struts framework has a minimum requirement of the following specification versions:
+Servlet API 3.1, JSP API 2.1, and Java 8.
+
+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]({{ site.jira_url }}).
+
+You can download this version from our [download](download.cgi#struts-ga) page.
+
#### 13 June 2023 - Apache Struts version 6.1.2.1 General Availability {#a20230613-1}
The Apache Struts group is pleased to announce that Apache Struts version 6.1.2.1 is available as a "General Availability"
diff --git a/source/index.html b/source/index.html
index cb6d689..93f0fc3 100644
--- a/source/index.html
+++ b/source/index.html
@@ -39,6 +39,16 @@
<a href="{{ site.wiki_url }}/Version+Notes+{{ site.prev_version }}">Version notes</a>
</div>
<div class="column col-md-4">
+ <h2>Apache Struts {{ site.prev_25_version }} GA</h2>
+ <p>
+ Apache Struts {{ site.prev_25_version }} GA has been released<br/>on {{ site.prev_25_release_date }}.
+ </p>
+ Read more in <a href="announce-2023#a{{ site.prev_25_release_date_short }}">Announcement</a> or in
+ <a href="{{ site.wiki_url }}/Version+Notes+{{ site.prev_25_version }}">Version notes</a>
+ </div>
+ </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
they extend their program to cover the Apache Struts project as well. Now you can earn
@@ -46,10 +56,6 @@
<a href="submitting-patches.html#googles-patch-reward-program">read more</a>
</p>
</div>
- </div>
- <div class="row">
- <div class="column col-md-4">
- </div>
<div class="column col-md-4">
<h2>Apache Struts 2.3.x EOL</h2>
<p>
