X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aaf%2Fauthz.git;a=blobdiff_plain;f=cadi%2Fpom.xml;h=4393f0803dbf97483e8b85225c8c98f53e5bb6a4;hp=a9d8a9981e8bb5abfa00ec85487c5ee10518469c;hb=a97d731d65bb988e12495d7f9fa6565097c78e26;hpb=3901cf8002977b5008ecf727d9911dd9334e12da

diff --git a/cadi/pom.xml b/cadi/pom.xml
index a9d8a998..4393f080 100644
--- a/cadi/pom.xml
+++ b/cadi/pom.xml
@@ -21,27 +21,23 @@
 -->
 <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.1-SNAPSHOT</version>
+    </parent>
+	<artifactId>cadiparent</artifactId>
 	<name>AAF CADI Parent (Code, Access, Data, Identity)</name>
-	<version>1.5.0-SNAPSHOT</version>
 	<inceptionYear>2015-07-20</inceptionYear>
 	<organization>
 		<name>ONAP</name>
 	</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>1.3.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  -->
@@ -49,8 +45,8 @@
 	    <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
 	    <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
 	    <!-- Default Sonar configuration -->
-	    <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
-	    <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
+	    <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+	    <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
 	    <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
 	    <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
@@ -136,9 +132,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 +143,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 +163,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 +256,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>
@@ -350,6 +346,12 @@
 					<artifactId>maven-surefire-plugin</artifactId>
 					<version>2.17</version>
 					<configuration>
+						<skipTests>false</skipTests>
+						<includes>
+							<include>**/JU*.java</include>
+						</includes>
+						<excludes>
+						</excludes>
 					</configuration>
 				</plugin>