X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-fs%2Fpom.xml;h=b4c90fdc754446dbd8462ffd430d4c780b1a8ef3;hb=f2b24d074b23704f809ea19ebcf558b3a39eb5b9;hp=bb61fb59cf9a93aeec51515f0155d91f4f8b5d33;hpb=103d3ca78423b8c90be7ab3ce76c7144f31476d7;p=aaf%2Fauthz.git

diff --git a/auth/auth-fs/pom.xml b/auth/auth-fs/pom.xml
index bb61fb59..b4c90fdc 100644
--- a/auth/auth-fs/pom.xml
+++ b/auth/auth-fs/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.15</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -28,7 +28,7 @@
 	<properties>
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
 		<!-- 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,7 +42,7 @@
 		<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>
 
@@ -84,12 +84,12 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.authz.auth</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-auth-core</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.cadi</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-core</artifactId>
 		</dependency>
 	</dependencies>
@@ -112,28 +112,17 @@
 							<mainClass>org.onap.aaf.auth.fs.AAF_FS</mainClass>
 							<name>fs</name>
 							<commandLineArguments>
-								<commandLineArgument>cadi_prop_files=${project.ext_root_dir}/etc/org.osaaf.fs.props</commandLineArgument>
+								<commandLineArgument>cadi_prop_files=${project.ext_root_dir}/etc/org.osaaf.aaf.fs.props</commandLineArgument>
 								<commandLineArgument>cadi_log_dir=${project.ext_root_dir}/logs/fs</commandLineArgument>
+								<commandLineArgument>cadi_etc_dir=${project.ext_root_dir}/etc</commandLineArgument>
 							</commandLineArguments>
 						</program>
 					</programs>
 				</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>