X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Fpom.xml;h=ee82f229717db1c84c7e7866a1931d9394d34333;hb=c9324c82b4a7d6e2867b2e765f4949ee306045af;hp=a0bf0bddc8ddcbc7555dbd7b8cf62bd3fb8afc5f;hpb=6cd833478d794245708ccd448a6835a0d6d3b7ce;p=aaf%2Fauthz.git

diff --git a/cadi/pom.xml b/cadi/pom.xml
index a0bf0bdd..ee82f229 100644
--- a/cadi/pom.xml
+++ b/cadi/pom.xml
@@ -21,44 +21,38 @@
 -->
 <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.11-SNAPSHOT</version>
+    </parent>
+	<artifactId>cadiparent</artifactId>
 	<name>AAF CADI Parent (Code, Access, Data, Identity)</name>
-	<version>2.1.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>
-		<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  -->
-		 <jacoco.version>0.7.7.201606060606</jacoco.version>
-	    <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-	    <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-	    <!-- Default Sonar configuration -->
-	    <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>
+		<!-- SONAR -->
+		<!-- <sonar.skip>true</sonar.skip> -->
+		<jacoco.version>0.7.7.201606060606</jacoco.version>
+		<sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+		<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+		<!-- Default Sonar configuration -->
+		<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>
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
 		<sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
 	</properties>
+	
 
 	<!-- ============================================================== -->
 	<!-- Define the major contributors and developers of CADI -->
@@ -104,27 +98,23 @@
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-all</artifactId>
-			<version>1.9.5</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.powermock</groupId>
 			<artifactId>powermock-module-junit4</artifactId>
-			<version>${powermock.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.powermock</groupId>
 			<artifactId>powermock-api-mockito</artifactId>
-			<version>${powermock.version}</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.10</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -137,139 +127,9 @@
 		<module>client</module>
 		<module>aaf</module>
 		<module>oauth-enduser</module>
-		<module>shiro</module>
+		<module>servlet-sample</module>
 	</modules>
 
-	<!-- ============================================================== -->
-	<!-- Define project-wide dependencies -->
-	<!-- ============================================================== -->
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.onap.aaf.authz.auth</groupId>
-				<artifactId>aaf-auth-client</artifactId>
-				<version>${project.authClientVersion}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.onap.aaf.authz.cadi</groupId>
-				<artifactId>aaf-cadi-core</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.onap.aaf.authz.cadi</groupId>
-				<artifactId>aaf-cadi-oauth</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-
-
-			<!-- Prevent Cycles in Testing  -->
-			<dependency>
-				<groupId>org.onap.aaf.authz.cadi</groupId>
-				<artifactId>aaf-cadi-core</artifactId>
-				<version>${project.version}</version>
-				<classifier>tests</classifier>
-			</dependency>
-
-			<dependency>
-				<groupId>org.onap.aaf.authz.cadi</groupId>
-				<artifactId>aaf-cadi-jetty</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.onap.aaf.authz.cadi</groupId>
-				<artifactId>aaf-cadi-cass</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.onap.aaf.authz.cadi</groupId>
-				<artifactId>aaf-cadi-aaf</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.onap.aaf.authz.cadi</groupId>
-				<artifactId>aaf-cadi-aaf</artifactId>
-				<version>${project.version}</version>
-				<classifier>full</classifier>
-			</dependency>
-
-			<dependency>
-				<groupId>org.onap.aaf.authz.cadi</groupId>
-				<artifactId>aaf-cadi-client</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.onap.aaf.authz.misc</groupId>
-				<artifactId>aaf-misc-env</artifactId>
-				<version>${project.miscVersion}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.onap.aaf.authz.misc</groupId>
-				<artifactId>aaf-misc-rosetta</artifactId>
-				<version>${project.miscVersion}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.onap.aaf.authz.misc</groupId>
-				<artifactId>aaf-misc-log4j</artifactId>
-				<version>${project.miscVersion}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-servlet</artifactId>
-				<version>${project.jettyVersion}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-io</artifactId>
-				<version>${project.jettyVersion}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-security</artifactId>
-				<version>${project.jettyVersion}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-http</artifactId>
-				<version>${project.jettyVersion}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-util</artifactId>
-				<version>${project.jettyVersion}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-server</artifactId>
-				<version>${project.jettyVersion}</version>
-			</dependency>
-
-			<dependency>
-			    <groupId>javax.servlet</groupId>
-			    <artifactId>javax.servlet-api</artifactId>
-				<version>3.0.1</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-api</artifactId>
-				<version>1.7.5</version>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
 
 	<!-- ============================================================== -->
 	<!-- Define common plugins and make them available for all modules -->
@@ -355,6 +215,7 @@
 						</includes>
 						<excludes>
 						</excludes>
+						<useSystemClassLoader>false</useSystemClassLoader>
 					</configuration>
 				</plugin>