From 8cc8606b7e4c0514f24a6d1103390302213342e5 Mon Sep 17 00:00:00 2001
From: "Lee, Tian (tl5884)" <TianL@amdocs.com>
Date: Wed, 19 Dec 2018 22:36:55 +0000
Subject: [PATCH] Fix issue with ActiveMQ versions being overridden

Spring Boot dependency management was overriding aai-core's ActiveMQ
dependency versions with older, less secure versions.

Change-Id: I6c8b537b99d849f7da45e18fe755a9cd217b09a6
Issue-ID: AAI-1936
Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
---
 pom.xml | 773 +++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 395 insertions(+), 378 deletions(-)

diff --git a/pom.xml b/pom.xml
index d565980..b96b2c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,50 +28,51 @@
 	<artifactId>aai-cacher</artifactId>
 	<version>1.1.0-SNAPSHOT</version>
 
-    <parent>
-        <groupId>org.onap.oparent</groupId>
-        <artifactId>oparent</artifactId>
-        <version>1.2.0</version>
-    </parent>
+	<parent>
+		<groupId>org.onap.oparent</groupId>
+		<artifactId>oparent</artifactId>
+		<version>1.2.0</version>
+	</parent>
 
 	<properties>
 		<icd.file>service.json</icd.file>
 		<icd.package>org.onap.aai.cacher.service.rest</icd.package>
         <!-- Start of Compiler Related Properties -->
-        <java.version>1.8</java.version>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<java.version>1.8</java.version>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- End of Compiler Related Properties -->
 
         <!-- Start of Test Related Properties -->
-        <skip.unit.tests>false</skip.unit.tests>
-        <skip.integration.tests>true</skip.integration.tests>
+		<skip.unit.tests>false</skip.unit.tests>
+		<skip.integration.tests>true</skip.integration.tests>
         <!-- End of Test Related Properties -->
 
-        <spring.boot.version>1.5.18.RELEASE</spring.boot.version>
-		
+		<spring.boot.version>1.5.18.RELEASE</spring.boot.version>
+
 		<eclipse.jetty.version>9.4.1.v20170120</eclipse.jetty.version>
-		
+
 		<docker.registry>docker.io</docker.registry>
 		<build.number>local</build.number>
 		<service.account>aai-svc-account</service.account>
 		<docker.namespace>openecomp</docker.namespace>
-		
-        <license.goal.type>check</license.goal.type>
+
+		<license.goal.type>check</license.goal.type>
         
         <!--
             Nexus Proxy Properties and Snapshot Locations
             Ideally this can be overwritten at runtime per internal environment specific values at runtime
         -->
-        <nexusproxy>https://nexus.onap.org</nexusproxy>
-        <site.path>/content/sites/site/org/onap/aai/cacher/${project.artifactId}/${project.version}</site.path>
-        <release.path>/content/repositories/releases/</release.path>
-        <snapshot.path>/content/repositories/snapshots/</snapshot.path>        		
-		
-		<start-class>org.onap.aai.cacher.Application</start-class>		
-		
+		<nexusproxy>https://nexus.onap.org</nexusproxy>
+		<site.path>/content/sites/site/org/onap/aai/cacher/${project.artifactId}/${project.version}</site.path>
+		<release.path>/content/repositories/releases/</release.path>
+		<snapshot.path>/content/repositories/snapshots/</snapshot.path>
+
+		<start-class>org.onap.aai.cacher.Application</start-class>
+
 		<aai-core.version>1.3.0</aai-core.version>
+		<activemq.version>5.15.8</activemq.version>
 		
 		<!-- Start of the jacoco plugin properties -->
 		<sonar.language>java</sonar.language>
@@ -81,18 +82,18 @@
 		<sonar.jacoco.reportMissing.force.zero>false</sonar.jacoco.reportMissing.force.zero>
 		<sonar.projectVersion>${project.version}</sonar.projectVersion>
 		<!-- End of the jacoco plugin properties -->
