X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-oauth%2Fpom.xml;h=81784b89c57a8e5901fdd4a56ea516684c2084e1;hb=e18eecbea001562d1e1a19cdccfe1684b3da05f7;hp=ce51d0b7f56d0546741fb6855b3f8c40ae0ce334;hpb=40077be45039102b97347e4129a8b9c301a82c16;p=aaf%2Fauthz.git

diff --git a/auth/auth-oauth/pom.xml b/auth/auth-oauth/pom.xml
index ce51d0b7..81784b89 100644
--- a/auth/auth-oauth/pom.xml
+++ b/auth/auth-oauth/pom.xml
@@ -15,9 +15,9 @@
 	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>
-		<groupId>org.onap.aaf.authz.auth</groupId>
-		<artifactId>parent</artifactId>
-		<version>2.1.0-SNAPSHOT</version>
+		<groupId>org.onap.aaf.authz</groupId>
+		<artifactId>authparent</artifactId>
+		<version>2.1.6-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -28,7 +28,7 @@
 	<properties>
 		<project.swmVersion>25</project.swmVersion>
 		<!-- SONAR -->
-		<sonar.skip>true</sonar.skip>
+		<!-- <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>
@@ -42,26 +42,23 @@
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/aaf/authz/auth/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.authz.auth</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-auth-core</artifactId>
-			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.auth</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-auth-cass</artifactId>
-			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.cadi</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
-			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
 
@@ -95,8 +92,9 @@
 							<mainClass>org.onap.aaf.auth.oauth.AAF_OAuth</mainClass>
 							<name>oauth</name>
 							<commandLineArguments>
-								<commandLineArgument>cadi_prop_files=${project.ext_root_dir}/etc/org.osaaf.oauth.props</commandLineArgument>
+								<commandLineArgument>cadi_prop_files=${project.ext_root_dir}/etc/org.osaaf.aaf.oauth.props</commandLineArgument>
 								<commandLineArgument>cadi_log_dir=${project.ext_root_dir}/logs/oauth</commandLineArgument>
+								<commandLineArgument>cadi_etc_dir=${project.ext_root_dir}/etc</commandLineArgument>
 							</commandLineArguments>
 						</program>
 					</programs>
@@ -105,7 +103,6 @@
 			<plugin>
 				<groupId>org.sonatype.plugins</groupId>
 				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.7</version>
 				<extensions>true</extensions>
 				<configuration>
 					<nexusUrl>${nexusproxy}</nexusUrl>
@@ -116,7 +113,6 @@
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>${jacoco.version}</version>
 				<configuration>
 					<excludes>
 						<exclude>**/gen/**</exclude>