From c701407539324d60f32be496e5292808829ae1d6 Mon Sep 17 00:00:00 2001
From: Instrumental <jonathan.gathman@att.com>
Date: Wed, 7 Nov 2018 11:21:03 -0600
Subject: Pom OParent, other hierarchy

Issue-ID: AAF-613
Change-Id: I14531b546aebb9e5326ddc67eb3ec4eb9e17dac1
Signed-off-by: Instrumental <jonathan.gathman@att.com>
---
 shiro-osgi-bundle/pom.xml | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'shiro-osgi-bundle/pom.xml')

diff --git a/shiro-osgi-bundle/pom.xml b/shiro-osgi-bundle/pom.xml
index a73d567..8fc885e 100644
--- a/shiro-osgi-bundle/pom.xml
+++ b/shiro-osgi-bundle/pom.xml
@@ -19,22 +19,20 @@
     * -->
 <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">
-
 	<parent>
 		<groupId>org.onap.aaf.cadi</groupId>
-		<artifactId>cadimiscparent</artifactId>
-		<version>2.1.2-SNAPSHOT</version>
+		<artifactId>parent</artifactId>
+		<version>2.1.7-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
-	<modelVersion>4.0.0</modelVersion>
 
-	<name>AAF Shiro CADI Plugin</name>
+	<modelVersion>4.0.0</modelVersion>
+	<name>Shiro OSGI CADI Plugin</name>
 	<artifactId>aaf-shiro-aafrealm-osgi-bundle</artifactId>
 	<packaging>bundle</packaging>
 
 	<properties>
 	    <sonar.skip>true</sonar.skip>
-	    <cadi.shiro.version>2.1.1</cadi.shiro.version>
 	</properties>
 
 	<build>
@@ -49,7 +47,7 @@
 						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
 						<Bundle-Version>${project.version}</Bundle-Version>
 						<Export-Package>
-							org.onap.aaf.cadi.shiro*;version=${cadi.shiro.version}
+							org.onap.aaf.cadi.shiro*;version=${project.version}
 						</Export-Package>
 						<Import-Package>
 							javax.servlet,
@@ -86,10 +84,10 @@
 	</build>
 
 	<dependencies>
-		<dependency>
-           <groupId>org.onap.aaf.authz</groupId>
-           <artifactId>aaf-cadi-shiro</artifactId>
-	   <version>2.1.1</version>
-        </dependency>
+           <dependency>
+             <groupId>org.onap.aaf.cadi</groupId>
+             <artifactId>aaf-cadi-shiro</artifactId>
+             <version>${project.version}</version>
+           </dependency>
 	</dependencies>
 </project>
-- 
cgit 1.2.3-korg