(struts) branch WW-4062-ognl-exc-cache created (now e1f4138a4)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-4062-ognl-exc-cache in repository https://gitbox.apache.org/repos/asf/struts.git at e1f4138a4 WW-4062 Cache OgnlException thrown on compilation This branch includes the following new commits: new e1f4138a4 WW-4062 Cache OgnlException thrown on compilation The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(struts) 01/01: WW-4062 Cache OgnlException thrown on compilation
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch WW-4062-ognl-exc-cache
in repository https://gitbox.apache.org/repos/asf/struts.git
commit e1f4138a4534a65f138b0560a7d4a6a527dafb87
Author: Kusal Kithul-Godage
AuthorDate: Fri Aug 9 19:53:59 2024 +1000
WW-4062 Cache OgnlException thrown on compilation
---
core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
index 52475b8d5..7482f125a 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
@@ -602,11 +602,18 @@ public class OgnlUtil {
tree = expressionCache.get(expr);
}
if (tree == null) {
-tree = ognlGuard.parseExpression(expr);
+try {
+tree = ognlGuard.parseExpression(expr);
+} catch (OgnlException e) {
+tree = e;
+}
if (enableExpressionCache) {
expressionCache.put(expr, tree);
}
}
+if (tree instanceof OgnlException) {
+throw (OgnlException) tree;
+}
if (EXPR_BLOCKED.equals(tree)) {
throw new OgnlException("Expression blocked by OgnlGuard: " +
expr);
}
(struts) branch WW-4062-ognl-exc-cache updated (e1f4138a4 -> 6caa932ff)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-4062-ognl-exc-cache in repository https://gitbox.apache.org/repos/asf/struts.git omit e1f4138a4 WW-4062 Cache OgnlException thrown on compilation add 6caa932ff WW-4062 Cache OgnlException thrown on compilation This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (e1f4138a4) \ N -- N -- N refs/heads/WW-4062-ognl-exc-cache (6caa932ff) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java | 14 +++--- .../java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 15 +++ 2 files changed, 26 insertions(+), 3 deletions(-)
svn commit: r70777 - /dev/struts/6.6.0/ /release/struts/6.6.0/
Author: lukaszlenart Date: Sat Aug 10 05:31:39 2024 New Revision: 70777 Log: Vote passed, Struts 6.6.0 has been accepted Added: release/struts/6.6.0/ - copied from r70776, dev/struts/6.6.0/ Removed: dev/struts/6.6.0/
(struts-site) 01/01: Adds info about Struts 6.6.0
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/struts-6-6-0
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit 5965a59f1ec62f80fcab47682e3b43b6909e821d
Author: Lukasz Lenart
AuthorDate: Sat Aug 10 07:32:22 2024 +0200
Adds info about Struts 6.6.0
---
_config.yml | 16
source/announce-2024.md | 24
2 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/_config.yml b/_config.yml
index e84ca4205..84c5a9379 100644
--- a/_config.yml
+++ b/_config.yml
@@ -11,17 +11,17 @@ kramdown:
toc_levels: 1..3
# Simplifies introducing changes related to the latest release
-current_version: 6.4.0
-current_version_short: 640
+current_version: 6.6.0
+current_version_short: 660
current_25x_version: 2.5.33
-prev_version: 6.3.0.2
-prev_version_short: 6302
+prev_version: 6.4.0
+prev_version_short: 640
prev_25_version: 2.5.33
-release_date: 19 April 2024
-prev_release_date: 7 December 2023
+release_date: 10 August 2024
+prev_release_date: 19 April 2024
prev_25_release_date: 7 December 2023
-release_date_short: 20240419
-prev_release_date_short: 20231207-1
+release_date_short: 20240810
+prev_release_date_short: 20240419
prev_25_release_date_short: 20231207-2
beta_release_date_short: 20160126
diff --git a/source/announce-2024.md b/source/announce-2024.md
index a2ea0e2e6..5127cf90c 100644
--- a/source/announce-2024.md
+++ b/source/announce-2024.md
@@ -13,6 +13,30 @@ title: Announcements 2024
Skip to: Announcements - 2023
+ 10 August 2024 - Apache Struts version 6.6.0 General Availability
{#a20240810}
+
+The Apache Struts group is pleased to announce that Apache Struts version
6.6.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.
+
+This version contains a lot of proactive security improvements, which should
make your application hard to compromise.
+
+> Please read the [Version Notes]({{ site.wiki_url }}/Version+Notes+6.6.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.
+
20 April 2024 - Apache Struts version 7.0.0-M6 {#a20240420}
The Apache Struts group is pleased to announce that Apache Struts version
7.0.0-MS is available as a Test Build.
(struts-site) branch feature/struts-6-6-0 created (now 5965a59f1)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/struts-6-6-0 in repository https://gitbox.apache.org/repos/asf/struts-site.git at 5965a59f1 Adds info about Struts 6.6.0 This branch includes the following new commits: new 5965a59f1 Adds info about Struts 6.6.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(struts-site) 01/01: Merge pull request #243 from apache/revert-229-WW-5391-velocity-ext
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts-site.git commit 70cb7a050d642db2c7b60da7164c0773830c35be Merge: 46bfcac10 495664a21 Author: Lukasz Lenart AuthorDate: Sat Aug 10 07:40:27 2024 +0200 Merge pull request #243 from apache/revert-229-WW-5391-velocity-ext WW-5453 Update VelocityManager extension interface source/plugins/plugins-architecture.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(struts-site) branch master updated (46bfcac10 -> 70cb7a050)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts-site.git from 46bfcac10 Merge pull request #242 from apache/fix/csp-versions add 495664a21 Revert "WW-5391 Update VelocityManager extension interface" new 70cb7a050 Merge pull request #243 from apache/revert-229-WW-5391-velocity-ext The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: source/plugins/plugins-architecture.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(struts-site) branch revert-229-WW-5391-velocity-ext deleted (was 495664a21)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch revert-229-WW-5391-velocity-ext in repository https://gitbox.apache.org/repos/asf/struts-site.git was 495664a21 Revert "WW-5391 Update VelocityManager extension interface" The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(struts-site) branch asf-staging updated: Updates stage by Jenkins
This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/asf-staging by this push:
new b37d540bd Updates stage by Jenkins
b37d540bd is described below
commit b37d540bd5b96e2a51ab506d38c3d5a9b1575f96
Author: jenkins
AuthorDate: Sat Aug 10 05:40:47 2024 +
Updates stage by Jenkins
---
content/announce-2024.html | 26 +++
.../ajax-client-side-validation.html | 84 ++---
content/download.html | 56 +++---
content/index.html | 18 ++---
content/plugins/json/index.html| 12 +--
content/plugins/json/json-ajax-validation.html | 86 +++---
content/plugins/plugins-architecture.html | 4 +-
content/releases.html | 2 +-
.../ajax-and-javascript-recipes.html | 78 ++--
content/tag-developers/ajax-div-template.html | 12 +--
content/tag-developers/ajax-event-system.html | 4 +-
11 files changed, 204 insertions(+), 178 deletions(-)
diff --git a/content/announce-2024.html b/content/announce-2024.html
index 84a9e611d..89a456ca7 100644
--- a/content/announce-2024.html
+++ b/content/announce-2024.html
@@ -155,6 +155,32 @@
Skip to: Announcements - 2023
+10 August 2024 - Apache Struts version 6.6.0 General
Availability
+
+The Apache Struts group is pleased to announce that Apache Struts version
6.6.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.
+
+This version contains a lot of proactive security improvements, which
should make your application hard to compromise.
+
+
+ Please read the https://cwiki.apache.org/confluence/display/WW/Version+Notes+6.6.0";>Version
Notes 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 https://issues.apache.org/jira/projects/WW/";>a tracking ticket.
+
+You can download this version from our download page.
+
20 April 2024 - Apache Struts version 7.0.0-M6
The Apache Struts group is pleased to announce that Apache Struts version
7.0.0-MS is available as a Test Build.
diff --git a/content/core-developers/ajax-client-side-validation.html
b/content/core-developers/ajax-client-side-validation.html
index c6a0790ce..2a86ffe19 100644
--- a/content/core-developers/ajax-client-side-validation.html
+++ b/content/core-developers/ajax-client-side-validation.html
@@ -509,21 +509,21 @@ It takes care of hiding validation errors that might be
present, submit the form
*
* @param event onSubmit event
*/
-function ajaxFormValidation(event) {
-event.preventDefault();
-_removeValidationErrors();
-var _form = $(event.target);
-var _formData = _form.serialize(true);
+function ajaxFormValidation(event) {
+event.preventDefault();
+_removeValidationErrors();
+var _form = $(event.target);
+var _formData = _form.serialize(true);
// prepare visual feedback
// you may want to use other elements here
-var originalButton = _form.find('.btn-primary');
+var originalButton = _form.find('.btn-primary');
// note: jQuery returns an array-like object
-if (originalButton && originalButton.length && originalButton.length > 0) {
-originalButton.hide();
-var feedbackElement
= $('').insertAfter(originalButton);
+if (originalButton && originalButton.length && originalButton.length > 0) {
+originalButton.hide();
+var feedbackElement
= $('').insertAfter(originalButton);
var restoreFunction
= function() {
-originalButton.show();
-feedbackElement.remove();
+originalButton.show();
+feedbackElement.remove();
}
}
var options = {
@@ -531,48 +531,48 @@ It takes care of hiding validation errors that might be
present, submit the form
async: true,
processData: false,
type: 'POST',
-success: function (response, statusText, xhr) {
-if (response.location) {
+success: function (response, statusText,
(struts-site) branch feature/struts-6-6-0 updated: Adds info about Struts 7.0.0-M9
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/struts-6-6-0
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/feature/struts-6-6-0 by this
push:
new 64b57a703 Adds info about Struts 7.0.0-M9
64b57a703 is described below
commit 64b57a7038492d7fd4bc827a0964dab7573460d6
Author: Lukasz Lenart
AuthorDate: Sat Aug 10 07:43:13 2024 +0200
Adds info about Struts 7.0.0-M9
---
source/announce-2024.md | 19 +++
source/index.html | 8
2 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/source/announce-2024.md b/source/announce-2024.md
index 5127cf90c..526f2f44d 100644
--- a/source/announce-2024.md
+++ b/source/announce-2024.md
@@ -37,6 +37,25 @@ and, if appropriate, file [a tracking ticket]({{
site.jira_url }}).
You can download this version from our [download](download.cgi#struts-ga) page.
+ 21 July 2024 - Apache Struts version 7.0.0-M9 {#a20240721}
+
+The Apache Struts group is pleased to announce that Apache Struts version
7.0.0-M9 is available as a Test Build.
+
+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.
+
+> Please read the [Version Notes]({{ site.wiki_url }}/Version+Notes+7.0.0-M9)
to find more details about performed
+> bug fixes and improvements.
+
+**This is a test build not ready to be used in production environments!**
+
+The 7.x series of the Apache Struts framework has a minimum requirement of the
following specification versions:
+JakartaEE Servlet API 6.0.0, JakartaEE JSP API 3.0, and Java 17.
+
+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 }}).
+
20 April 2024 - Apache Struts version 7.0.0-M6 {#a20240420}
The Apache Struts group is pleased to announce that Apache Struts version
7.0.0-MS is available as a Test Build.
diff --git a/source/index.html b/source/index.html
index 04271602f..dae848784 100644
--- a/source/index.html
+++ b/source/index.html
@@ -49,12 +49,12 @@ title: Welcome to the Apache Struts project
-Apache Struts 7.0.0-M6
+Apache Struts 7.0.0-M9
- Apache Struts 7.0.0-M6 test build is available as from 20 April 2024.
+ Apache Struts 7.0.0-M9 test build is available as from 21 July 2024.
-Read more in Announcement or in
-Version notes
+Read more in Announcement or in
+Version notes
Google's Patch Reward program
(struts-site) branch asf-staging updated: Updates stage by Jenkins
This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/asf-staging by this push:
new 60d96a8f3 Updates stage by Jenkins
60d96a8f3 is described below
commit 60d96a8f3e56781865ea0778929dbf7bdb3a7f53
Author: jenkins
AuthorDate: Sat Aug 10 05:49:51 2024 +
Updates stage by Jenkins
---
content/announce-2024.html| 21 +
content/index.html| 8
content/plugins/plugins-architecture.html | 4 ++--
3 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/content/announce-2024.html b/content/announce-2024.html
index 89a456ca7..af7ac3a4f 100644
--- a/content/announce-2024.html
+++ b/content/announce-2024.html
@@ -181,6 +181,27 @@ and, if appropriate, file https://issues.apache.org/jira/projects/WW/";>
You can download this version from our download page.
+21 July 2024 - Apache Struts version 7.0.0-M9
+
+The Apache Struts group is pleased to announce that Apache Struts version
7.0.0-M9 is available as a Test Build.
+
+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.
+
+
+ Please read the https://cwiki.apache.org/confluence/display/WW/Version+Notes+7.0.0-M9";>Version
Notes to find more details about performed
+bug fixes and improvements.
+
+
+This is a test build not ready to be used in production
environments!
+
+The 7.x series of the Apache Struts framework has a minimum requirement of
the following specification versions:
+JakartaEE Servlet API 6.0.0, JakartaEE JSP API 3.0, and Java 17.
+
+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 https://issues.apache.org/jira/projects/WW/";>a tracking ticket.
+
20 April 2024 - Apache Struts version 7.0.0-M6
The Apache Struts group is pleased to announce that Apache Struts version
7.0.0-MS is available as a Test Build.
diff --git a/content/index.html b/content/index.html
index 97363f2f0..6d8a49965 100644
--- a/content/index.html
+++ b/content/index.html
@@ -192,12 +192,12 @@
-Apache Struts 7.0.0-M6
+Apache Struts 7.0.0-M9
- Apache Struts 7.0.0-M6 test build is available as from 20 April 2024.
+ Apache Struts 7.0.0-M9 test build is available as from 21 July 2024.
-Read more in Announcement or in
-https://cwiki.apache.org/confluence/display/WW/Version+Notes+7.0.0-M6";>Version
notes
+Read more in Announcement or in
+https://cwiki.apache.org/confluence/display/WW/Version+Notes+7.0.0-M9";>Version
notes
Google's Patch Reward program
diff --git a/content/plugins/plugins-architecture.html
b/content/plugins/plugins-architecture.html
index 03a0ee137..8d3b6d6d9 100644
--- a/content/plugins/plugins-architecture.html
+++ b/content/plugins/plugins-architecture.html
@@ -306,7 +306,7 @@ For example, a plugin could provide a new class to create
Action classes or map
struts.velocity.manager.classname
Loads and processes Velocity templates
singleton
- org.apache.struts2.views.velocity.VelocityManagerInterface
+ org.apache.struts2.views.velocity.VelocityManager
struts.actionValidatorManager
@@ -699,7 +699,7 @@ with no-arguments constructor:
@Override
public void register(ContainerBuilder builder, LocatableProperties props) throws
ConfigurationException {
-alias(VelocityManagerInterface.class, VelocityConstants.STRUTS_VELOCITY_MANAGER_CLASSNAME,
builder, props);
+alias(VelocityManager.class, VelocityConstants.STRUTS_VELOCITY_MANAGER_CLASSNAME,
builder, props);
}
}
(struts-site) branch fix/gem created (now 29ad8f529)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/gem in repository https://gitbox.apache.org/repos/asf/struts-site.git at 29ad8f529 Upgrades gem system This branch includes the following new commits: new 29ad8f529 Upgrades gem system The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(struts-site) 01/01: Upgrades gem system
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/gem
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit 29ad8f52972da2a813abadae03b9385857cafaee
Author: Lukasz Lenart
AuthorDate: Sat Aug 10 07:51:57 2024 +0200
Upgrades gem system
---
Jenkinsfile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index 1d0201294..e9a9f4041 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -22,6 +22,7 @@ pipeline {
echo Generating a new version of website
gem install --install-dir ${GEM_HOME} bundler -v '2.3.23'
+ gem update --system 3.2.3
bundle config set --local path ${GEM_HOME}
bundle install
(struts-site) 01/01: Merge pull request #244 from apache/feature/struts-6-6-0
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts-site.git commit dcde00ed8271b7ca8e83122fa29c912b9e2c5955 Merge: 70cb7a050 64b57a703 Author: Lukasz Lenart AuthorDate: Sat Aug 10 07:51:18 2024 +0200 Merge pull request #244 from apache/feature/struts-6-6-0 Adds info about Struts 6.6.0 _config.yml | 16 source/announce-2024.md | 43 +++ source/index.html | 8 3 files changed, 55 insertions(+), 12 deletions(-)
(struts-site) branch master updated (70cb7a050 -> dcde00ed8)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts-site.git from 70cb7a050 Merge pull request #243 from apache/revert-229-WW-5391-velocity-ext add 5965a59f1 Adds info about Struts 6.6.0 add 64b57a703 Adds info about Struts 7.0.0-M9 new dcde00ed8 Merge pull request #244 from apache/feature/struts-6-6-0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: _config.yml | 16 source/announce-2024.md | 43 +++ source/index.html | 8 3 files changed, 55 insertions(+), 12 deletions(-)
(struts-site) branch feature/struts-6-6-0 deleted (was 64b57a703)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/struts-6-6-0 in repository https://gitbox.apache.org/repos/asf/struts-site.git was 64b57a703 Adds info about Struts 7.0.0-M9 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(struts-site) branch fix/gem deleted (was 29ad8f529)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/gem in repository https://gitbox.apache.org/repos/asf/struts-site.git was 29ad8f529 Upgrades gem system The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
