X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=sidecar%2Fpom.xml;h=3dca6f13d4ba72fa23422181b02dd8846e952f45;hb=05e395c6ca27d4fcf6871e9c249c76c8ce61264e;hp=c926d99ef110a0e19f10c544bc672871dd3ebcac;hpb=5aa8aec689a399e7803e84e531532d0c61631ec1;p=aaf%2Fcadi.git

diff --git a/sidecar/pom.xml b/sidecar/pom.xml
index c926d99..3dca6f1 100644
--- a/sidecar/pom.xml
+++ b/sidecar/pom.xml
@@ -15,13 +15,12 @@
 	* 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"
+<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">
 	<parent>
 		<groupId>org.onap.aaf.cadi</groupId>
 		<artifactId>parent</artifactId>
-		<version>2.1.7-SNAPSHOT</version>
+		<version>2.1.16-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -33,7 +32,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<sonar.skip>true</sonar.skip>
+		<sonar.skip>false</sonar.skip>
 		<jacoco.version>0.7.7.201606060606</jacoco.version>
 		<sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
 		<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
@@ -53,11 +52,12 @@
 		<!-- Spring boot version 
 		  Must match oParent
 		-->
-	  	<spring.boot.version>2.0.3.RELEASE</spring.boot.version>
-	  	<spring.web.version>3.0.4.RELEASE</spring.web.version>
-		<docker.location>${basedir}/target</docker.location>
+		<spring.boot.version>2.1.1.RELEASE</spring.boot.version>
+		<spring.web.version>5.1.3.RELEASE</spring.web.version>
+
+		<docker.location>${basedir}/target/build</docker.location>
 		<!-- <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo> -->
-		
+
 	</properties>
 
 	<dependencyManagement>
@@ -65,61 +65,77 @@
 			<dependency>
 				<groupId>org.onap.aaf.cadi.sidecar</groupId>
 				<artifactId>fproxy</artifactId>
-				<version>${project.version}</version>
+				<version>2.1.13</version>
 			</dependency>
 			<dependency>
 				<groupId>org.onap.aaf.cadi.sidecar</groupId>
 				<artifactId>rproxy</artifactId>
-				<version>${project.version}</version>
+				<version>2.1.13</version>
 			</dependency>
 			<dependency>
 				<groupId>javax.servlet</groupId>
 				<artifactId>javax.servlet-api</artifactId>
 				<version>3.1.0</version>
 			</dependency>
-			
 			<dependency>
-			    <groupId>org.aspectj</groupId>
-			    <artifactId>aspectjrt</artifactId>
-			    <version>1.9.2</version>
+				<groupId>org.aspectj</groupId>
+				<artifactId>aspectjrt</artifactId>
+				<version>1.9.2</version>
 			</dependency>
-			
 			<dependency>
 				<groupId>com.google.code.gson</groupId>
 				<artifactId>gson</artifactId>
 				<version>2.8.5</version>
 			</dependency>
-			
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-lang3</artifactId>
 				<version>3.8.1</version>
 			</dependency>
-			
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-starter-jetty</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
-	
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-starter-aop</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
-
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-starter-web</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
-	
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-starter-test</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
-			
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-core</artifactId>
+				<version>${spring.web.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-expression</artifactId>
+				<version>${spring.web.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-web</artifactId>
+				<version>${spring.web.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-webmvc</artifactId>
+				<version>${spring.web.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>ch.qos.logback</groupId>
+				<artifactId>logback-classic</artifactId>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
@@ -135,6 +151,18 @@
 	<build>
 		<pluginManagement>
 			<plugins>
+
+				<plugin>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>2.17</version>
+					<configuration>
+						<!-- Suppresses parent pom config of Surefire plugin. Has the affect of 
+						     setting Surefire file includes back to default and re-enables sidecar
+						     unit tests -->
+						<includes combine.self="override"></includes>
+					</configuration>
+				</plugin>
+
 				<plugin>
 					<groupId>com.mycila</groupId>
 					<artifactId>license-maven-plugin</artifactId>