X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Fpom.xml;h=5dfdf9ef49e4e96508eb0f7416c2778b7fd698fb;hb=a7fb5826abbf912a01230f5f5c09a8683d743f9c;hp=b6f12625d0741c713497d820df3ade431c696896;hpb=db2888d4ff0dff6fd1625d9b31e7a22c3a06bc49;p=aaf%2Fauthz.git

diff --git a/cadi/pom.xml b/cadi/pom.xml
index b6f12625..5dfdf9ef 100644
--- a/cadi/pom.xml
+++ b/cadi/pom.xml
@@ -21,8 +21,13 @@
 -->
 <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>
-	<groupId>org.onap.aaf.authz.cadi</groupId>
-	<artifactId>parent</artifactId>
+	<parent>
+    <groupId>org.onap.aaf.authz</groupId>
+    <artifactId>parent</artifactId>
+    <version>2.1.0-SNAPSHOT</version>
+    </parent>
+	<groupId>org.onap.aaf.authz</groupId>
+	<artifactId>cadiparent</artifactId>
 	<name>AAF CADI Parent (Code, Access, Data, Identity)</name>
 	<version>2.1.0-SNAPSHOT</version>
 	<inceptionYear>2015-07-20</inceptionYear>
@@ -31,17 +36,10 @@
 	</organization>
 	<packaging>pom</packaging>
 
-   <parent>
-        <groupId>org.onap.oparent</groupId>
-        <artifactId>oparent</artifactId>
-        <version>1.1.0</version>
-    </parent>
-
+	
 	<properties>
-		<skipSigning>true</skipSigning>
+		<!-- <sonar.skip>true</sonar.skip> -->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.miscVersion>2.1.0-SNAPSHOT</project.miscVersion>
-		<project.authClientVersion>2.10-SNAPSHOT</project.authClientVersion>
 		<project.jettyVersion>9.3.9.v20160517</project.jettyVersion>
 		<powermock.version>1.5.1</powermock.version>
 		<!--  SONAR  -->
@@ -136,9 +134,9 @@
 		<module>core</module>
 		<module>client</module>
 		<module>aaf</module>
-		<module>cass</module>
 		<module>oauth-enduser</module>
 		<module>shiro</module>
+		<module>shiro-osgi-bundle</module>
 	</modules>
 
 	<!-- ============================================================== -->
@@ -147,19 +145,19 @@
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>org.onap.aaf.authz.auth</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-auth-client</artifactId>
-				<version>${project.authClientVersion}</version>
+				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.cadi</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-cadi-core</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.cadi</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-cadi-oauth</artifactId>
 				<version>${project.version}</version>
 			</dependency>
@@ -167,59 +165,59 @@
 
 			<!-- Prevent Cycles in Testing  -->
 			<dependency>
-				<groupId>org.onap.aaf.authz.cadi</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-cadi-core</artifactId>
 				<version>${project.version}</version>
 				<classifier>tests</classifier>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.cadi</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-cadi-jetty</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.cadi</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-cadi-cass</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.cadi</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-cadi-aaf</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.cadi</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-cadi-aaf</artifactId>
 				<version>${project.version}</version>
 				<classifier>full</classifier>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.cadi</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-cadi-client</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.misc</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-misc-env</artifactId>
-				<version>${project.miscVersion}</version>
+				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.misc</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-misc-rosetta</artifactId>
-				<version>${project.miscVersion}</version>
+				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.misc</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-misc-log4j</artifactId>
-				<version>${project.miscVersion}</version>
+				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
@@ -260,8 +258,8 @@
 
 			<dependency>
 			    <groupId>javax.servlet</groupId>
-			    <artifactId>servlet-api</artifactId>
-				<version>2.5</version>
+			    <artifactId>javax.servlet-api</artifactId>
+				<version>3.0.1</version>
 			</dependency>
 
 			<dependency>