-		
+
 		<json.version>20090211</json.version>
 		<logback.version>1.2.3</logback.version>
 		<eelf.core.version>1.0.0</eelf.core.version>
 		<mockito.version>1.10.19</mockito.version>
 		<json.assert.version>1.5.0</json.assert.version>
 		<spring.security.version>1.0.8.RELEASE</spring.security.version>
-        <common.logging.version>1.2.2</common.logging.version>
-        <dmaap.client.version>0.2.12</dmaap.client.version>
+		<common.logging.version>1.2.2</common.logging.version>
+		<dmaap.client.version>0.2.12</dmaap.client.version>
 		<dme2.version>2.8.5</dme2.version>
-		<commons.configuration.version>1.9</commons.configuration.version>		
-		
+		<commons.configuration.version>1.9</commons.configuration.version>
+
 		<docker.fabric.version>0.23.0</docker.fabric.version>
 		<!-- Default docker registry that maven fabric plugin will try to pull from -->
 		<docker.registry>docker.io</docker.registry>
@@ -107,10 +108,10 @@
         -->
 		<aai.build.directory>${project.build.directory}/${project.artifactId}-${project.version}-build/</aai.build.directory>
 		<aai.docker.namespace>openecomp</aai.docker.namespace>
-		
-		 <maven.skip.tests>true</maven.skip.tests>
-		
-		<jacoco.line.coverage.limit>.001</jacoco.line.coverage.limit>				
+
+		<maven.skip.tests>true</maven.skip.tests>
+
+		<jacoco.line.coverage.limit>.001</jacoco.line.coverage.limit>
 	</properties>
 
 	<developers>
@@ -118,7 +119,7 @@
 			<id>${userId}</id>
 		</developer>
 	</developers>
-	
+
 	<profiles>
 		<profile>
 			<id>docker</id>
@@ -187,47 +188,63 @@
 				</plugins>
 			</build>
 		</profile>
