From 497a5ad0366803e4b5f3c39109abc90e1745d1b1 Mon Sep 17 00:00:00 2001
From: Debjit Chattopadhyay <debjit.chattopadhyay@hyland.com>
Date: Mon, 19 Jan 2026 13:33:45 +0530
Subject: [PATCH 1/2] spring 7 upgrade

---
 surf/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/surf/pom.xml b/surf/pom.xml
index e5c9305..582e0e3 100644
--- a/surf/pom.xml
+++ b/surf/pom.xml
@@ -55,16 +55,16 @@
 
    <properties>
       <!-- Surf projects historically use 'spring.version' property -->
-      <spring.version>6.2.0</spring.version>
+      <spring.version>7.0.2</spring.version>
       <dependency.alfresco-core.version>8.425</dependency.alfresco-core.version>
-      <dependency.webscripts.version>10.0</dependency.webscripts.version>
+      <dependency.webscripts.version>10.3</dependency.webscripts.version>
       <dependency.freemarker.version>2.3.30-jakarta-1</dependency.freemarker.version>
       <dependency.rhino.version>1.7.13</dependency.rhino.version>
       <dependency.yui.version>2.9.0-alfresco-20141223</dependency.yui.version>
       <dependency.httpcomponents.version>4.5.12</dependency.httpcomponents.version>
       <dependency.opencmis.version>0.11.0</dependency.opencmis.version>
       <plugin.jetty.version>8.1.16.v20140903</plugin.jetty.version>
-      <java.version>17</java.version>
+      <java.version>21</java.version>
       <maven.build.sourceVersion>${java.version}</maven.build.sourceVersion>
       <maven.compiler.source>${java.version}</maven.compiler.source>
       <maven.compiler.target>${java.version}</maven.compiler.target>

From ddf01f6a6b0bf8eec699497a597c86ff8fb702cb Mon Sep 17 00:00:00 2001
From: Debjit Chattopadhyay <debjit.chattopadhyay@hyland.com>
Date: Mon, 19 Jan 2026 13:38:20 +0530
Subject: [PATCH 2/2] spring 7 upgrade

---
 surf/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/surf/pom.xml b/surf/pom.xml
index 582e0e3..43b1e91 100644
--- a/surf/pom.xml
+++ b/surf/pom.xml
@@ -64,7 +64,7 @@
       <dependency.httpcomponents.version>4.5.12</dependency.httpcomponents.version>
       <dependency.opencmis.version>0.11.0</dependency.opencmis.version>
       <plugin.jetty.version>8.1.16.v20140903</plugin.jetty.version>
-      <java.version>21</java.version>
+      <java.version>17</java.version>
       <maven.build.sourceVersion>${java.version}</maven.build.sourceVersion>
       <maven.compiler.source>${java.version}</maven.compiler.source>
       <maven.compiler.target>${java.version}</maven.compiler.target>