[struts] 01/01: WW-5325 Upgrades commons-lang3 to version 3.13.0
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch WW-5325-commons-lang3 in repository https://gitbox.apache.org/repos/asf/struts.git commit 129b2c3b0830b7fb45d9aaa2031f9f8c1400edb5 Author: Lukasz Lenart AuthorDate: Thu Jul 27 20:56:59 2023 +0200 WW-5325 Upgrades commons-lang3 to version 3.13.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1b7b56725..f538e7d86 100644 --- a/pom.xml +++ b/pom.xml @@ -926,7 +926,7 @@ org.apache.commons commons-lang3 -3.10 +3.13.0 org.apache.commons
[struts] branch WW-5325-commons-lang3 updated (468f36b5f -> 129b2c3b0)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch WW-5325-commons-lang3 in repository https://gitbox.apache.org/repos/asf/struts.git discard 468f36b5f WW-5325 Upgrades commons-lang3 to version 3.12.0 new 129b2c3b0 WW-5325 Upgrades commons-lang3 to version 3.13.0 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 (468f36b5f) \ N -- N -- N refs/heads/WW-5325-commons-lang3 (129b2c3b0) 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. 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: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[struts] branch WW-5325-commons-lang3 deleted (was 129b2c3b0)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch WW-5325-commons-lang3 in repository https://gitbox.apache.org/repos/asf/struts.git was 129b2c3b0 WW-5325 Upgrades commons-lang3 to version 3.13.0 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] branch master updated (bcaab0c2b -> 85f7e8a1a)
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.git from bcaab0c2b Merge pull request #713 from apache/dependabot/maven/jackson.version-2.15.2 add 129b2c3b0 WW-5325 Upgrades commons-lang3 to version 3.13.0 new 85f7e8a1a Merge pull request #714 from apache/WW-5325-commons-lang3 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: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[struts] 01/01: Merge pull request #714 from apache/WW-5325-commons-lang3
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.git commit 85f7e8a1a564cfb27bd0f640c33fd1d446c385a1 Merge: bcaab0c2b 129b2c3b0 Author: Lukasz Lenart AuthorDate: Sun Jul 30 07:59:07 2023 +0200 Merge pull request #714 from apache/WW-5325-commons-lang3 [WW-5325] Upgrades commons-lang3 to version 2.13.0 pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[struts] 02/04: WW-5233 Disables XML external entity parsing
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch WW-5233-tiles
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 01ccc0bcb32b16c3e44a83b2c8c0be1a9b069e55
Author: Lukasz Lenart
AuthorDate: Fri Jul 14 08:15:19 2023 +0200
WW-5233 Disables XML external entity parsing
---
.../definition/digester/DigesterDefinitionsReader.java| 15 +++
1 file changed, 15 insertions(+)
diff --git
a/plugins/tiles/src/main/java/org/apache/tiles/core/definition/digester/DigesterDefinitionsReader.java
b/plugins/tiles/src/main/java/org/apache/tiles/core/definition/digester/DigesterDefinitionsReader.java
index 4d756bbb2..ccbed0a81 100644
---
a/plugins/tiles/src/main/java/org/apache/tiles/core/definition/digester/DigesterDefinitionsReader.java
+++
b/plugins/tiles/src/main/java/org/apache/tiles/core/definition/digester/DigesterDefinitionsReader.java
@@ -21,6 +21,7 @@ package org.apache.tiles.core.definition.digester;
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.Rule;
+import org.apache.struts2.StrutsException;
import org.apache.tiles.api.Attribute;
import org.apache.tiles.api.Definition;
import org.apache.tiles.api.Expression;
@@ -30,8 +31,11 @@ import org.apache.tiles.core.definition.DefinitionsReader;
import org.xml.sax.Attributes;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
import org.xml.sax.SAXParseException;
+import javax.xml.parsers.ParserConfigurationException;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
@@ -256,6 +260,17 @@ public class DigesterDefinitionsReader implements
DefinitionsReader {
digester.setNamespaceAware(true);
digester.setUseContextClassLoader(true);
digester.setErrorHandler(new ThrowingErrorHandler());
+try {
+//OWASP
+
//https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html
+
digester.setFeature("http://xml.org/sax/features/external-general-entities";,
false);
+
digester.setFeature("http://xml.org/sax/features/external-parameter-entities";,
false);
+// Disable external DTDs as well
+
digester.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd";,
false);
+digester.setXIncludeAware(false);
+} catch (ParserConfigurationException | SAXNotRecognizedException |
SAXNotSupportedException e) {
+throw new StrutsException("Unable to disable external XML entity
parsing", e);
+}
// Register our local copy of the DTDs that we can find
String[] registrations = getRegistrations();
[struts] 03/04: [maven-release-plugin] prepare release STRUTS_6_3_0_RC1
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch WW-5233-tiles in repository https://gitbox.apache.org/repos/asf/struts.git commit 67a21ffe1b52777049f2e832f59a3bd11237bb68 Author: Lukasz Lenart AuthorDate: Sun Jul 16 09:48:03 2023 +0200 [maven-release-plugin] prepare release STRUTS_6_3_0_RC1 --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 8 bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/async/pom.xml | 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-mocks/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/velocity/pom.xml| 2 +- plugins/xslt/pom.xml| 2 +- pom.xml | 6 +++--- 38 files changed, 44 insertions(+), 44 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index 37682ab24..219c3e869 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.3.0-SNAPSHOT +6.3.0-RC1 struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 17f9c4a19..6d37a96a4 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -6.3.0-SNAPSHOT +6.3.0-RC1 struts2-rest-showcase war -6.3.0-SNAPSHOT +6.3.0-RC1 Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 1a04728ce..b22d7adbc 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -6.3.0-SNAPSHOT +6.3.0-RC1 struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 5caee68fc..d35f4ceee 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.3.0-SNAPSHOT +6.3.0-RC1 struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index 6a9757382..1f16a41c2 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -6.3.0-SNAPSHOT +6.3.0-RC1 struts2-bom -6.3.0-SNAPSHOT +6.3.0-RC1 pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -6.3.0-SNAPSHOT +6.3.0-RC1 true true @@ -190,7 +190,7 @@ -HEAD +STRUTS_6_3_0_RC1 scm:git:https://gitbox.apache.org/repos/asf/struts.git scm:git:https://gitbox.apache.org/repos/asf/struts.git https://github.com/apache/struts/ diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index c5b9224c3..91d97b8fb 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.3.0-SNAPSHOT +6.3.0-RC1 struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index cdd4d..b17186c30 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.3.0-SNAPSHOT +6.3.0-RC1 struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index 00e7e2f72..2c271e959 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.3.0-SNAPSHOT +6.3.0-RC1 struts2-osgi-bundles diff --git a/core/pom.xml b/core/pom.xml index 59f0d43fd..f55aa140d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.3.0-SNAPSHOT +
[struts] 04/04: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch WW-5233-tiles in repository https://gitbox.apache.org/repos/asf/struts.git commit 8080d41a1c29494cce5e56985b456a3c15a5c620 Author: Lukasz Lenart AuthorDate: Sun Jul 16 09:48:11 2023 +0200 [maven-release-plugin] prepare for next development iteration --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 8 bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/async/pom.xml | 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-mocks/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/velocity/pom.xml| 2 +- plugins/xslt/pom.xml| 2 +- pom.xml | 6 +++--- 38 files changed, 44 insertions(+), 44 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index 219c3e869..37682ab24 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.3.0-RC1 +6.3.0-SNAPSHOT struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 6d37a96a4..17f9c4a19 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -6.3.0-RC1 +6.3.0-SNAPSHOT struts2-rest-showcase war -6.3.0-RC1 +6.3.0-SNAPSHOT Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index b22d7adbc..1a04728ce 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -6.3.0-RC1 +6.3.0-SNAPSHOT struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index d35f4ceee..5caee68fc 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.3.0-RC1 +6.3.0-SNAPSHOT struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index 1f16a41c2..6a9757382 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -6.3.0-RC1 +6.3.0-SNAPSHOT struts2-bom -6.3.0-RC1 +6.3.0-SNAPSHOT pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -6.3.0-RC1 +6.3.0-SNAPSHOT true true @@ -190,7 +190,7 @@ -STRUTS_6_3_0_RC1 +HEAD scm:git:https://gitbox.apache.org/repos/asf/struts.git scm:git:https://gitbox.apache.org/repos/asf/struts.git https://github.com/apache/struts/ diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index 91d97b8fb..c5b9224c3 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.3.0-RC1 +6.3.0-SNAPSHOT struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index b17186c30..cdd4d 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.3.0-RC1 +6.3.0-SNAPSHOT struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index 2c271e959..00e7e2f72 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.3.0-RC1 +6.3.0-SNAPSHOT struts2-osgi-bundles diff --git a/core/pom.xml b/core/pom.xml index f55aa140d..59f0d43fd 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.3.0-RC1
[struts] branch WW-5233-tiles updated (301d1533e -> 8080d41a1)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch WW-5233-tiles in repository https://gitbox.apache.org/repos/asf/struts.git omit 301d1533e [maven-release-plugin] prepare for next development iteration omit 3d72886b2 [maven-release-plugin] prepare release STRUTS_6_3_0_RC1 omit 93519c9ff WW-5233 Disables XML external entity parsing omit f7c522ab5 WW-5233 Introduces Tiles base code into the Tiles plugin add 13ac0eced Adds missing Dependabot config add 9aed8cd09 Bump actions/upload-artifact from 3.1.0 to 3.1.2 add 47f7707f6 Merge pull request #702 from apache/dependabot/github_actions/actions/upload-artifact-3.1.2 add 279ef0cd0 Bump actions/cache from 3.0.8 to 3.3.1 add b2807827e Merge pull request #705 from apache/dependabot/github_actions/actions/cache-3.3.1 add 66c0b219c Bump osgi.core from 7.0.0 to 8.0.0 add b27c9a6bc Merge pull request #701 from apache/dependabot/maven/org.osgi-osgi.core-8.0.0 add 040a7c726 Bump stax2-api from 4.2 to 4.2.1 add e6db239aa Merge pull request #703 from apache/dependabot/maven/org.codehaus.woodstox-stax2-api-4.2.1 add b48adacec Bump ossf/scorecard-action from 2.0.6 to 2.2.0 add 86be4955d Merge pull request #704 from apache/dependabot/github_actions/ossf/scorecard-action-2.2.0 add c06069cc9 Bump assertj-core from 3.15.0 to 3.24.2 add 4fa10952c Merge pull request #707 from apache/dependabot/maven/org.assertj-assertj-core-3.24.2 add 10355a9ce Bump jaxb-impl from 2.3.2 to 4.0.3 add dbdf72b38 Merge pull request #708 from apache/dependabot/maven/com.sun.xml.bind-jaxb-impl-4.0.3 add a0da9f210 Bump net.sf.jasperreports:jasperreports from 6.19.1 to 6.20.5 add 24fcc6e5f Merge pull request #709 from apache/dependabot/maven/net.sf.jasperreports-jasperreports-6.20.5 add 11833fdd5 Reverts JAXB implementation to pre-Jakarta version add 51c68e5ca Bump jackson.version from 2.14.1 to 2.15.2 add 3685c074c Unifies versions add bcaab0c2b Merge pull request #713 from apache/dependabot/maven/jackson.version-2.15.2 add 129b2c3b0 WW-5325 Upgrades commons-lang3 to version 3.13.0 add 85f7e8a1a Merge pull request #714 from apache/WW-5325-commons-lang3 new 10203ed89 WW-5233 Introduces Tiles base code into the Tiles plugin new 01ccc0bcb WW-5233 Disables XML external entity parsing new 67a21ffe1 [maven-release-plugin] prepare release STRUTS_6_3_0_RC1 new 8080d41a1 [maven-release-plugin] prepare for next development iteration 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 (301d1533e) \ N -- N -- N refs/heads/WW-5233-tiles (8080d41a1) 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. The 4 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: .github/dependabot.yml | 10 ++ .github/workflows/maven.yml| 2 +- .github/workflows/scorecards-analysis.yaml | 4 ++-- plugins/bean-validation/pom.xml| 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/osgi/pom.xml | 2 +- pom.xml| 11 +-- 7 files changed, 21 insertions(+), 12 deletions(-) create mode 100644 .github/dependabot.yml
[struts] 01/01: WW-5327 Stops using JavaBeans notation for setters
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch WW-5327-non-java-beans
in repository https://gitbox.apache.org/repos/asf/struts.git
commit bb1a34daaef78b5ce983a00cfb3b7c7d7c0effd2
Author: Lukasz Lenart
AuthorDate: Sun Jul 30 08:25:33 2023 +0200
WW-5327 Stops using JavaBeans notation for setters
---
.../xwork2/interceptor/ParametersInterceptor.java | 4 +-
.../com/opensymphony/xwork2/ognl/OgnlUtil.java | 18 ++--
.../opensymphony/xwork2/ognl/OgnlValueStack.java | 24 --
.../xwork2/ognl/SecurityMemberAccess.java | 56 +
.../xwork2/util/MemberAccessValueStack.java| 12 +++
.../xwork2/ognl/SecurityMemberAccessTest.java | 98 +++---
.../util/SecurityMemberAccessInServletsTest.java | 4 +-
.../xwork2/ognl/SecurityMemberAccessProxyTest.java | 2 +-
.../com/test/SecurityMemberAccessProxyTest.java| 2 +-
9 files changed, 149 insertions(+), 71 deletions(-)
diff --git
a/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
b/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
index 3fa04220a..ec0ded9c7 100644
---
a/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
+++
b/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
@@ -217,8 +217,8 @@ public class ParametersInterceptor extends
MethodFilterInterceptor {
//block or allow access to properties
//see WW-2761 for more details
MemberAccessValueStack accessValueStack = (MemberAccessValueStack)
newStack;
-
accessValueStack.setAcceptProperties(acceptedPatterns.getAcceptedPatterns());
-
accessValueStack.setExcludeProperties(excludedPatterns.getExcludedPatterns());
+
accessValueStack.useAcceptProperties(acceptedPatterns.getAcceptedPatterns());
+
accessValueStack.useExcludeProperties(excludedPatterns.getExcludedPatterns());
}
for (Map.Entry entry :
acceptableParameters.entrySet()) {
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 827cda11a..8c1790229 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
@@ -872,22 +872,22 @@ public class OgnlUtil {
}
SecurityMemberAccess memberAccess = new
SecurityMemberAccess(allowStaticFieldAccess);
-memberAccess.setDisallowProxyMemberAccess(disallowProxyMemberAccess);
+memberAccess.disallowProxyMemberAccess(disallowProxyMemberAccess);
if (devMode) {
if (!warnReported.get()) {
warnReported.set(true);
LOG.warn("Working in devMode, using devMode excluded classes
and packages!");
}
-memberAccess.setExcludedClasses(devModeExcludedClasses);
-
memberAccess.setExcludedPackageNamePatterns(devModeExcludedPackageNamePatterns);
-memberAccess.setExcludedPackageNames(devModeExcludedPackageNames);
-
memberAccess.setExcludedPackageExemptClasses(devModeExcludedPackageExemptClasses);
+memberAccess.useExcludedClasses(devModeExcludedClasses);
+
memberAccess.useExcludedPackageNamePatterns(devModeExcludedPackageNamePatterns);
+memberAccess.useExcludedPackageNames(devModeExcludedPackageNames);
+
memberAccess.useExcludedPackageExemptClasses(devModeExcludedPackageExemptClasses);
} else {
-memberAccess.setExcludedClasses(excludedClasses);
-
memberAccess.setExcludedPackageNamePatterns(excludedPackageNamePatterns);
-memberAccess.setExcludedPackageNames(excludedPackageNames);
-
memberAccess.setExcludedPackageExemptClasses(excludedPackageExemptClasses);
+memberAccess.useExcludedClasses(excludedClasses);
+
memberAccess.useExcludedPackageNamePatterns(excludedPackageNamePatterns);
+memberAccess.useExcludedPackageNames(excludedPackageNames);
+
memberAccess.useExcludedPackageExemptClasses(excludedPackageExemptClasses);
}
return Ognl.createDefaultContext(root, memberAccess, resolver,
defaultConverter);
diff --git
a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
index 938ed477a..34fe3ae77 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
@@ -89,11 +89,11 @@ public class OgnlValueStack implements Serializable,
ValueStack, ClearableValueS
@Inject
protected void setOgnlUtil(OgnlUtil ognlUtil) {
this.ognlUtil = ognlUtil;
-securityMemberAccess.setExcludedClasses(ognlUtil.getExclude
[struts] branch WW-5327-non-java-beans created (now bb1a34daa)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch WW-5327-non-java-beans in repository https://gitbox.apache.org/repos/asf/struts.git at bb1a34daa WW-5327 Stops using JavaBeans notation for setters This branch includes the following new commits: new bb1a34daa WW-5327 Stops using JavaBeans notation for setters 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.
