X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-locate%2Fpom.xml;h=ac0cadbef76c2323a64b12bb80a4acba7eb24a06;hb=c9324c82b4a7d6e2867b2e765f4949ee306045af;hp=7f76a28f07459c540f35051c2d51d7b2b92fa1c9;hpb=53ad85818a4de32afb51bd27c7d577195d882dd7;p=aaf%2Fauthz.git

diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml
index 7f76a28f..ac0cadbe 100644
--- a/auth/auth-locate/pom.xml
+++ b/auth/auth-locate/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.11-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -28,12 +28,13 @@
 	<properties>
 		<maven.test.failure.ignore>true</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>
+		<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>
@@ -46,19 +47,37 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.authz.auth</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
+			<artifactId>aaf-auth-client</artifactId>
+		</dependency>
+	
+		<dependency>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-auth-core</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.auth</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-auth-cass</artifactId>
 		</dependency>
 
+                <!-- Add the Organizations you wish to support. You can delete ONAP if
+                        you have something else Match with Property Entry: Organization.<root ns>,
+                        i.e. Organization.onap.org=org.onap.org.DefaultOrg -->
+                <dependency>
+                        <groupId>org.onap.aaf.authz</groupId>
+                        <artifactId>aaf-auth-deforg</artifactId>
+                </dependency>
+
 		<dependency>
-			<groupId>org.onap.aaf.authz.cadi</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>org.onap.aaf.authz</groupId>
+			<artifactId>aaf-misc-rosetta</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -79,7 +98,6 @@
 				</configuration>
 			</plugin>
 
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-deploy-plugin</artifactId>
@@ -96,7 +114,9 @@
 							<mainClass>org.onap.aaf.auth.locate.AAF_Locate</mainClass>
 							<id>locate</id>
 							<commandLineArguments>
-								<commandLineArgument>cadi_prop_files=${project.conf_dir}/org.osaaf.locate.props</commandLineArgument>
+								<commandLineArgument>cadi_prop_files=${project.ext_root_dir}/etc/org.osaaf.aaf.locate.props</commandLineArgument>
+								<commandLineArgument>cadi_log_dir=${project.ext_root_dir}/logs/locate</commandLineArgument>
+								<commandLineArgument>cadi_etc_dir=${project.ext_root_dir}/etc</commandLineArgument>
 							</commandLineArguments>
 						</program>
 					</programs>
@@ -105,7 +125,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 +135,6 @@
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>${jacoco.version}</version>
 				<configuration>
 					<excludes>
 						<exclude>**/gen/**</exclude>