From 5af37ab7e2446a2d48158171dc39063a83276acb Mon Sep 17 00:00:00 2001
From: Morris Estepa <estepamo@amazon.com>
Date: Fri, 29 Jul 2022 15:54:37 +0000
Subject: [PATCH] Squashed commit of the following

commit edf4e19b
Author: Morris Estepa <estepamo@amazon.com>
Date: Thu Jul 28 2022 17:21:45 GMT-0500 (Central Daylight Time)

    spring-webmvc upgrade
---
 indexer-core/pom.xml           |  6 ++++++
 provider/indexer-aws/pom.xml   |  6 ++++++
 provider/indexer-azure/pom.xml |  6 ++++++
 provider/indexer-gcp/pom.xml   |  5 +++++
 provider/indexer-ibm/pom.xml   | 10 ++++++++--
 5 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/indexer-core/pom.xml b/indexer-core/pom.xml
index 1610d9e9..dbf76d00 100644
--- a/indexer-core/pom.xml
+++ b/indexer-core/pom.xml
@@ -21,6 +21,7 @@
 		<netty.version>4.1.70.Final</netty.version>
 		<jackson-databind.version>2.13.2.2</jackson-databind.version>
 		<jackson.version>2.13.2</jackson.version>
+		<spring-webmvc.version>5.3.22</spring-webmvc.version>
 	</properties>
 
 	<dependencyManagement>
@@ -93,6 +94,11 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-validation</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+			<version>${spring-webmvc.version}</version>
+		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tomcat.embed</groupId>
diff --git a/provider/indexer-aws/pom.xml b/provider/indexer-aws/pom.xml
index 46286890..72cd5433 100644
--- a/provider/indexer-aws/pom.xml
+++ b/provider/indexer-aws/pom.xml
@@ -34,6 +34,7 @@
       <netty.version>4.1.51.Final</netty.version>
       <jackson-databind.version>2.13.2.2</jackson-databind.version>
       <jackson.version>2.13.2</jackson.version>
+    <spring-webmvc.version>5.3.22</spring-webmvc.version>
   </properties>
 
   <dependencyManagement>
@@ -113,6 +114,11 @@
       <artifactId>spring-security-oauth2-jose</artifactId>
       <version>5.5.0</version>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>${spring-webmvc.version}</version>
+    </dependency>
     <dependency>
       <groupId>javax.inject</groupId>
       <artifactId>javax.inject</artifactId>
diff --git a/provider/indexer-azure/pom.xml b/provider/indexer-azure/pom.xml
index bd531416..52c6ed70 100644
--- a/provider/indexer-azure/pom.xml
+++ b/provider/indexer-azure/pom.xml
@@ -54,6 +54,7 @@
         <oauth2-oidc-sdk.version>6.5</oauth2-oidc-sdk.version>
         <jackson-databind.version>2.13.2.2</jackson-databind.version>
         <jackson.version>2.13.2</jackson.version>
+        <spring-webmvc.version>5.3.22</spring-webmvc.version>
     </properties>
 
     <dependencyManagement>
@@ -330,6 +331,11 @@
             <artifactId>oauth2-oidc-sdk</artifactId>
             <version>${oauth2-oidc-sdk.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>${spring-webmvc.version}</version>
+        </dependency>
 
     </dependencies>
 
diff --git a/provider/indexer-gcp/pom.xml b/provider/indexer-gcp/pom.xml
index 011a618f..c5b86df2 100644
--- a/provider/indexer-gcp/pom.xml
+++ b/provider/indexer-gcp/pom.xml
@@ -126,6 +126,11 @@
             <artifactId>logback-jackson</artifactId>
             <version>0.1.5</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>5.3.22</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/provider/indexer-ibm/pom.xml b/provider/indexer-ibm/pom.xml
index 69b67289..9de326e5 100644
--- a/provider/indexer-ibm/pom.xml
+++ b/provider/indexer-ibm/pom.xml
@@ -33,7 +33,8 @@
 	<properties>
 		<os-core-lib-ibm.version>0.15.2</os-core-lib-ibm.version>
 		<tomcat.embed.core.version>9.0.54</tomcat.embed.core.version>
-	</properties>
+        <spring-webmvc.version>5.3.22</spring-webmvc.version>
+    </properties>
 	
 	<profiles>
 		<profile>
@@ -97,7 +98,12 @@
    				</exclusion>
    			</exclusions>
    		</dependency>
-        <dependency>
+         <dependency>
+             <groupId>org.springframework</groupId>
+             <artifactId>spring-webmvc</artifactId>
+             <version>${spring-webmvc.version}</version>
+         </dependency>
+         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
-- 
GitLab