-        <profile>
-            <id>runAjsc</id>
-            <properties>
-                <skipTests>${maven.skip.tests}</skipTests>
-            </properties>
-            <build>
-                <defaultGoal>pre-integration-test</defaultGoal>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <version>1.6.0</version>
-                        <executions>
-                            <execution>
-                                <id>run-spring-boot</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>java</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <mainClass>${start-class}</mainClass>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-	</profiles>	
-	
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-parent</artifactId>
-                <version>${spring.boot.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>	
+		<profile>
+			<id>runAjsc</id>
+			<properties>
+				<skipTests>${maven.skip.tests}</skipTests>
+			</properties>
+			<build>
+				<defaultGoal>pre-integration-test</defaultGoal>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>exec-maven-plugin</artifactId>
+						<version>1.6.0</version>
+						<executions>
+							<execution>
+								<id>run-spring-boot</id>
+								<phase>package</phase>
+								<goals>
+									<goal>java</goal>
+								</goals>
+							</execution>
+						</executions>
+						<configuration>
+							<mainClass>${start-class}</mainClass>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-starter-parent</artifactId>
+				<version>${spring.boot.version}</version>
+				<scope>import</scope>
+				<type>pom</type>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.activemq</groupId>
+				<artifactId>activemq-broker</artifactId>
+				<version>${activemq.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.activemq</groupId>
+				<artifactId>activemq-client</artifactId>
+				<version>${activemq.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.activemq</groupId>
+				<artifactId>activemq-openwire-legacy</artifactId>
+				<version>${activemq.version}</version>
+			</dependency>
+
+		</dependencies>
+	</dependencyManagement>
 
 	<dependencies>
 		<dependency>
@@ -249,23 +266,23 @@
 			<groupId>de.flapdoodle.embed</groupId>
 			<artifactId>de.flapdoodle.embed.mongo</artifactId>
 			<version>2.0.3</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>commons-compress</artifactId>
-                </exclusion>
-            </exclusions>			
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.commons</groupId>
+					<artifactId>commons-compress</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-compress</artifactId>
 			<version>1.18</version>
-		</dependency>		
+		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-compress</artifactId>
 			<version>1.18</version>
-		</dependency>		
+		</dependency>
 		<dependency>
 			<groupId>org.mongodb</groupId>
 			<artifactId>mongodb-driver</artifactId>
@@ -283,53 +300,53 @@
             This needs to be added back if org.bouncy castle dependency
             sneaks backs in and causing issues with the two way ssl
         -->
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-rsa</artifactId>
-            <version>${spring.security.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcpkix-jdk15on</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>		
-         <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>
-                 <exclusion>
-                     <groupId>org.slf4j</groupId>
-                     <artifactId>log4j-over-slf4j</artifactId>
-                 </exclusion>
-             </exclusions>
-         </dependency>		
-		<dependency>
-             <groupId>org.springframework.boot</groupId>
-             <artifactId>spring-boot-starter-jetty</artifactId>
-         </dependency>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-rsa</artifactId>
+			<version>${spring.security.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.bouncycastle</groupId>
+					<artifactId>bcpkix-jdk15on</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<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>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>log4j-over-slf4j</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-jetty</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-jersey</artifactId>
 		</dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.reflections</groupId>
-            <artifactId>reflections</artifactId>
-            <version>0.9.10</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
-        </dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.reflections</groupId>
+			<artifactId>reflections</artifactId>
+			<version>0.9.10</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>2.6</version>
+		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jersey.core</groupId>
 			<artifactId>jersey-client</artifactId>
@@ -371,66 +388,66 @@
 			<version>2.0.1</version>
 		</dependency>
 		<dependency>
-            <groupId>org.onap.aai.aai-common</groupId>
-            <artifactId>aai-core</artifactId>
-            <version>${aai-core.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.sun.jersey</groupId>
-                    <artifactId>jersey-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.cxf</groupId>
-                    <artifactId>cxf-core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>commons-configuration</groupId>
-            <artifactId>commons-configuration</artifactId>
-            <version>${commons.configuration.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-lang</artifactId>
-                    <groupId>commons-lang</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>        
-        <dependency>
-            <groupId>com.att.eelf</groupId>
-            <artifactId>eelf-core</artifactId>
-            <version>${eelf.core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>${logback.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>${logback.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-access</artifactId>
-            <version>${logback.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>${mockito.version}</version>
-            <scope>test</scope>
-        </dependency>
+			<groupId>org.onap.aai.aai-common</groupId>
+			<artifactId>aai-core</artifactId>
+			<version>${aai-core.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.sun.jersey</groupId>
+					<artifactId>jersey-core</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-log4j12</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.cxf</groupId>
+					<artifactId>cxf-core</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>commons-configuration</groupId>
+			<artifactId>commons-configuration</artifactId>
+			<version>${commons.configuration.version}</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>commons-lang</artifactId>
+					<groupId>commons-lang</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>com.att.eelf</groupId>
+			<artifactId>eelf-core</artifactId>
+			<version>${eelf.core.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-core</artifactId>
+			<version>${logback.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>${logback.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-access</artifactId>
+			<version>${logback.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<version>${mockito.version}</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.skyscreamer</groupId>
 			<artifactId>jsonassert</artifactId>
@@ -459,54 +476,54 @@
                 </exclusion>
             </exclusions>
         </dependency>	
-        -->	
-        <dependency>
-            <groupId>com.att.nsa</groupId>
-            <artifactId>dmaapClient</artifactId>
-            <version>${dmaap.client.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.att.aft</groupId>
-                    <artifactId>dme2</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>commons-net</groupId>
-            <artifactId>commons-net</artifactId>
-            <version>3.6</version>
-        </dependency>              
+        -->
+		<dependency>
+			<groupId>com.att.nsa</groupId>
+			<artifactId>dmaapClient</artifactId>
+			<version>${dmaap.client.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-log4j12</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.att.aft</groupId>
+					<artifactId>dme2</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>commons-net</groupId>
+			<artifactId>commons-net</artifactId>
+			<version>3.6</version>
+		</dependency>
 	</dependencies>
-		<build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>default-deploy</id>
-                            <phase>none</phase>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.sonatype.plugins</groupId>
-                    <artifactId>nexus-staging-maven-plugin</artifactId>
-                    <version>1.6.7</version>
-                    <extensions>true</extensions>
-                    <configuration>
-                        <nexusUrl>${nexusproxy}</nexusUrl>
-                        <stagingProfileId>176c31dfe190a</stagingProfileId>
-                        <serverId>ecomp-staging</serverId>
-                    </configuration>
-                </plugin>                                
-            </plugins>
-        </pluginManagement>            	            			
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<executions>
+						<execution>
+							<id>default-deploy</id>
+							<phase>none</phase>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.sonatype.plugins</groupId>
+					<artifactId>nexus-staging-maven-plugin</artifactId>
+					<version>1.6.7</version>
+					<extensions>true</extensions>
+					<configuration>
+						<nexusUrl>${nexusproxy}</nexusUrl>
+						<stagingProfileId>176c31dfe190a</stagingProfileId>
+						<serverId>ecomp-staging</serverId>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 		<plugins>
 			<plugin>
 				<artifactId>maven-dependency-plugin</artifactId>
@@ -527,7 +544,7 @@
                   due to the fact that the plugin 1.5.15.RELEASE was built using maven 3.5 while
                   the current build version being used by our jenkins is 3.3.9
                 -->
-                <version>1.5.12.RELEASE</version>				
+				<version>1.5.12.RELEASE</version>
 				<configuration>
 					<mainClass>${start-class}</mainClass>
 					<layout>ZIP</layout>
@@ -558,51 +575,51 @@
 				</executions>
 			</plugin>
 			<plugin>
-                <groupId>com.github.kongchen</groupId>
-                <artifactId>swagger-maven-plugin</artifactId>
-            </plugin>
+				<groupId>com.github.kongchen</groupId>
+				<artifactId>swagger-maven-plugin</artifactId>
+			</plugin>
 			<plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <additionalparam>-Xdoclint:none</additionalparam>
-                </configuration>
-            </plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<additionalparam>-Xdoclint:none</additionalparam>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.12.4</version>
+				<configuration>
+					<argLine>-noverify ${argLine}</argLine>
+					<systemPropertyVariables>
+						<AJSC_HOME>.</AJSC_HOME>
+						<BUNDLECONFIG_DIR>src/main/resources</BUNDLECONFIG_DIR>
+					</systemPropertyVariables>
+				</configuration>
+			</plugin>
 			<plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.12.4</version>
-                <configuration>
-                    <argLine>-noverify ${argLine}</argLine>
-                    <systemPropertyVariables>
-                        <AJSC_HOME>.</AJSC_HOME>
-                        <BUNDLECONFIG_DIR>src/main/resources</BUNDLECONFIG_DIR>
-                    </systemPropertyVariables>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>sonar-maven-plugin</artifactId>
-                <version>3.2</version>
-            </plugin>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.7.7.201606060606</version>
-                <configuration>
-                    <dumpOnExit>true</dumpOnExit>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>jacoco-initialize-unit-tests</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                        <configuration>
-                            <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>sonar-maven-plugin</artifactId>
+				<version>3.2</version>
+			</plugin>
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>0.7.7.201606060606</version>
+				<configuration>
+					<dumpOnExit>true</dumpOnExit>
+				</configuration>
+				<executions>
+					<execution>
+						<id>jacoco-initialize-unit-tests</id>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+						<configuration>
+							<destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
                             <!-- <append>true</append> -->
-                        </configuration>
-                    </execution>
+						</configuration>
+					</execution>
 					<execution>
 						<id>post-unit-test</id>
 						<phase>test</phase>
@@ -638,68 +655,68 @@
 							</rules>
 						</configuration>
 					</execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <version>3.0</version>
-                <configuration>
-                    <header>LICENSE.TXT</header>
-                    <includes>
-                        <include>src/main/java/**</include>
-                        <include>src/test/java/**</include>
-                        <include>pom.xml</include>
-                    </includes>
-                    <skipExistingHeaders>false</skipExistingHeaders>
-                    <skip>false</skip>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>com.mycila</groupId>
+				<artifactId>license-maven-plugin</artifactId>
+				<version>3.0</version>
+				<configuration>
+					<header>LICENSE.TXT</header>
+					<includes>
+						<include>src/main/java/**</include>
+						<include>src/test/java/**</include>
+						<include>pom.xml</include>
+					</includes>
+					<skipExistingHeaders>false</skipExistingHeaders>
+					<skip>false</skip>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
                             <!-- Set goal to "format" to auto update license headers -->
-                            <goal>${license.goal.type}</goal>
-                        </goals>
-                        <phase>process-sources</phase>
-                    </execution>
-                </executions>
-            </plugin>                         
+							<goal>${license.goal.type}</goal>
+						</goals>
+						<phase>process-sources</phase>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 		<!-- mention the logback.xml location through system property or environment 
 			variable to edit logback.xml at run time -->
-        <resources>
-            <resource>
-                <directory>${project.basedir}/src/main/swm</directory>
-                <targetPath>${project.build.directory}/swm</targetPath>
-                <filtering>false</filtering>
-            </resource>
-            <resource>
-                <directory>${project.basedir}/src/main/resources</directory>
-                <includes>
-                    <include>application.properties</include>
-                    <include>logback.xml</include>
-                    <include>localhost-access-logback.xml</include>
-                </includes>
-                <targetPath>${project.build.directory}/swm/package/nix/dist_files/opt/app/aai-cacher/appconfig</targetPath>
-                <filtering>false</filtering>
-            </resource>
-            <resource>
-                <directory>${project.basedir}/src/main/resources/etc/auth/</directory>
-                <includes>
-                    <include>aai-client-cert.p12</include>
-                    <include>tomcat_keystore</include>
-                </includes>
-                <targetPath>${project.build.directory}/swm/package/nix/dist_files/opt/app/aai-cacher/appconfig</targetPath>
-                <filtering>true</filtering>
-            </resource>            
-            <resource>
-                <directory>${project.basedir}/src/main/docker</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-                <targetPath>${aai.build.directory}</targetPath>
-                <filtering>true</filtering>
-            </resource>
+		<resources>
+			<resource>
+				<directory>${project.basedir}/src/main/swm</directory>
+				<targetPath>${project.build.directory}/swm</targetPath>
+				<filtering>false</filtering>
+			</resource>
+			<resource>
+				<directory>${project.basedir}/src/main/resources</directory>
+				<includes>
+					<include>application.properties</include>
+					<include>logback.xml</include>
+					<include>localhost-access-logback.xml</include>
+				</includes>
+				<targetPath>${project.build.directory}/swm/package/nix/dist_files/opt/app/aai-cacher/appconfig</targetPath>
+				<filtering>false</filtering>
+			</resource>
+			<resource>
+				<directory>${project.basedir}/src/main/resources/etc/auth/</directory>
+				<includes>
+					<include>aai-client-cert.p12</include>
+					<include>tomcat_keystore</include>
+				</includes>
+				<targetPath>${project.build.directory}/swm/package/nix/dist_files/opt/app/aai-cacher/appconfig</targetPath>
+				<filtering>true</filtering>
+			</resource>
+			<resource>
+				<directory>${project.basedir}/src/main/docker</directory>
+				<includes>
+					<include>**/*</include>
+				</includes>
+				<targetPath>${aai.build.directory}</targetPath>
+				<filtering>true</filtering>
+			</resource>
 			<resource>
 				<directory>${project.basedir}/src/main/resources</directory>
 				<includes>
@@ -707,52 +724,52 @@
 				</includes>
 				<filtering>true</filtering>
 			</resource>
-        </resources>        
+		</resources>
 	</build>
-    <distributionManagement>
-        <snapshotRepository>
-            <id>ecomp-snapshots</id>
-            <name>ECOMP Snapshot Repository</name>
-            <url>${onap.nexus.url}/content/repositories/snapshots/</url>
-        </snapshotRepository>
-        <site>
-            <id>ecomp-site</id>
-            <url>dav:${onap.nexus.url}${sitePath}</url>
-        </site>
-    </distributionManagement>	
+	<distributionManagement>
+		<snapshotRepository>
+			<id>ecomp-snapshots</id>
+			<name>ECOMP Snapshot Repository</name>
+			<url>${onap.nexus.url}/content/repositories/snapshots/</url>
+		</snapshotRepository>
+		<site>
+			<id>ecomp-site</id>
+			<url>dav:${onap.nexus.url}${sitePath}</url>
+		</site>
+	</distributionManagement>	
     <!-- Start of ONAP Specific Repositories -->
-    <repositories>
-        <repository>
-            <id>AJSC</id>
-            <name>AJSC repository</name>
-            <url>https://mvnrepository.com/artifact/com.att.ajsc</url>
-        </repository>
-        <repository>
-            <id>restlet</id>
-            <name>maven reslet</name>
-            <url>https://maven.restlet.com/</url>
-        </repository>
+	<repositories>
+		<repository>
+			<id>AJSC</id>
+			<name>AJSC repository</name>
+			<url>https://mvnrepository.com/artifact/com.att.ajsc</url>
+		</repository>
+		<repository>
+			<id>restlet</id>
+			<name>maven reslet</name>
+			<url>https://maven.restlet.com/</url>
+		</repository>
 
-        <repository>
-            <id>central</id>
-            <name>Maven 2 repository 2</name>
-            <url>http://repo2.maven.org/maven2/</url>
-        </repository>
-        <repository>
-            <id>ecomp-releases</id>
-            <name>ECOMP Release Repository</name>
-            <url>${onap.nexus.url}/content/repositories/releases/</url>
-        </repository>
-        <repository>
-            <id>ecomp-staging</id>
-            <name>ECOMP Staging Repository</name>
-            <url>${onap.nexus.url}/content/repositories/staging/</url>
-        </repository>
-        <repository>
-            <id>ecomp-snapshots</id>
-            <name>ECOMP Snapshot Repository</name>
-            <url>${onap.nexus.url}/content/repositories/snapshots/</url>
-        </repository>
-    </repositories>
-    <!-- End of ONAP Specific Repositories -->	
+		<repository>
+			<id>central</id>
+			<name>Maven 2 repository 2</name>
+			<url>http://repo2.maven.org/maven2/</url>
+		</repository>
+		<repository>
+			<id>ecomp-releases</id>
+			<name>ECOMP Release Repository</name>
+			<url>${onap.nexus.url}/content/repositories/releases/</url>
+		</repository>
+		<repository>
+			<id>ecomp-staging</id>
+			<name>ECOMP Staging Repository</name>
+			<url>${onap.nexus.url}/content/repositories/staging/</url>
+		</repository>
+		<repository>
+			<id>ecomp-snapshots</id>
+			<name>ECOMP Snapshot Repository</name>
+			<url>${onap.nexus.url}/content/repositories/snapshots/</url>
+		</repository>
+	</repositories>
+    <!-- End of ONAP Specific Repositories -->
 </project>
-- 
2.16.6