This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/asf-site by this push:
new d356504 Automatic Site Publish by Buildbot
d356504 is described below
commit d356504b97f9701e9cb4cf061e421bf8e157a0f3
Author: buildbot <us...@infra.apache.org>
AuthorDate: Mon Sep 28 13:35:23 2020 +0000
Automatic Site Publish by Buildbot
---
output/announce.html | 34 +++++++++++++++++++++++
output/archetype-catalog.xml | 14 +++++-----
output/download.html | 44 +++++++++++++++---------------
output/index.html | 10 +++----
output/releases.html | 15 ++++++++--
output/tag-developers/css-xhtml-theme.html | 2 +-
output/tag-developers/simple-theme.html | 2 +-
output/tag-developers/xhtml-theme.html | 6 ++--
8 files changed, 86 insertions(+), 41 deletions(-)
diff --git a/output/announce.html b/output/announce.html
index 1444b0e..9874080 100644
--- a/output/announce.html
+++ b/output/announce.html
@@ -131,6 +131,7 @@
<h1 class="no_toc" id="announcements-2020">Announcements 2020</h1>
<ul id="markdown-toc">
+ <li><a href="#a20200928" id="markdown-toc-a20200928">28 September 2020 -
Struts 2.5.25 General Availability</a></li>
<li><a href="#a20200813" id="markdown-toc-a20200813">13 August 2020 -
Security Advice: Announcing CVE-2019-0230 (Possible RCE) and CVE-2019-0233
(DoS) security issues</a></li>
</ul>
@@ -138,6 +139,39 @@
Skip to: <a href="announce-2019.html">Announcements - 2019</a>
</p>
+<h4 id="a20200928">28 September 2020 - Struts 2.5.25 General Availability</h4>
+
+<p>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.</p>
+
+<p>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.</p>
+
+<p>Below is a full list of all changes:</p>
+
+<ul>
+ <li>Package Level Properties in Global Results</li>
+ <li>AbstractMatcher adds values to the map passed into replaceParameters</li>
+ <li>Minor bug in single file upload example of the Showcase application</li>
+ <li>Unable to set long pathname variables</li>
+ <li>s:set with empty body</li>
+ <li>AliasInterceptor doesn’t properly handle Parameter.Empty</li>
+ <li>Improve build behaviour on JDK9+</li>
+ <li>Update multiple Struts 2.5.x libraries / Maven build plugin versions</li>
+ <li>Upgrade OSGi to the latest version</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.cgi#struts-ga">download</a> page.</p>
+
<h4 id="a20200813">13 August 2020 - Security Advice: Announcing CVE-2019-0230
(Possible RCE) and CVE-2019-0233 (DoS) security issues</h4>
<p>Two new <a
href="https://cwiki.apache.org/confluence/display/WW/Security+Bulletin";>Struts
Security Bulletins</a> have been issued for Struts 2 by the Apache Struts
Security Team:</p>
diff --git a/output/archetype-catalog.xml b/output/archetype-catalog.xml
index 78a6192..dbeb5f8 100644
--- a/output/archetype-catalog.xml
+++ b/output/archetype-catalog.xml
@@ -7,49 +7,49 @@
<archetype>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetype-blank</artifactId>
- <version>2.5.14</version>
+ <version>2.5.22</version>
<repository>https://repository.apache.org/content/groups/public/</repository>
<description>Struts 2 Archetypes - Blank</description>
</archetype>
<archetype>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetype-convention</artifactId>
- <version>2.5.14</version>
+ <version>2.5.22</version>
<repository>https://repository.apache.org/content/groups/public/</repository>
<description>Struts 2 Archetypes - Blank Convention</description>
</archetype>
<archetype>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetype-dbportlet</artifactId>
- <version>2.5.14</version>
+ <version>2.5.22</version>
<repository>https://repository.apache.org/content/groups/public/</repository>
<description>Struts 2 Archetypes - Database Portlet</description>
</archetype>
<archetype>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetype-plugin</artifactId>
- <version>2.5.14</version>
+ <version>2.5.22</version>
<repository>https://repository.apache.org/content/groups/public/</repository>
<description>Struts 2 Archetypes - Plugin</description>
</archetype>
<archetype>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetype-portlet</artifactId>
- <version>2.5.14</version>
+ <version>2.5.22</version>
<repository>https://repository.apache.org/content/groups/public/</repository>
<description>Struts 2 Archetypes - Portlet</description>
</archetype>
<archetype>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetype-starter</artifactId>
- <version>2.5.14</version>
+ <version>2.5.22</version>
<repository>https://repository.apache.org/content/groups/public/</repository>
<description>Struts 2 Archetypes - Starter</description>
</archetype>
<archetype>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetype-angularjs</artifactId>
- <version>2.5.14</version>
+ <version>2.5.22</version>
<repository>https://repository.apache.org/content/groups/public/</repository>
<description>Struts 2 Archetypes - Angular JS</description>
</archetype>
diff --git a/output/download.html b/output/download.html
index 998c96b..4cfb48c 100644
--- a/output/download.html
+++ b/output/download.html
@@ -190,26 +190,26 @@
<h2 id="struts-ga">Full Releases</h2>
-<h3 id="struts2522">Struts 2.5.22</h3>
+<h3 id="struts2525">Struts 2.5.25</h3>
<p>
- <a href="https://struts.apache.org/";>Apache Struts 2.5.22</a> is an elegant,
extensible
+ <a href="https://struts.apache.org/";>Apache Struts 2.5.25</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.22 is the "best available" version of Struts in the 2.5 series.
+ Struts 2.5.25 is the "best available" version of Struts in the 2.5 series.
</p>
<ul>
<li>
- <a
href="https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.5.22";>Version
Notes</a>
+ <a
href="https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.5.25";>Version
Notes</a>
</li>
<li>Full Distribution:
<ul>
<li>
- <a
href="[preferred]struts/2.5.22/struts-2.5.22-all.zip">struts-2.5.22-all.zip</a>
(65MB)
- [<a
href="https://downloads.apache.org/struts/2.5.22/struts-2.5.22-all.zip.asc";>PGP</a>]
- [<a
href="https://downloads.apache.org/struts/2.5.22/struts-2.5.22-all.zip.sha256";>SHA256</a>]
+ <a
href="[preferred]struts/2.5.25/struts-2.5.25-all.zip">struts-2.5.25-all.zip</a>
(65MB)
+ [<a
href="https://downloads.apache.org/struts/2.5.25/struts-2.5.25-all.zip.asc";>PGP</a>]
+ [<a
href="https://downloads.apache.org/struts/2.5.25/struts-2.5.25-all.zip.sha256";>SHA256</a>]
</li>
</ul>
</li>
@@ -217,9 +217,9 @@
<li>Example Applications:
<ul>
<li>
- <a
href="[preferred]struts/2.5.22/struts-2.5.22-apps.zip">struts-2.5.22-apps.zip</a>
(35MB)
- [<a
href="https://downloads.apache.org/struts/2.5.22/struts-2.5.22-apps.zip.asc";>PGP</a>]
- [<a
href="https://downloads.apache.org/struts/2.5.22/struts-2.5.22-apps.zip.sha256";>SHA256</a>]
+ <a
href="[preferred]struts/2.5.25/struts-2.5.25-apps.zip">struts-2.5.25-apps.zip</a>
(35MB)
+ [<a
href="https://downloads.apache.org/struts/2.5.25/struts-2.5.25-apps.zip.asc";>PGP</a>]
+ [<a
href="https://downloads.apache.org/struts/2.5.25/struts-2.5.25-apps.zip.sha256";>SHA256</a>]
</li>
</ul>
</li>
@@ -227,9 +227,9 @@
<li>Essential Dependencies Only:
<ul>
<li>
- <a
href="[preferred]struts/2.5.22/struts-2.5.22-min-lib.zip">struts-2.5.22-min-lib.zip</a>
(4MB)
- [<a
href="https://downloads.apache.org/struts/2.5.22/struts-2.5.22-min-lib.zip.asc";>PGP</a>]
- [<a
href="https://downloads.apache.org/struts/2.5.22/struts-2.5.22-min-lib.zip.sha256";>SHA256</a>]
+ <a
href="[preferred]struts/2.5.25/struts-2.5.25-min-lib.zip">struts-2.5.25-min-lib.zip</a>
(4MB)
+ [<a
href="https://downloads.apache.org/struts/2.5.25/struts-2.5.25-min-lib.zip.asc";>PGP</a>]
+ [<a
href="https://downloads.apache.org/struts/2.5.25/struts-2.5.25-min-lib.zip.sha256";>SHA256</a>]
</li>
</ul>
</li>
@@ -237,9 +237,9 @@
<li>All Dependencies:
<ul>
<li>
- <a
href="[preferred]struts/2.5.22/struts-2.5.22-lib.zip">struts-2.5.22-lib.zip</a>
(19MB)
- [<a
href="https://downloads.apache.org/struts/2.5.22/struts-2.5.22-lib.zip.asc";>PGP</a>]
- [<a
href="https://downloads.apache.org/struts/2.5.22/struts-2.5.22-lib.zip.sha256";>SHA256</a>]
+ <a
href="[preferred]struts/2.5.25/struts-2.5.25-lib.zip">struts-2.5.25-lib.zip</a>
(19MB)
+ [<a
href="https://downloads.apache.org/struts/2.5.25/struts-2.5.25-lib.zip.asc";>PGP</a>]
+ [<a
href="https://downloads.apache.org/struts/2.5.25/struts-2.5.25-lib.zip.sha256";>SHA256</a>]
</li>
</ul>
</li>
@@ -247,9 +247,9 @@
<li>Documentation:
<ul>
<li>
- <a
href="[preferred]struts/2.5.22/struts-2.5.22-docs.zip">struts-2.5.22-docs.zip</a>
(13MB)
- [<a
href="https://downloads.apache.org/struts/2.5.22/struts-2.5.22-docs.zip.asc";>PGP</a>]
- [<a
href="https://downloads.apache.org/struts/2.5.22/struts-2.5.22-docs.zip.sha256";>SHA256</a>]
+ <a
href="[preferred]struts/2.5.25/struts-2.5.25-docs.zip">struts-2.5.25-docs.zip</a>
(13MB)
+ [<a
href="https://downloads.apache.org/struts/2.5.25/struts-2.5.25-docs.zip.asc";>PGP</a>]
+ [<a
href="https://downloads.apache.org/struts/2.5.25/struts-2.5.25-docs.zip.sha256";>SHA256</a>]
</li>
</ul>
</li>
@@ -257,9 +257,9 @@
<li>Source:
<ul>
<li>
- <a
href="[preferred]struts/2.5.22/struts-2.5.22-src.zip">struts-2.5.22-src.zip</a>
(7MB)
- [<a
href="https://downloads.apache.org/struts/2.5.22/struts-2.5.22-src.zip.asc";>PGP</a>]
- [<a
href="https://downloads.apache.org/struts/2.5.22/struts-2.5.22-src.zip.sha256";>SHA256</a>]
+ <a
href="[preferred]struts/2.5.25/struts-2.5.25-src.zip">struts-2.5.25-src.zip</a>
(7MB)
+ [<a
href="https://downloads.apache.org/struts/2.5.25/struts-2.5.25-src.zip.asc";>PGP</a>]
+ [<a
href="https://downloads.apache.org/struts/2.5.25/struts-2.5.25-src.zip.sha256";>SHA256</a>]
</li>
</ul>
</li>
diff --git a/output/index.html b/output/index.html
index 475c2c2..8df5cb5 100644
--- a/output/index.html
+++ b/output/index.html
@@ -132,7 +132,7 @@
extensible using a plugin architecture, and ships with plugins to support
REST, AJAX and JSON.
</p>
- <a href="download.cgi#struts2522" class="btn btn-primary btn-large">
+ <a href="download.cgi#struts2525" class="btn btn-primary btn-large">
<img src="img/download-icon.svg"> Download
</a>
<a href="primer.html" class="btn btn-info btn-large">
@@ -160,12 +160,12 @@
</p>
</div>
<div class="column col-md-4">
- <h2>Apache Struts 2.5.22 GA</h2>
+ <h2>Apache Struts 2.5.25 GA</h2>
<p>
- Apache Struts 2.5.22 GA has been released<br/>on 29 November 2019.
+ Apache Struts 2.5.25 GA has been released<br/>on 28 September 2020.
</p>
- Read more in <a href="announce-2019.html#a20191129">Announcement</a>
or in
- <a
href="https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.5.22";>Version
notes</a>
+ Read more in <a href="announce.html#a20200928">Announcement</a> or in
+ <a
href="https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.5.25";>Version
notes</a>
</div>
</div>
<div class="row">
diff --git a/output/releases.html b/output/releases.html
index 18495d7..ef67c92 100644
--- a/output/releases.html
+++ b/output/releases.html
@@ -148,7 +148,7 @@
<ul>
<li>
<a href="/download.cgi#struts-ga">
- Struts 2.5.22
+ Struts 2.5.25
</a> ("best available")
</li>
</ul>
@@ -167,7 +167,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>
@@ -232,6 +232,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="https://cwiki.apache.org/confluence/display/WW/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>
diff --git a/output/tag-developers/css-xhtml-theme.html
b/output/tag-developers/css-xhtml-theme.html
index 31c58de..1691abb 100644
--- a/output/tag-developers/css-xhtml-theme.html
+++ b/output/tag-developers/css-xhtml-theme.html
@@ -327,7 +327,7 @@ to provide the layout. The contents of
<strong>head.ftl</strong> are:</p>
* under the License.
*/
-->
-<link rel="stylesheet" href="<@s.url
value='/struts/css_xhtml/styles.css' includeParams='none' encode='false' />"
type="text/css" />
+<link <#include "/${parameters.templateDir}/simple/nonce.ftl" />
rel="stylesheet" href="<@s.url value='/struts/css_xhtml/styles.css'
includeParams='none' encode='false' />" type="text/css" />
<#include "/${parameters.templateDir}/simple/head.ftl"
/></code></pre></figure>
<p>The head includes a style sheet. The contents of
<strong>styles.css</strong> are:</p>
diff --git a/output/tag-developers/simple-theme.html
b/output/tag-developers/simple-theme.html
index 7abc265..025a46f 100644
--- a/output/tag-developers/simple-theme.html
+++ b/output/tag-developers/simple-theme.html
@@ -180,7 +180,7 @@ Ajax/Dojo support so that tags can import Dojo widgets
easily.</p>
* under the License.
*/
-->
-<script src="${base}/struts/utils.js"
type="text/javascript"></script></code></pre></figure>
+<script src="${base}/struts/utils.js" type="text/javascript" <#include
"/${parameters.templateDir}/simple/nonce.ftl" />
></script></code></pre></figure>
</section>
diff --git a/output/tag-developers/xhtml-theme.html
b/output/tag-developers/xhtml-theme.html
index 93c1868..45f4dd2 100644
--- a/output/tag-developers/xhtml-theme.html
+++ b/output/tag-developers/xhtml-theme.html
@@ -391,7 +391,7 @@ render the form elements.</p>
* under the License.
*/
-->
-<link rel="stylesheet" href="<@s.url value='/struts/xhtml/styles.css'
includeParams='none' encode='false' />" type="text/css"/>
+<link rel="stylesheet" href="<@s.url value='/struts/xhtml/styles.css'
includeParams='none' encode='false'/>" type="text/css" <#include
"/${parameters.templateDir}/simple/nonce.ftl" /> />
<#include "/${parameters.templateDir}/simple/head.ftl"
/></code></pre></figure>
<p>The head template imports a style sheet. The contents of
<strong>styles.css</strong> are:</p>
@@ -505,7 +505,7 @@ wrapping table, the opening and closing templates also, if
the <code class="high
<#include "/${parameters.templateDir}/simple/form-close.ftl" />
<#include
"/${parameters.templateDir}/${parameters.expandTheme}/form-close-validate.ftl"
/>
<#if parameters.focusElement??>
-<script type="text/javascript">
+<script type="text/javascript" <#include
"/${parameters.templateDir}/simple/nonce.ftl" /> >
StrutsUtils.addOnLoad(function() {
var element = document.getElementById("${parameters.focusElement}");
if(element) {
@@ -581,7 +581,7 @@ to <code class="highlighter-rouge">true</code>, enable <a
href="../core-develope
<#include "/${parameters.templateDir}/simple/form-close.ftl" />
<#include
"/${parameters.templateDir}/${parameters.expandTheme}/form-close-validate.ftl"
/>
<#if parameters.focusElement??>
-<script type="text/javascript">
+<script type="text/javascript" <#include
"/${parameters.templateDir}/simple/nonce.ftl" /> >
StrutsUtils.addOnLoad(function() {
var element = document.getElementById("${parameters.focusElement}");
if(element) {
