This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch merge/master-to-7xx-2024-09-10
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 514c52b51d94eafd9a33f451e61eb4c7a1b1d80d
Merge: 39a561337 90f984ca8
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Tue Sep 10 18:49:43 2024 +0200
Merge branch 'master' into merge/master-to-7xx-2024-09-10
plugins/jfreechart/pom.xml | 2 +-
pom.xml | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --cc pom.xml
index 15eb28004,7e6f1dfc3..9bbfc5295
--- a/pom.xml
+++ b/pom.xml
@@@ -111,20 -110,16 +111,20 @@@
<!-- dependency versions in alphanumeric order -->
<asm.version>9.7</asm.version>
+ <byte-buddy.version>1.14.11</byte-buddy.version>
+ <freemarker.version>2.3.33</freemarker.version>
+ <hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
<jackson.version>2.17.2</jackson.version>
<log4j2.version>2.23.1</log4j2.version>
- <maven-surefire-plugin.version>3.4.0</maven-surefire-plugin.version>
++ <maven-surefire-plugin.version>3.5.0</maven-surefire-plugin.version>
+ <mockito.version>5.8.0</mockito.version>
<ognl.version>3.3.5</ognl.version>
+ <sitemesh.version>2.5.0</sitemesh.version>
<slf4j.version>2.0.16</slf4j.version>
- <spring.platformVersion>5.3.39</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.5.0</maven-surefire-plugin.version>
- <hibernate-validator.version>6.2.4.Final</hibernate-validator.version>
- <freemarker.version>2.3.33</freemarker.version>
+ <velocity-tools.version>3.1</velocity-tools.version>
<!-- Site generation -->
<fluido-skin.version>1.9</fluido-skin.version>
