From 1ee9195fb5a9df54422f0085ae1dfeca46bbfaed Mon Sep 17 00:00:00 2001
From: val8sgp <vanchinathan.lokanathan@bosch-si.com>
Date: Wed, 28 Nov 2018 11:38:11 +0800
Subject: [PATCH] Fixes #1195, spring webmvc and spring web jars updated to fix
 clm policies

Signed-off-by: val8sgp <vanchinathan.lokanathan@bosch-si.com>
---
 generators/generator-runner/pom.xml | 22 +++++++++++++++++----
 repository/pom.xml                  | 30 +++++++++++++++++++++++++----
 2 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/generators/generator-runner/pom.xml b/generators/generator-runner/pom.xml
index d53f0c512f..09d32d00e9 100644
--- a/generators/generator-runner/pom.xml
+++ b/generators/generator-runner/pom.xml
@@ -27,12 +27,12 @@
 					<artifactId>logback-classic</artifactId>
 				</exclusion>
 				<exclusion>
-					<artifactId>org.apache.tomcat.embed</artifactId>
-					<groupId>tomcat-embed-core</groupId>
+					<groupId>org.apache.tomcat.embed</groupId>
+					<artifactId>tomcat-embed-core</artifactId>
 				</exclusion>
 				<exclusion>
-					<artifactId>org.apache.tomcat.embed</artifactId>
-					<groupId>tomcat-embed-websocket</groupId>
+					<groupId>org.apache.tomcat.embed</groupId>
+					<artifactId>tomcat-embed-websocket</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
@@ -41,6 +41,20 @@
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
 		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.springframework/spring-webmvc -->
+		<dependency>
+    			<groupId>org.springframework</groupId>
+   	 		<artifactId>spring-webmvc</artifactId>
+    			<version>4.3.20.RELEASE</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.springframework/spring-web -->
+		<dependency>
+    			<groupId>org.springframework</groupId>
+    			<artifactId>spring-web</artifactId>
+    			<version>4.3.20.RELEASE</version>
+		</dependency>
 		
 		<!-- https://mvnrepository.com/artifact/org.apache.tomcat.embed/tomcat-embed-core -->
                 <dependency>
diff --git a/repository/pom.xml b/repository/pom.xml
index def27ce8bb..bdfb53c1de 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -36,12 +36,20 @@
 				<scope>import</scope>
 				<exclusions>
 					<exclusion>
-						<artifactId>org.apache.tomcat.embed</artifactId>
-						<groupId>tomcat-embed-core</groupId>
+						<groupId>org.apache.tomcat.embed</groupId>
+						<artifactId>tomcat-embed-core</artifactId>
 					</exclusion>
 					<exclusion>
-						<artifactId>org.apache.tomcat.embed</artifactId>
-						<groupId>tomcat-embed-websocket</groupId>
+						<groupId>org.apache.tomcat.embed</groupId>
+						<artifactId>tomcat-embed-websocket</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.springframework</groupId>
+						<artifactId>spring-web</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.springframework</groupId>
+						<artifactId>spring-webmvc</artifactId>
 					</exclusion>
 				</exclusions>
 			</dependency>
@@ -50,6 +58,20 @@
 				<artifactId>spring-boot-starter-log4j</artifactId>
 				<version>1.3.8.RELEASE</version>
 			</dependency>
+                        
+			<!-- https://mvnrepository.com/artifact/org.springframework/spring-web -->
+                        <dependency>
+				<groupId>org.springframework</groupId>
+    				<artifactId>spring-web</artifactId>
+    				<version>4.3.20.RELEASE</version>
+			</dependency>
+			<!-- https://mvnrepository.com/artifact/org.springframework/spring-webmvc -->
+			<dependency>
+				<groupId>org.springframework</groupId>
+    				<artifactId>spring-webmvc</artifactId>
+    				<version>4.3.20.RELEASE</version>
+			</dependency>
+
 			<!-- https://mvnrepository.com/artifact/org.apache.tomcat.embed/tomcat-embed-core -->
 			<dependency>
 				<groupId>org.apache.tomcat.embed</groupId>