From ded84b73a9a2a3d72ab058e90b6bfb9f86cb6ab8 Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Sat, 23 Nov 2024 05:33:26 +0000
Subject: [PATCH] fix: jahia-parent/pom.xml to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORK-8230373
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORK-8230364
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORK-8230365
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORK-8230366
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORK-8230368
---
 jahia-parent/pom.xml | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/jahia-parent/pom.xml b/jahia-parent/pom.xml
index cfba5ebac16..5e109427b6d 100644
--- a/jahia-parent/pom.xml
+++ b/jahia-parent/pom.xml
@@ -65,7 +65,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <pluto.version>2.0.2</pluto.version>
-        <spring.version>3.2.18.RELEASE_OSGI</spring.version>
+        <spring.version>6.1.14</spring.version>
         <spring-beans.version>3.2.18.jahia1_OSGI</spring-beans.version>
         <springtx.version>3.2.18.RELEASE_OSGI2</springtx.version>
         <springwebflow-version>2.4.8.RELEASE</springwebflow-version>
@@ -618,32 +618,32 @@
                             <checkstyleRules>
                                 <module name="Checker">
                                     <module name="TreeWalker">
-                                        <module name="JavadocType" />
+                                        <module name="JavadocType"/>
                                         <module name="JavadocMethod">
-                                            <property name="scope" value="public" />
-                                            <property name="allowMissingPropertyJavadoc" value="true" />
+                                            <property name="scope" value="public"/>
+                                            <property name="allowMissingPropertyJavadoc" value="true"/>
                                         </module>
-                                        <module name="UnusedImports" />
+                                        <module name="UnusedImports"/>
                                         <module name="ConstantName">
-                                            <property name="applyToProtected" value="false" />
-                                            <property name="applyToPackage" value="false" />
-                                            <property name="applyToPrivate" value="false" />
+                                            <property name="applyToProtected" value="false"/>
+                                            <property name="applyToPackage" value="false"/>
+                                            <property name="applyToPrivate" value="false"/>
                                         </module>
                                         <module name="EmptyBlock">
-                                            <property name="option" value="text" />
+                                            <property name="option" value="text"/>
                                         </module>
-                                        <module name="NeedBraces" />
-                                        <module name="EqualsHashCode" />
+                                        <module name="NeedBraces"/>
+                                        <module name="EqualsHashCode"/>
                                         <module name="MagicNumber">
-                                            <property name="ignoreNumbers" value=" -1, 0, 1, 2, 17, 31, 37" />
+                                            <property name="ignoreNumbers" value=" -1, 0, 1, 2, 17, 31, 37"/>
                                         </module>
-                                        <module name="SimplifyBooleanReturn" />
+                                        <module name="SimplifyBooleanReturn"/>
                                         <module name="IllegalCatch">
-                                            <property name="illegalClassNames" value=" java.lang.Throwable" />
+                                            <property name="illegalClassNames" value=" java.lang.Throwable"/>
                                         </module>
-                                        <module name="MultipleVariableDeclarations" />
-                                        <module name="OneStatementPerLine" />
-                                        <module name="RedundantModifier" />
+                                        <module name="MultipleVariableDeclarations"/>
+                                        <module name="OneStatementPerLine"/>
+                                        <module name="RedundantModifier"/>
                                     </module>
                                 </module>
                             </checkstyleRules>