From 4209b112238df5ec0efe7bd2e351f2b6b8e816e2 Mon Sep 17 00:00:00 2001
From: "Benjamin, Max (mb388a)" <mb388a@att.com>
Date: Wed, 13 Jan 2021 12:37:09 -0500
Subject: added in changes to pom for new cadi dependencies

added in changes to pom for new cadi dependencies
moved aaf version to parent pom and pull version
manage cadi dependency versions in root pom

Issue-ID: SO-3480
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I0b3ea6991369573826ee6f2d4260dcb35595cda7
---
 bpmn/mso-infrastructure-bpmn/pom.xml           | 20 ++++++++++++-
 common/pom.xml                                 | 20 ++++++++++++-
 mso-api-handlers/mso-api-handler-infra/pom.xml | 20 ++++++++++++-
 pom.xml                                        | 39 ++++++++++++++++++++++++++
 4 files changed, 96 insertions(+), 3 deletions(-)

diff --git a/bpmn/mso-infrastructure-bpmn/pom.xml b/bpmn/mso-infrastructure-bpmn/pom.xml
index b621853f2b..4f7ceca9b9 100644
--- a/bpmn/mso-infrastructure-bpmn/pom.xml
+++ b/bpmn/mso-infrastructure-bpmn/pom.xml
@@ -333,10 +333,13 @@
       <version>1.7.0</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.onap.aaf.authz</groupId>
+      <artifactId>aaf-cadi-client</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.onap.aaf.authz</groupId>
       <artifactId>aaf-cadi-aaf</artifactId>
-      <version>${aaf.cadi.version}</version>
       <exclusions>
         <exclusion>
           <groupId>javax.servlet</groupId>
@@ -348,5 +351,20 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.onap.aaf.authz</groupId>
+      <artifactId>aaf-auth-client</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.aaf.authz</groupId>
+      <artifactId>aaf-misc-env</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.aaf.authz</groupId>
+      <artifactId>aaf-misc-rosetta</artifactId>
+      <scope>runtime</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/common/pom.xml b/common/pom.xml
index 6e265925c3..08f797d7e5 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -133,10 +133,13 @@
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.onap.aaf.authz</groupId>
+      <artifactId>aaf-cadi-client</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.onap.aaf.authz</groupId>
       <artifactId>aaf-cadi-aaf</artifactId>
-      <version>${aaf.cadi.version}</version>
       <exclusions>
         <exclusion>
           <groupId>javax.servlet</groupId>
@@ -148,6 +151,21 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.onap.aaf.authz</groupId>
+      <artifactId>aaf-auth-client</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.aaf.authz</groupId>
+      <artifactId>aaf-misc-env</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.aaf.authz</groupId>
+      <artifactId>aaf-misc-rosetta</artifactId>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>org.reflections</groupId>
       <artifactId>reflections</artifactId>
diff --git a/mso-api-handlers/mso-api-handler-infra/pom.xml b/mso-api-handlers/mso-api-handler-infra/pom.xml
index 542b8db932..678de23db5 100644
--- a/mso-api-handlers/mso-api-handler-infra/pom.xml
+++ b/mso-api-handlers/mso-api-handler-infra/pom.xml
@@ -235,10 +235,13 @@
       <groupId>io.micrometer</groupId>
       <artifactId>micrometer-registry-prometheus</artifactId>
     </dependency>
+    <dependency>
+        <groupId>org.onap.aaf.authz</groupId>
+        <artifactId>aaf-cadi-client</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.onap.aaf.authz</groupId>
       <artifactId>aaf-cadi-aaf</artifactId>
-      <version>${aaf.cadi.version}</version>
       <exclusions>
         <exclusion>
           <groupId>javax.servlet</groupId>
@@ -250,6 +253,21 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+        <groupId>org.onap.aaf.authz</groupId>
+        <artifactId>aaf-auth-client</artifactId>
+        <scope>runtime</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.onap.aaf.authz</groupId>
+        <artifactId>aaf-misc-env</artifactId>
+        <scope>runtime</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.onap.aaf.authz</groupId>
+        <artifactId>aaf-misc-rosetta</artifactId>
+        <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>javax.xml.bind</groupId>
       <artifactId>jaxb-api</artifactId>
diff --git a/pom.xml b/pom.xml
index dd78d138a9..c8800b8414 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,6 +71,7 @@
     <cxf.version>3.3.3</cxf.version>
     <jax.ws.rs>2.1</jax.ws.rs>
     <springboot.version>2.1.5.RELEASE</springboot.version>
+    <aaf.version>2.1.21</aaf.version>
     <camunda.springboot.version>3.2.0</camunda.springboot.version>
     <format.skipValidate>false</format.skipValidate>
     <format.skipExecute>true</format.skipExecute>
@@ -1030,6 +1031,44 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>org.onap.aaf.authz</groupId>
+        <artifactId>aaf-cadi-client</artifactId>
+        <version>${aaf.version}</version>
+	    </dependency>
+	    <dependency>
+	      <groupId>org.onap.aaf.authz</groupId>
+	      <artifactId>aaf-cadi-aaf</artifactId>
+	      <version>${aaf.version}</version>
+	      <exclusions>
+	        <exclusion>
+	          <groupId>javax.servlet</groupId>
+	          <artifactId>servlet-api</artifactId>
+	        </exclusion>
+	        <exclusion>
+	          <groupId>log4j</groupId>
+	          <artifactId>log4j</artifactId>
+	        </exclusion>
+	      </exclusions>
+	    </dependency>
+	    <dependency>
+	        <groupId>org.onap.aaf.authz</groupId>
+	        <artifactId>aaf-auth-client</artifactId>
+	        <version>${aaf.version}</version>
+	        <scope>runtime</scope>
+	    </dependency>
+	    <dependency>
+	        <groupId>org.onap.aaf.authz</groupId>
+	        <artifactId>aaf-misc-env</artifactId>
+	        <version>${aaf.version}</version>
+	        <scope>runtime</scope>
+	    </dependency>
+	    <dependency>
+	        <groupId>org.onap.aaf.authz</groupId>
+	        <artifactId>aaf-misc-rosetta</artifactId>
+	        <version>${aaf.version}</version>
+	        <scope>runtime</scope>
+	    </dependency>
     </dependencies>
   </dependencyManagement>
   <profiles>
-- 
cgit 1.2.3-korg