Modify parent in parent modules

Issue-ID: AAF-215
Change-Id: I424ef918de779d17043045f5aac66c2863845e1a
Signed-off-by: Sai Gandham <sg481n@att.com>

diff --git a/auth/pom.xml b/auth/pom.xml
index a2fc001..410e88b 100644 (file)
--- a/auth/pom.xml
+++ b/auth/pom.xml
@@ -23,11 +23,11 @@
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
        <modelVersion>4.0.0</modelVersion>
-       <!--<parent>
+       <parent>
     <groupId>org.onap.aaf.authz</groupId>
     <artifactId>super-pom</artifactId>
     <version>2.1.0-SNAPSHOT</version>
-    </parent> -->
+    </parent>
        <groupId>org.onap.aaf.authz.auth</groupId>
        <artifactId>parent</artifactId>
        <version>2.1.0-SNAPSHOT</version>

diff --git a/cadi/aaf/pom.xml b/cadi/aaf/pom.xml
index 2072621..25ae5ee 100644 (file)
--- a/cadi/aaf/pom.xml
+++ b/cadi/aaf/pom.xml
@@ -91,7 +91,7 @@
                <dependency>
                        <groupId>org.onap.aaf.authz.auth</groupId>
                        <artifactId>aaf-auth-client</artifactId>
-                       <!--<version>${project.version}</version>-->
+                       <version>${project.version}</version>
                </dependency>
 
                <dependency>

diff --git a/cadi/pom.xml b/cadi/pom.xml
index 93fa24a..7477367 100644 (file)
--- a/cadi/pom.xml
+++ b/cadi/pom.xml
@@ -21,11 +21,11 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
-       <!--<parent>
+       <parent>
     <groupId>org.onap.aaf.authz</groupId>
     <artifactId>super-pom</artifactId>
     <version>2.1.0-SNAPSHOT</version>
-    </parent>-->
+    </parent>
        <groupId>org.onap.aaf.authz.cadi</groupId>
        <artifactId>parent</artifactId>
        <name>AAF CADI Parent (Code, Access, Data, Identity)</name>
@@ -39,7 +39,6 @@
        
        <properties>
                <skipSigning>true</skipSigning>
-               <project.authClientVersion>2.1.0-SNAPSHOT</project.authClientVersion>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <project.jettyVersion>9.3.9.v20160517</project.jettyVersion>
                <powermock.version>1.5.1</powermock.version>
@@ -147,7 +146,7 @@
                        <dependency>
                                <groupId>org.onap.aaf.authz.auth</groupId>
                                <artifactId>aaf-auth-client</artifactId>
-                               <version>${project.authClientVersion}</version>
+                               <version>${project.version}</version>
                        </dependency>
 
                        <dependency>

diff --git a/misc/pom.xml b/misc/pom.xml
index 4214c83..5af823c 100644 (file)
--- a/misc/pom.xml
+++ b/misc/pom.xml
@@ -22,11 +22,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
-       <!--<parent>
+       <parent>
     <groupId>org.onap.aaf.authz</groupId>
     <artifactId>super-pom</artifactId>
     <version>2.1.0-SNAPSHOT</version>
-    </parent> -->
+    </parent>
        <groupId>org.onap.aaf.authz.misc</groupId>
        <artifactId>parent</artifactId>
        <name>AAF Misc Parent</name>