This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch merge-master-to-70-2024-04-20
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 8ad75f26d806e52dbac606d087a56887d05a25ab
Merge: 2352c6863 3c21e8229
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Sat Apr 20 20:48:47 2024 +1000
Merge remote-tracking branch 'origin/master' into
merge-master-to-70-2024-04-20
assembly/pom.xml | 2 +
core/pom.xml | 9 +
.../com/opensymphony/xwork2/XWorkTestCase.java | 35 ++-
.../xwork2/config/entities/PackageConfig.java | 13 ++
.../xwork2/config/impl/DefaultConfiguration.java | 18 +-
.../providers/XmlDocConfigurationProvider.java | 25 ++-
.../xwork2/ognl/DefaultOgnlCacheFactory.java | 8 +-
.../xwork2/ognl/SecurityMemberAccess.java | 36 ++--
.../com/opensymphony/xwork2/util/ProxyUtil.java | 59 ++++-
.../java/org/apache/struts2/StrutsConstants.java | 3 +
.../config/StrutsXmlConfigurationProvider.java | 1 +
.../struts2/config/entities/ConstantConfig.java | 20 ++
.../org/apache/struts2/dispatcher/Dispatcher.java | 36 ++++
.../apache/struts2/dispatcher/InitOperations.java | 25 +--
.../struts2/dispatcher/PrepareOperations.java | 18 +-
.../filter/StrutsPrepareAndExecuteFilter.java | 10 +-
.../dispatcher/filter/StrutsPrepareFilter.java | 10 +-
.../org/apache/struts2/default.properties | 3 +
core/src/main/resources/struts-6.5.dtd | 158 ++++++++++++++
.../src/main/resources/struts-excluded-classes.xml | 2 +
.../xwork2/config/ConfigurationTest.java | 36 ++++
.../XmlConfigurationProviderPackagesTest.java | 68 ++++--
.../xwork2/ognl/OgnlValueStackTest.java | 8 +-
.../xwork2/ognl/SecurityMemberAccessTest.java | 2 +-
.../apache/struts2/dispatcher/DispatcherTest.java | 26 +++
.../struts2/dispatcher/InitOperationsTest.java | 86 --------
...rutsPrepareAndExecuteFilterIntegrationTest.java | 13 +-
.../struts2/ognl/OgnlSetPossiblePropertyTest.java | 240 +++++++++++++++++++++
.../apache/struts2/views/jsp/ui/DebugTagTest.java | 22 +-
.../providers/xwork-test-package-extends-final.xml | 37 ++++
.../config/providers/xwork-test-package-final.xml | 37 ++++
plugins/bean-validation/pom.xml | 2 +-
plugins/rest/pom.xml | 4 +-
.../xwork2/ognl/SecurityMemberAccessProxyTest.java | 54 +++--
pom.xml | 9 +-
35 files changed, 897 insertions(+), 238 deletions(-)
diff --cc core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
index 70bbf70dd,a1f9094d1..6d21ef693
--- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
@@@ -72,12 -72,13 +72,13 @@@ import org.apache.struts2.ognl.ThreadAl
import org.apache.struts2.util.ObjectFactoryDestroyable;
import org.apache.struts2.util.fs.JBossFileManager;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
+ import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
diff --cc
core/src/test/java/org/apache/struts2/dispatcher/StrutsPrepareAndExecuteFilterIntegrationTest.java
index cc434571c,c7d525722..470c6d47e
---
a/core/src/test/java/org/apache/struts2/dispatcher/StrutsPrepareAndExecuteFilterIntegrationTest.java
+++
b/core/src/test/java/org/apache/struts2/dispatcher/StrutsPrepareAndExecuteFilterIntegrationTest.java
@@@ -26,13 -26,10 +26,10 @@@ import org.springframework.mock.web.Moc
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
- import jakarta.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
import java.io.IOException;
- import java.util.ArrayList;
- import java.util.regex.Pattern;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
diff --cc plugins/bean-validation/pom.xml
index 5d2f8f40a,f789b404d..bb13eb00a
--- a/plugins/bean-validation/pom.xml
+++ b/plugins/bean-validation/pom.xml
@@@ -39,12 -39,11 +39,12 @@@
<dependencies>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <version>2.0.1.Final</version>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
+ <version>3.0.2</version>
</dependency>
-
+
+
<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
diff --cc plugins/rest/pom.xml
index bc02c8f2a,e56121eeb..8318b37ef
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@@ -66,8 -66,8 +66,8 @@@
<artifactId>commons-beanutils</artifactId>
<optional>true</optional>
</dependency>
-
+
- <dependency>
+ <dependency>
<groupId>mockobjects</groupId>
<artifactId>mockobjects-core</artifactId>
<scope>test</scope>
diff --cc pom.xml
index 75a5ae786,c86b1290f..32a35b1a8
--- a/pom.xml
+++ b/pom.xml
@@@ -111,20 -110,16 +111,20 @@@
<!-- dependency versions in alphanumeric order -->
<asm.version>9.6</asm.version>
- <jackson.version>2.16.1</jackson.version>
+ <byte-buddy.version>1.14.11</byte-buddy.version>
+ <freemarker.version>2.3.32</freemarker.version>
+ <hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
+ <jackson.version>2.16.0</jackson.version>
<log4j2.version>2.23.1</log4j2.version>
+ <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
+ <mockito.version>5.8.0</mockito.version>
- <ognl.version>3.3.4</ognl.version>
+ <ognl.version>3.3.5</ognl.version>
+ <sitemesh.version>2.5.0</sitemesh.version>
<slf4j.version>2.0.12</slf4j.version>
- <spring.platformVersion>5.3.31</spring.platformVersion>
+ <spring.platformVersion>6.0.13</spring.platformVersion>
<tiles.version>3.0.8</tiles.version>
<tiles-request.version>1.0.7</tiles-request.version>
- <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
- <hibernate-validator.version>6.2.4.Final</hibernate-validator.version>
- <freemarker.version>2.3.32</freemarker.version>
+ <velocity-tools.version>3.1</velocity-tools.version>
<!-- Site generation -->
<fluido-skin.version>1.9</fluido-skin.version>
