X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=fe9e68b4e96e95233afc194647d9cf69187a6347;hb=refs%2Fheads%2Fmaster;hp=336446f68f0fa3f1396bf750d25680fc5b4a3fea;hpb=a10f658eb13c277b02fb1baaeb07ef353e4c9d85;p=aaf%2Fcadi.git

diff --git a/pom.xml b/pom.xml
index 336446f..fe9e68b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,103 +1,126 @@
-<!--
-  ============LICENSE_START====================================================
-  * org.onap.aaf
-  * ===========================================================================
-  * Copyright © 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====================================================
-  *
-  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
-  *
--->
-<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">
+<?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==================================================== 
+    * -->
+<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">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.onap.aaf.cadi</groupId>
 	<artifactId>parent</artifactId>
-	<name>aaf-cadi</name>
-	<version>1.0.0-SNAPSHOT</version>
-	<inceptionYear>2015-07-20</inceptionYear>	
+	<version>2.1.19-SNAPSHOT</version>
+	<name>CADI Plugins Parent</name>
 	<packaging>pom</packaging>
-	<url>https://github.com/att/AAF</url>
-	<description>CADI</description>
-	<licenses>
-		<license>
-		<name>BSD License</name>
-		<url> </url>
-		</license>
-	</licenses>
-	<developers>
-		<developer>
-		<name>Jonathan Gathman</name>
-		<email></email>
-	<organization>ATT</organization>
-	<organizationUrl></organizationUrl>
-		</developer>
-	</developers>
-	
-	<parent>             
-       <groupId>org.onap.oparent</groupId>
-       <artifactId>oparent</artifactId>
-       <version>0.1.1</version>
-    </parent>
-	
+
+	<parent>
+		<groupId>org.onap.oparent</groupId>
+		<artifactId>oparent</artifactId>
+		<version>2.0.0</version>
+	</parent>
+
 	<properties>
-		<skipSigning>true</skipSigning>
+		<!-- This version needs to be RELEASED version. Fails on SNAPSHOT -->
+		<cadi.version>2.7.4</cadi.version>
+		<!-- <sonar.skip>true</sonar.skip> -->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.innoVersion>1.0.0-SNAPSHOT</project.innoVersion>
-		<project.authClientVersion>1.0.0-SNAPSHOT</project.authClientVersion>
-		<project.dme2Version>3.1.200</project.dme2Version>
-				<!-- version>2.8.5.8</version -->
-				<!-- version>2.6.20</version -->
-				<!-- version>2.6.29</version -->
-				<!-- version>2.8.1</version -->
-				<!--  version>2.8.2.5</version -->
-		<!-- jetty-version>8.1.7.v20120910</jetty-version -->
-		<!-- jetty-version>7.2.0.v20101020</jetty-version -->
-		<!-- project.jettyVersion>9.0.3.v20130506</project.jettyVersion -->
-		<project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>
-		
-		<!--  SONAR  -->
-		 <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>
-	    <!-- Default Sonar configuration -->
-	    <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
-	    <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
-	    <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
-	    <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+		<!-- project.jettyVersion>9.4.12.v20180830</project.jettyVersion -->
+		<powermock.version>1.5.1</powermock.version>
+		<!-- SONAR -->
+		<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>
+		<!-- Default Sonar configuration -->
+		<sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+		<sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
+		<!-- Note: This list should match jacoco-maven-plugin's exclusion list 
+			below -->
+		<sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
 		<sitePath>/content/sites/site/org/onap/aaf/cadi/${project.artifactId}/${project.version}</sitePath>
 	</properties>
+
 	<!-- ============================================================== -->
 	<!-- Define the major contributors and developers of CADI -->
 	<!-- ============================================================== -->
-	<contributors>
-		<contributor>
+	<developers>
+		<developer>
 			<name>Jonathan Gathman</name>
