From: Sai Gandham <sg481n@att.com>
Date: Mon, 9 Apr 2018 01:12:45 +0000 (+0000)
Subject: Modify parent in parent modules
X-Git-Tag: Beijing-2.1.1~131
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aaf%2Fauthz.git;a=commitdiff_plain;h=b4f108d7814915a47208e110ee077c8130ca2f7f

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 a2fc0017..410e88b2 100644
--- 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 20726217..25ae5eed 100644
--- 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 93fa24a6..74773676 100644
--- 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 4214c838..5af823c4 100644
--- 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>