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

diff --git a/cadi/pom.xml b/cadi/pom.xml
index 56cf3990..ee82f229 100644
--- a/cadi/pom.xml
+++ b/cadi/pom.xml
@@ -21,45 +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>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>
-		<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  -->
-		 <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.reportPath>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
-	    <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
-	    <!-- 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 -->
@@ -105,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,142 +126,10 @@
 		<module>core</module>
 		<module>client</module>
 		<module>aaf</module>
-		<module>cass</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>servlet-api</artifactId>
-				<version>2.5</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 -->
@@ -281,7 +138,7 @@
 		<testSourceDirectory>src/test/java</testSourceDirectory>
 		<plugins>
 		</plugins>
-		<pluginManagement>			
+		<pluginManagement>
 			<plugins>
 				<plugin>
 					<inherited>true</inherited>
@@ -293,7 +150,7 @@
 						<target>1.7</target>
 					</configuration>
 				</plugin>
-	
+
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<version>2.4</version>
@@ -317,7 +174,7 @@
 						<excludePackageNames>org.opendaylight.*</excludePackageNames>
 					</configuration>
 				</plugin>
-	
+
 				<plugin>
 					<artifactId>maven-release-plugin</artifactId>
 					<version>2.5.2</version>
@@ -325,37 +182,44 @@
 						<goals>-s ${mvn.settings} deploy</goals>
 					</configuration>
 				</plugin>
-	
+
 				<plugin>
 					<artifactId>maven-assembly-plugin</artifactId>
 					<version>2.5.5</version>
 				</plugin>
-	
+
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-deploy-plugin</artifactId>
 					<version>2.8.1</version>
 					<configuration>
-						<skip>true</skip>
+						<skip>false</skip>
 					</configuration>
-	
+
 				</plugin>
-	
+
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-dependency-plugin</artifactId>
 					<version>2.10</version>
 				</plugin>
-	
+
 				<!-- Maven surefire plugin for testing -->
 				<plugin>
 					<artifactId>maven-surefire-plugin</artifactId>
 					<version>2.17</version>
 					<configuration>
+						<skipTests>false</skipTests>
+						<includes>
+							<include>**/JU*.java</include>
+						</includes>
+						<excludes>
+						</excludes>
+						<useSystemClassLoader>false</useSystemClassLoader>
 					</configuration>
 				</plugin>
-				
-				<!--This plugin's configuration is used to store Eclipse m2e settings 
+
+				<!--This plugin's configuration is used to store Eclipse m2e settings
 					only. It has no influence on the Maven build itself. -->
 				<plugin>
 					<groupId>org.eclipse.m2e</groupId>
@@ -387,73 +251,79 @@
 						</lifecycleMappingMetadata>
 					</configuration>
 				</plugin>
-								<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.7</version>
-				<extensions>true</extensions>
-				<configuration>
-					<nexusUrl>${nexusproxy}</nexusUrl>
-					<stagingProfileId>176c31dfe190a</stagingProfileId>
-					<serverId>ecomp-staging</serverId>
-				</configuration>
-			</plugin>		
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.7.7.201606060606</version>
-				<configuration>
-					<dumpOnExit>true</dumpOnExit>
-					<includes>
-						<include>org.onap.aaf.*</include>
-					</includes>
-				</configuration>
-				<executions>
-					<execution>
-						<id>pre-unit-test</id>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-						<configuration>
-							<destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
-							<!-- <append>true</append> -->
-						</configuration>
-					</execution>
-					<execution>
-						<id>pre-integration-test</id>
-						<phase>pre-integration-test</phase>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-						<configuration>
-							<destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
-							<!-- <append>true</append> -->
-						</configuration>
-					</execution>
-					<execution>
-                        <goals>
-                            <goal>merge</goal>
-                        </goals>
-                        <phase>post-integration-test</phase>
-                        <configuration>
-                            <fileSets>
-                                <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">
-                                    <directory>${project.build.directory}/coverage-reports</directory>
-                                    <includes>
-                                        <include>*.exec</include>
-                                    </includes>
-                                </fileSet>
-                            </fileSets>
-                            <destFile>${project.build.directory}/jacoco-dev.exec</destFile>
-                        </configuration>
-                    </execution>
-				</executions>
-			</plugin>
+				<plugin>
+					<groupId>org.sonatype.plugins</groupId>
+					<artifactId>nexus-staging-maven-plugin</artifactId>
+					<version>1.6.7</version>
+					<extensions>true</extensions>
+					<configuration>
+						<nexusUrl>${nexusproxy}</nexusUrl>
+						<stagingProfileId>176c31dfe190a</stagingProfileId>
+						<serverId>ecomp-staging</serverId>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.jacoco</groupId>
+					<artifactId>jacoco-maven-plugin</artifactId>
+					<version>${jacoco.version}</version>
+					<configuration>
+						<excludes>
+							<exclude>**/gen/**</exclude>
+							<exclude>**/generated-sources/**</exclude>
+							<exclude>**/yang-gen/**</exclude>
+							<exclude>**/pax/**</exclude>
+						</excludes>
+					</configuration>
+					<executions>
+						<execution>
+							<id>pre-unit-test</id>
+							<goals>
+								<goal>prepare-agent</goal>
+							</goals>
+							<configuration>
+								<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+								<propertyName>surefireArgLine</propertyName>
+							</configuration>
+						</execution>
+						<execution>
+							<id>post-unit-test</id>
+							<phase>test</phase>
+							<goals>
+								<goal>report</goal>
+							</goals>
+							<configuration>
+								<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+								<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+							</configuration>
+						</execution>
+						<execution>
+							<id>pre-integration-test</id>
+							<phase>pre-integration-test</phase>
+							<goals>
+								<goal>prepare-agent</goal>
+							</goals>
+							<configuration>
+								<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+								<propertyName>failsafeArgLine</propertyName>
+							</configuration>
+						</execution>
+						<execution>
+							<id>post-integration-test</id>
+							<phase>post-integration-test</phase>
+							<goals>
+								<goal>report</goal>
+							</goals>
+							<configuration>
+								<dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+								<outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
 			</plugins>
-		</pluginManagement>			
+		</pluginManagement>
 	</build>
 
-
 	<distributionManagement>
 		<repository>
 			<id>ecomp-releases</id>
@@ -470,5 +340,5 @@
 			<url>dav:${nexusproxy}${sitePath}</url>
 		</site>
 	</distributionManagement>
-	
+
 </project>