From d146e608cfc7b7a7cb5a06e0aa4f5693d27bb414 Mon Sep 17 00:00:00 2001
From: Mohit Singh <Mohit.Singh@hyland.com>
Date: Wed, 3 Apr 2024 12:02:10 +0530
Subject: [PATCH 1/2] [ACS-6860] Spring version vulnerability

---
 surf/pom.xml                                                | 4 ++--
 .../spring-surf-tests/spring-surf-extensibility-app/pom.xml | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/surf/pom.xml b/surf/pom.xml
index c621126..6c0fa8e 100644
--- a/surf/pom.xml
+++ b/surf/pom.xml
@@ -55,9 +55,9 @@
 
    <properties>
       <!-- Surf projects historically use 'spring.version' property -->
-      <spring.version>5.3.27</spring.version>
+      <spring.version>5.3.33</spring.version>
       <dependency.alfresco-core.version>8.425</dependency.alfresco-core.version>
-      <dependency.webscripts.version>8.47</dependency.webscripts.version>
+      <dependency.webscripts.version>8.49</dependency.webscripts.version>
       <dependency.freemarker.version>2.3.30</dependency.freemarker.version>
       <dependency.rhino.version>1.7.13</dependency.rhino.version>
       <dependency.yui.version>2.9.0-alfresco-20141223</dependency.yui.version>
diff --git a/surf/spring-surf-tests/spring-surf-extensibility-app/pom.xml b/surf/spring-surf-tests/spring-surf-extensibility-app/pom.xml
index 2c78c27..dbd0d65 100644
--- a/surf/spring-surf-tests/spring-surf-extensibility-app/pom.xml
+++ b/surf/spring-surf-tests/spring-surf-extensibility-app/pom.xml
@@ -33,6 +33,7 @@
                <scanTargets>
                   <scanTarget>src/main/webapp</scanTarget>
                </scanTargets>
+                <stopKey/>
              </configuration>
          </plugin>
          <!--  SureFire plug-in configuration TestNG. This overrides the default SureFire settings
@@ -49,6 +50,11 @@
                  </suiteXmlFiles>
              </configuration>
          </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-war-plugin</artifactId>
+            <version>3.3.2</version>
+         </plugin>
       </plugins>
    </build>
    <dependencies>

From 72e4483a719c1466dfa85d184c2913af5dac84d0 Mon Sep 17 00:00:00 2001
From: Mohit Singh <Mohit.Singh@hyland.com>
Date: Wed, 3 Apr 2024 12:18:32 +0530
Subject: [PATCH 2/2] [ACS-6860] Spring version vulnerability

---
 surf/spring-surf-tests/spring-surf-extensibility-app/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/surf/spring-surf-tests/spring-surf-extensibility-app/pom.xml b/surf/spring-surf-tests/spring-surf-extensibility-app/pom.xml
index dbd0d65..45b213d 100644
--- a/surf/spring-surf-tests/spring-surf-extensibility-app/pom.xml
+++ b/surf/spring-surf-tests/spring-surf-extensibility-app/pom.xml
@@ -33,7 +33,6 @@
                <scanTargets>
                   <scanTarget>src/main/webapp</scanTarget>
                </scanTargets>
-                <stopKey/>
              </configuration>
          </plugin>
          <!--  SureFire plug-in configuration TestNG. This overrides the default SureFire settings