X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-deforg%2Fpom.xml;h=6c61eb35afa87c996acc0fccf2e3bfe42c0c6ee4;hb=716a934340f4fb8eaf685960d2af850917a1557e;hp=1fa3f495d5ecfb33e1ca1713ec511db465a84722;hpb=05c86474cdee38b0ae8b66f4d0d3f18385896d1b;p=aaf%2Fauthz.git

diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml
index 1fa3f495..6c61eb35 100644
--- a/auth/auth-deforg/pom.xml
+++ b/auth/auth-deforg/pom.xml
@@ -23,10 +23,10 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>parent</artifactId>
+		<artifactId>authparent</artifactId>
 		<relativePath>../pom.xml</relativePath>
-		<groupId>org.onap.aaf.auth</groupId>
-		<version>2.1.0-SNAPSHOT</version>
+		<groupId>org.onap.aaf.authz</groupId>
+		<version>2.1.2.beta1</version>
 	</parent>
 
 	<artifactId>aaf-auth-deforg</artifactId>
@@ -72,17 +72,17 @@
 
 
 	<properties>
-	<skipTests>true</skipTests>
 		<maven.test.failure.ignore>false</maven.test.failure.ignore>
 		<!--  SONAR  -->
+		<!-- <sonar.skip>true</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>
-	    <!-- 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>
+		<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>
@@ -93,19 +93,15 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.cadi</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-core</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.auth</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-auth-core</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>javax.mail</groupId>
-			<artifactId>mail</artifactId>
-		</dependency>
 	</dependencies>
 
 	<build>
@@ -115,7 +111,7 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-deploy-plugin</artifactId>
 				<configuration>
-					<skip>true</skip>
+					<skip>false</skip>
 				</configuration>
 			</plugin>
 				<plugin>
@@ -158,7 +154,6 @@
 						</excludes>
 					</configuration>
 					<executions>
-
 						<execution>
 							<id>pre-unit-test</id>
 							<goals>
@@ -169,8 +164,6 @@
 								<propertyName>surefireArgLine</propertyName>
 							</configuration>
 						</execution>
-
-
 						<execution>
 							<id>post-unit-test</id>
 							<phase>test</phase>
@@ -180,6 +173,9 @@
 							<configuration>
 								<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
 								<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+								<includes>
+									<include>**</include>
+								</includes>
 							</configuration>
 						</execution>
 						<execution>
@@ -190,10 +186,12 @@
 							</goals>
 							<configuration>
 								<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+								<includes>
+									<include>**</include>
+								</includes>
 								<propertyName>failsafeArgLine</propertyName>
 							</configuration>
 						</execution>
-
 						<execution>
 							<id>post-integration-test</id>
 							<phase>post-integration-test</phase>