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

diff --git a/bpmn/mso-infrastructure-bpmn/pom.xml b/bpmn/mso-infrastructure-bpmn/pom.xml
index b621853..4f7ceca 100644 (file)
--- 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 6e26592..08f797d 100644 (file)
--- 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 542b8db..678de23 100644 (file)
--- 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 dd78d13..c8800b8 100644 (file)
--- 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>