-			<email></email>
-			<timezone>CST</timezone>
-		</contributor>
-	</contributors>
+			<email>jonathan.gathman@att.com</email>
+			<organization>ATT</organization>
+			<roles>
+				<role>Architect</role>
+				<role>Lead Developer</role>
+			</roles>
+		</developer>
+		<developer>
+			<name>Gabe Maurer</name>
+			<email>gabe.maurer@att.com</email>
+			<organization>ATT</organization>
+			<roles>
+				<role>Developer</role>
+			</roles>
+		</developer>
+		<developer>
+			<name>Ian Howell</name>
+			<email>ian.howell@att.com</email>
+			<organization>ATT</organization>
+			<roles>
+				<role>Developer</role>
+			</roles>
+		</developer>
+		<developer>
+			<name>Sai Gandham</name>
+			<email>sai.gandham@att.com</email>
+			<organization>ATT</organization>
+			<roles>
+				<role>Developer</role>
+			</roles>
+		</developer>
+	</developers>
+
 
 	<dependencies>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<version>1.9.5</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-module-junit4</artifactId>
+			<version>${powermock.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-api-mockito</artifactId>
+			<version>${powermock.version}</version>
+			<scope>test</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.10</version>
+			<version>4.12</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -106,14 +129,9 @@
 	<!-- Define sub-projects (modules) -->
 	<!-- ============================================================== -->
 	<modules>
-		<module>core</module>
-		<module>client</module>
-		<module>aaf</module> 
-		<module>cass</module>
-		<!-- module>jetty</module -->
-		<!-- module>weblogic</module -->
-		<!-- always build last -->
-		<!--module>swm</module -->
+		<module>shiro</module>
+		<module>shiro-osgi-bundle</module>
+		<module>sidecar</module>
 	</modules>
 
 	<!-- ============================================================== -->
@@ -121,129 +139,132 @@
 	<!-- ============================================================== -->
 	<dependencyManagement>
 		<dependencies>
-		<dependency>
-    			<groupId>org.mockito</groupId>
-    			<artifactId>mockito-all</artifactId>
-    			<version>1.9.5</version>
-    			<scope>test</scope>
+			<dependency>
+				<groupId>org.onap.aaf.authz</groupId>
+				<artifactId>aaf-auth-client</artifactId>
+				<version>${cadi.version}</version>
 			</dependency>
+
 			<dependency>
 				<groupId>org.onap.aaf.authz</groupId>
-				<artifactId>authz-client</artifactId>
-				<version>${project.authClientVersion}</version>
+				<artifactId>aaf-cadi-core</artifactId>
+				<version>${cadi.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.cadi</groupId>
-				<artifactId>cadi-core</artifactId>
-				<version>${project.version}</version>
+				<groupId>org.onap.aaf.authz</groupId>
+				<artifactId>aaf-cadi-oauth</artifactId>
+				<version>${cadi.version}</version>
 			</dependency>
 
+			<!-- Prevent Cycles in Testing -->
 			<dependency>
-				<groupId>org.onap.aaf.cadi</groupId>
-				<artifactId>cadi-core</artifactId>
-				<version>${project.version}</version>
+				<groupId>org.onap.aaf.authz</groupId>
+				<artifactId>aaf-cadi-core</artifactId>
+				<version>${cadi.version}</version>
 				<classifier>tests</classifier>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.cadi</groupId>
-				<artifactId>cadi-cass</artifactId>
-				<version>${project.version}</version>
+				<groupId>org.onap.aaf.authz</groupId>
+				<artifactId>aaf-cadi-jetty</artifactId>
+				<version>${cadi.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.cadi</groupId>
-				<artifactId>cadi-aaf</artifactId>
-				<version>${project.version}</version>
-			</dependency> 
-
-		    <dependency>
-				<groupId>org.onap.aaf.cadi</groupId>
-				<artifactId>cadi-aaf</artifactId>
-				<version>${project.version}</version>
-				<classifier>full</classifier>
+				<groupId>org.onap.aaf.authz</groupId>
+				<artifactId>aaf-cadi-cass</artifactId>
+				<version>${cadi.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.onap.aaf.authz</groupId>
+				<artifactId>aaf-cadi-aaf</artifactId>
+				<version>${cadi.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.cadi</groupId>
-				<artifactId>cadi-client</artifactId>
-				<version>${project.version}</version>
+				<groupId>org.onap.aaf.authz</groupId>
+				<artifactId>aaf-cadi-aaf</artifactId>
+				<version>${cadi.version}</version>
+				<classifier>full</classifier>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.cadi</groupId>
-				<artifactId>cadi-tomcat</artifactId>
-				<version>${project.version}</version>
+				<groupId>org.onap.aaf.authz</groupId>
+				<artifactId>aaf-cadi-client</artifactId>
+				<version>${cadi.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.cadi</groupId>
-				<artifactId>cadi-tguard</artifactId>
-				<version>${project.version}</version>
+				<groupId>org.onap.aaf.authz</groupId>
+				<artifactId>aaf-misc-env</artifactId>
+				<version>${cadi.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.inno</groupId>
-				<artifactId>env</artifactId>
-				<version>${project.innoVersion}</version>
+				<groupId>org.onap.aaf.authz</groupId>
+				<artifactId>aaf-misc-rosetta</artifactId>
+				<version>${cadi.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.inno</groupId>
-				<artifactId>rosetta</artifactId>
-				<version>${project.innoVersion}</version>
+				<groupId>org.onap.aaf.authz</groupId>
+				<artifactId>aaf-misc-log4j</artifactId>
+				<version>${cadi.version}</version>
+			</dependency>
+			
+			<dependency>
+				<groupId>org.apache.shiro</groupId>
+				<artifactId>shiro-core</artifactId>
+				<version>1.3.2</version>
 			</dependency>
+		
+			<dependency>
+	    		<groupId>ch.qos.logback</groupId>
+			    <artifactId>logback-classic</artifactId>
+			    <version>1.2.3</version>
+	    		<scope>test</scope>
+			</dependency>
+			
+			<!-- 
 
 			<dependency>
 				<groupId>org.eclipse.jetty</groupId>
 				<artifactId>jetty-servlet</artifactId>
-				<version>9.0.3.v20130506</version>
+				<version>${project.jettyVersion}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-webapp</artifactId>
-				<version>9.0.3.v20130506</version>
+				<artifactId>jetty-io</artifactId>
+				<version>${project.jettyVersion}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.eclipse.jetty.aggregate</groupId>
-				<artifactId>jetty-all</artifactId>
-				<version>9.0.3.v20130506</version>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-security</artifactId>
+				<version>${project.jettyVersion}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>javax.servlet</groupId>
-				<artifactId>servlet-api</artifactId>
-				<version>2.5</version>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-http</artifactId>
+				<version>${project.jettyVersion}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>com.att.aft</groupId>
-				<artifactId>dme2</artifactId>
-				<version>${project.dme2Version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>org.slf4j</groupId>
-						<artifactId>slf4j-log4j12</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>log4j</groupId>
-						<artifactId>log4j</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>com.att.javax.servlet</groupId>
-						<artifactId>servlet-api</artifactId>
-					</exclusion>
-      					<exclusion>
-        					<groupId>javax.mail</groupId>
-        					<artifactId>mail</artifactId>
-      					</exclusion>
-
-				</exclusions>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-util</artifactId>
+				<version>${project.jettyVersion}</version>
 			</dependency>
 
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-server</artifactId>
+				<version>${project.jettyVersion}</version>
+			</dependency>
+			-->
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>slf4j-api</artifactId>
@@ -258,18 +279,20 @@
 	<build>
 		<testSourceDirectory>src/test/java</testSourceDirectory>
 		<plugins>
-
+		</plugins>
+		<pluginManagement>
+			<plugins>
 				<plugin>
 					<inherited>true</inherited>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>2.3.2</version>
 					<configuration>
-						<source>1.7</source>
-						<target>1.7</target>
+						<source>${maven.compiler.source}</source>
+						<target>${maven.compiler.target}</target>
 					</configuration>
 				</plugin>
-	
+
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<version>2.4</version>
@@ -283,67 +306,17 @@
 						</archive>
 					</configuration>
 				</plugin>
-				
-				<plugin>
-				  <groupId>org.apache.maven.plugins</groupId>
-				  <artifactId>maven-surefire-plugin</artifactId>
-				  <version>2.17</version>
-				  <configuration>
-					<skipTests>false</skipTests>
-					<includes>
-					  <include>**/JU*.java</include>
-					</includes>
-					<excludes>
-						<!-- <exclude>**/JU_LocalLur.java</exclude> -->
-						<!-- <exclude>**/JU_BufferedServletInputStream.java</exclude> -->
-						<!--<exclude>**/JU_Passcode.java</exclude> -->
-						<!--<exclude>**/JU_XReader.java</exclude>  -->
-						<exclude>**/JU_CASS.java</exclude>
-						<exclude>**/JU_PropertyLocator.java</exclude>
-						<exclude>**/JU_PermEval.java</exclude>
-						<exclude>**/JU_JMeter.java</exclude>
-						<exclude>**/JU_Lur2_0Call.java</exclude>
-					</excludes>   
-				  </configuration>
-				</plugin>
 
+				<!-- Define the javadoc plugin -->
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-jarsigner-plugin</artifactId>
-					<version>1.2</version>
-					<executions>
-						<execution>
-							<id>sign</id>
-							<goals>
-								<goal>sign</goal>
-							</goals>
-							<configuration>
-								<!--  skip>${skipSigning}</skip -->
-								<archive>target/${project.artifactId}-${project.version}.jar</archive>
-							</configuration>
-						</execution>
-						<execution>
-							<id>verify</id>
-							<goals>
-								<goal>verify</goal>
-							</goals>
-							<configuration>
-								<archive>target/${project.artifactId}-${project.version}.jar</archive>
-							</configuration>
-						</execution>
-					</executions>
+					<artifactId>maven-javadoc-plugin</artifactId>
+					<version>2.10</version>
 					<configuration>
-						<skip>true</skip>
-						<alias>cadi</alias>
-						<keystore>/Volumes/Data/src/cadi/keys/aaf_cadi.jks</keystore>
-						<storepass>Surprise!</storepass>
-						<keypass>Surprise!</keypass>
-						<verbose>true</verbose>
-						<certs>true</certs>
+						<excludePackageNames>org.opendaylight.*</excludePackageNames>
 					</configuration>
 				</plugin>
-		
-		
+
 				<plugin>
 					<artifactId>maven-release-plugin</artifactId>
 					<version>2.5.2</version>
@@ -351,12 +324,12 @@
 						<goals>-s ${mvn.settings} deploy</goals>
 					</configuration>
 				</plugin>
-	
+
 				<plugin>
 					<artifactId>maven-assembly-plugin</artifactId>
 					<version>2.5.5</version>
 				</plugin>
-	
+
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-deploy-plugin</artifactId>
@@ -364,60 +337,28 @@
 					<configuration>
 						<skip>false</skip>
 					</configuration>
-	
+
 				</plugin>
-	
+
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-dependency-plugin</artifactId>
 					<version>2.10</version>
 				</plugin>
-				
-		<plugin>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-javadoc-plugin</artifactId>
-			<version>2.10.4</version>
-			<configuration>
-			<failOnError>false</failOnError>
-			</configuration>
-			<executions>
-				<execution>
-					<id>attach-javadocs</id>
-					<goals>
-						<goal>jar</goal>
-					</goals>
-				</execution>
-			</executions>
-		</plugin> 
-	   
-	   
-	       <plugin>
-		      <groupId>org.apache.maven.plugins</groupId>
-		      <artifactId>maven-source-plugin</artifactId>
-		      <version>2.2.1</version>
-		      <executions>
-			<execution>
-			  <id>attach-sources</id>
-			  <goals>
-			    <goal>jar-no-fork</goal>
-			  </goals>
-			</execution>
-		      </executions>
-		    </plugin>
-	
- 
-			
-		<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.7</version>
-				<configuration>
-					<formats>
-					<format>html</format>
-					<format>xml</format>
-				  </formats>
-				</configuration>
-		 </plugin>
+
+				<!-- Maven surefire plugin for testing -->
+				<plugin>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>2.17</version>
+					<configuration>
+						<skipTests>false</skipTests>
+						<includes>
+							<include>**/JU*.java</include>
+						</includes>
+						<excludes>
+						</excludes>
+					</configuration>
+				</plugin>
 
 				<!--This plugin's configuration is used to store Eclipse m2e settings 
 					only. It has no influence on the Maven build itself. -->
@@ -451,85 +392,68 @@
 						</lifecycleMappingMetadata>
 					</configuration>
 				</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> 
-			
-			<plugin>
-          <groupId>org.jacoco</groupId>
-          <artifactId>jacoco-maven-plugin</artifactId>
-          <version>${jacoco.version}</version>
-          <configuration>
-            <excludes>
-              <exclude>**/gen/**</exclude>
-              <exclude>**/generated-sources/**</exclude>
-              <exclude>**/yang-gen/**</exclude>
-              <exclude>**/pax/**</exclude>
-            </excludes>
-          </configuration>
-          <executions>
-
-            <execution>
-              <id>pre-unit-test</id>
-              <goals>
-                <goal>prepare-agent</goal>
-              </goals>
-              <configuration>
-                <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-                <propertyName>surefireArgLine</propertyName>
-              </configuration>
-            </execution>
-            
-       
-            <execution>
-              <id>post-unit-test</id>
-              <phase>test</phase>
-              <goals>
-                <goal>report</goal>
-              </goals>
-              <configuration>
-                <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-                <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-              </configuration>
-            </execution>
-            <execution>
-              <id>pre-integration-test</id>
-              <phase>pre-integration-test</phase>
-              <goals>
-                <goal>prepare-agent</goal>
-              </goals>
-              <configuration>
-                <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-
-                <propertyName>failsafeArgLine</propertyName>
-              </configuration>
-            </execution>
-
-       
-            <execution>
-              <id>post-integration-test</id>
-              <phase>post-integration-test</phase>
-              <goals>
-                <goal>report</goal>
-              </goals>
-              <configuration>
-                <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-                <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>	
-
-			</plugins>			
+				<plugin>
+					<groupId>org.jacoco</groupId>
+					<artifactId>jacoco-maven-plugin</artifactId>
+					<version>${jacoco.version}</version>
+					<configuration>
+						<excludes>
+							<exclude>**/gen/**</exclude>
+							<exclude>**/generated-sources/**</exclude>
+							<exclude>**/yang-gen/**</exclude>
+							<exclude>**/pax/**</exclude>
+						</excludes>
+					</configuration>
+					<executions>
+						<execution>
+							<id>pre-unit-test</id>
+							<goals>
+								<goal>prepare-agent</goal>
+							</goals>
+							<configuration>
+								<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+								<propertyName>surefireArgLine</propertyName>
+							</configuration>
+						</execution>
+						<execution>
+							<id>post-unit-test</id>
+							<phase>test</phase>
+							<goals>
+								<goal>report</goal>
+							</goals>
+							<configuration>
+								<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+								<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+							</configuration>
+						</execution>
+						<execution>
+							<id>pre-integration-test</id>
+							<phase>pre-integration-test</phase>
+							<goals>
+								<goal>prepare-agent</goal>
+							</goals>
+							<configuration>
+								<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+								<propertyName>failsafeArgLine</propertyName>
+							</configuration>
+						</execution>
+						<execution>
+							<id>post-integration-test</id>
+							<phase>post-integration-test</phase>
+							<goals>
+								<goal>report</goal>
+							</goals>
+							<configuration>
+								<dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+								<outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 	</build>
+
 	<distributionManagement>
 		<repository>
 			<id>ecomp-releases</id>
@@ -546,4 +470,5 @@
 			<url>dav:${nexusproxy}${sitePath}</url>
 		</site>
 	</distributionManagement>
+
 </project>