X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=sidecar%2Ffproxy%2Fpom.xml;h=260825432c4ce056fa167897a7c115b49b5ec648;hb=50fd8fd01c059ba031e5ee13a0751d999cc90d67;hp=e79bd3e93f41ec0169e47156f8a3fc2cd20b557b;hpb=5aa8aec689a399e7803e84e531532d0c61631ec1;p=aaf%2Fcadi.git

diff --git a/sidecar/fproxy/pom.xml b/sidecar/fproxy/pom.xml
index e79bd3e..2608254 100644
--- a/sidecar/fproxy/pom.xml
+++ b/sidecar/fproxy/pom.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--* ============LICENSE_START==================================================== 
-    * =========================================================================== 
-    * org.onap.aaf 
-    * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. 
-    * =========================================================================== 
-    * Licensed under the Apache License, Version 2.0 (the "License"); 
-    * you may not use this file except in compliance with the License. 
-    * You may obtain a copy of the License at 
-    * 
-    * http://www.apache.org/licenses/LICENSE-2.0 
-    * 
-    * Unless required by applicable law or agreed to in writing, software 
-    * distributed under the License is distributed on an "AS IS" BASIS, 
-    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-    * See the License for the specific language governing permissions and 
-    * limitations under the License. 
-    * ============LICENSE_END==================================================== 
+<!--* ============LICENSE_START====================================================
+    * ===========================================================================
+    * org.onap.aaf
+    * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+    * ===========================================================================
+    * Licensed under the Apache License, Version 2.0 (the "License");
+    * you may not use this file except in compliance with the License.
+    * You may obtain a copy of the License at
+    *
+    * http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing, software
+    * distributed under the License is distributed on an "AS IS" BASIS,
+    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    * See the License for the specific language governing permissions and
+    * limitations under the License.
+    * ============LICENSE_END====================================================
     * -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>org.onap.aaf.cadi.sidecar</groupId>
 		<artifactId>sidecar</artifactId>
-		<version>2.1.7-SNAPSHOT</version>
+		<version>2.1.9-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>fproxy</artifactId>
@@ -33,21 +33,25 @@
 	<name>Sidecar fproxy</name>
 	<description>ONAP AAF Forward Proxy Microservice For Pluggable Security</description>
 
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<!-- Import dependency management from Spring Boot -->
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-dependencies</artifactId>
+				<version>${spring.boot.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
 	<dependencies>
 		<dependency>
-			<!-- Import dependency management from Spring Boot -->
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-dependencies</artifactId>
-			<version>${spring.boot.version}</version>
-			<type>pom</type>
-			<scope>import</scope>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
 		</dependency>
-		
-		<dependency>
-		    <groupId>org.apache.httpcomponents</groupId>
-		    <artifactId>httpclient</artifactId>
-		</dependency>
-		
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-jetty</artifactId>
@@ -61,6 +65,12 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-tomcat</artifactId>
+				</exclusion>
+			</exclusions>			
 		</dependency>
 
 		<dependency>