X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-certman%2Fpom.xml;h=dc63f666c98493a8f5f9048cbbdf4986d12724a6;hb=e18eecbea001562d1e1a19cdccfe1684b3da05f7;hp=5f6f4526b707b773638fdb27f3897a4ca4539aba;hpb=2e2332825447056f1c107213f2202ba537433a25;p=aaf%2Fauthz.git

diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml
index 5f6f4526..dc63f666 100644
--- a/auth/auth-certman/pom.xml
+++ b/auth/auth-certman/pom.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- * ============LICENSE_START==================================================== 
-	* org.onap.aaf * =========================================================================== 
-	* Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. * =========================================================================== 
+	* 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 * 
@@ -15,9 +17,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>
 
@@ -27,12 +29,13 @@
 
 	<properties>
 		<!-- 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>
@@ -41,30 +44,59 @@
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
 		<sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
+		<project.bouncyCastleVersion>1.60</project.bouncyCastleVersion>
 	</properties>
 
 	<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.auth</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-auth-cass</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.cadi</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-aaf</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>com.google.code.jscep</groupId>
 			<artifactId>jscep</artifactId>
 			<version>2.4.0</version>
+			<exclusions>
+				<exclusion>
+				 	<groupId>org.bouncycastle</groupId>
+		  			<artifactId>bcprov-jdk15on</artifactId>
+				</exclusion>
+				<exclusion>
+				  	<groupId>org.bouncycastle</groupId>
+  					<artifactId>bcpkix-jdk15on</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<!-- JSCEP does not use latest "Bouncy Castle" -->
+		<dependency>
+		  <groupId>org.bouncycastle</groupId>
+		  <artifactId>bcprov-jdk15on</artifactId>
+		  <version>${project.bouncyCastleVersion}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.bouncycastle</groupId>
+  			<artifactId>bcpkix-jdk15on</artifactId>
+  			<version>${project.bouncyCastleVersion}</version>
 		</dependency>
-
 	</dependencies>
 
 	<build>
@@ -98,7 +130,8 @@
 							<mainClass>org.onap.aaf.auth.cm.AAF_CM</mainClass>
 							<name>cm</name>
 							<commandLineArguments>
-								<commandLineArgument>cadi_prop_files=${project.conf_dir}/org.osaaf.cm.props</commandLineArgument>
+								<commandLineArgument>cadi_prop_files=${project.ext_root_dir}/etc/org.osaaf.aaf.cm.props</commandLineArgument>
+								<commandLineArgument>cadi_log_dir=${project.ext_root_dir}/logs/cm</commandLineArgument>
 							</commandLineArguments>
 						</program>
 					</programs>
@@ -107,7 +140,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>
@@ -118,7 +150,6 @@
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>${jacoco.version}</version>
 				<configuration>
 					<excludes>
 						<exclude>**/gen/**</exclude>