X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-certman%2Fpom.xml;h=c12abae224c037236f1b5ff8cc1b83d23ece9c2f;hb=a93911399b464aba33c072eb0a994e50a6691b7e;hp=69a5c5df4ca477585446d865fdab84fb2271fefb;hpb=f44b927dac674137fe2968b3af23e71ddeb5e5b9;p=aaf%2Fauthz.git

diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml
index 69a5c5df..c12abae2 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 * 
@@ -17,7 +19,7 @@
 	<parent>
 		<groupId>org.onap.aaf.authz</groupId>
 		<artifactId>authparent</artifactId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>2.1.5-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -42,6 +44,7 @@
 		<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>
@@ -59,6 +62,14 @@
 			<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>
@@ -79,12 +90,12 @@
 		<dependency>
 		  <groupId>org.bouncycastle</groupId>
 		  <artifactId>bcprov-jdk15on</artifactId>
-		  <version>1.59</version>
+		  <version>${project.bouncyCastleVersion}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
   			<artifactId>bcpkix-jdk15on</artifactId>
-  			<version>1.59</version>
+  			<version>${project.bouncyCastleVersion}</version>
 		</dependency>
 	</dependencies>
 
@@ -119,7 +130,7 @@
 							<mainClass>org.onap.aaf.auth.cm.AAF_CM</mainClass>
 							<name>cm</name>
 							<commandLineArguments>
-								<commandLineArgument>cadi_prop_files=${project.ext_root_dir}/etc/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>