X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=misc%2Fpom.xml;h=f16a593ca89a5f0967080edd30dd9224c4ead8e9;hb=c9324c82b4a7d6e2867b2e765f4949ee306045af;hp=e6c955fd80b4b823ff52861c57eaeaf20fc5534d;hpb=a933f226711eb22d680f6a722bfc33c124b53695;p=aaf%2Fauthz.git

diff --git a/misc/pom.xml b/misc/pom.xml
index e6c955fd..f16a593c 100644
--- a/misc/pom.xml
+++ b/misc/pom.xml
@@ -22,47 +22,15 @@
 <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>
-	<!--<parent>
-    <groupId>org.onap.aaf.authz</groupId>
-    <artifactId>parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
-    </parent> -->
-	<groupId>org.onap.aaf.authz</groupId>
+	<parent>
+       <groupId>org.onap.aaf.authz</groupId>
+       <artifactId>parent</artifactId>
+       <version>2.1.11-SNAPSHOT</version>
+    </parent>
 	<artifactId>miscparent</artifactId>
 	<name>AAF Misc Parent</name>
-	<version>2.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
-	
-
-	<parent>
-		<groupId>org.onap.oparent</groupId>
-		<artifactId>oparent</artifactId>
-		<version>1.1.0</version>
-	</parent>
-	
-	<properties>
-	<!--  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>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<powermock.version>1.5.1</powermock.version>
-		<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>
-
-
-
 	<developers>
 		<developer>
 			<name>Jonathan Gathman</name>
@@ -103,30 +71,33 @@
 		<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>
 
+	<modules>
+		<module>env</module>
+		<module>xgen</module>
+		<module>rosetta</module>
+		<module>log4j</module> <!--  note: generates log4j, to avoid Jar conflict -->
+	</modules>
+	
 	<!-- ============================================================== -->
 	<!-- Define common plugins and make them available for all modules -->
 	<!-- ============================================================== -->
@@ -205,6 +176,13 @@
 					<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>
 
@@ -270,12 +248,6 @@
 								<goal>prepare-agent</goal>
 							</goals>
 							<configuration>
-								<skipTests>false</skipTests>
-								<includes>
-									<include>**/JU*.java</include>
-								</includes>
-								<excludes>
-								</excludes>
 								<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
 								<propertyName>surefireArgLine</propertyName>
 							</configuration>
@@ -319,27 +291,6 @@
 		</pluginManagement>
 	</build>
 
-	<modules>
-		<module>env</module>
-		<module>xgen</module>
-		<module>rosetta</module>
-		<module>log4j</module> <!--  note: generates log4j, to avoid Jar conflict -->
-	</modules>
-
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>log4j</groupId>
-				<artifactId>log4j</artifactId>
-				<version>1.2.17</version>
-			</dependency>
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-log4j12</artifactId>
-				<version>1.7.5</version>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
 
 	<distributionManagement>
 		<repository>