Fixes eclipse-vorto#1195, spring webmvc and spring web jars updated t…

…o fix clm policies Signed-off-by: val8sgp <[email protected]>
bosch-io · Nov 28, 2018 · 1ee9195 · 1ee9195
1 parent 26756b8
commit 1ee9195
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 8 deletions.
diff --git 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
@@ -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>