From 50fd8fd01c059ba031e5ee13a0751d999cc90d67 Mon Sep 17 00:00:00 2001
From: IanB <IanB@amdocs.com>
Date: Thu, 22 Nov 2018 15:57:14 +0000
Subject: Re-enable sidecar unit tests

After recent commits, sidecar unit tests had been disabled. These
changes re-enable them and allow them to complete successfully.

After review comments removed the dependency on Mockito and added
a comment on the Surefire plugin configuration.

Change-Id: I301b524e06460480e37d180a3fc9977588e87892
Issue-ID: AAF-642
Signed-off-by: IanB <IanB@amdocs.com>
---
 sidecar/pom.xml | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'sidecar/pom.xml')

diff --git a/sidecar/pom.xml b/sidecar/pom.xml
index 2558b55..424f29c 100644
--- a/sidecar/pom.xml
+++ b/sidecar/pom.xml
@@ -33,7 +33,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,8 +53,9 @@
 		<!-- Spring boot version 
 		  Must match oParent
 		-->
-	  	<spring.boot.version>2.0.3.RELEASE</spring.boot.version>
+	  	<spring.boot.version>2.0.5.RELEASE</spring.boot.version>
 	  	<spring.web.version>3.0.4.RELEASE</spring.web.version>
+
 		<docker.location>${basedir}/target</docker.location>
 		<!-- <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo> -->
 		
@@ -119,7 +120,7 @@
 				<artifactId>spring-boot-starter-test</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
-			
+	
 		</dependencies>
 	</dependencyManagement>
 
@@ -135,6 +136,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>
-- 
cgit 1.2.3-korg