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

diff --git a/misc/pom.xml b/misc/pom.xml
index e6c955fd..a4945a67 100644
--- a/misc/pom.xml
+++ b/misc/pom.xml
@@ -22,25 +22,18 @@
 <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> -->
+	<parent>
+       <groupId>org.onap.aaf.authz</groupId>
+       <artifactId>parent</artifactId>
+       <version>2.1.1-SNAPSHOT</version>
+    </parent>
 	<groupId>org.onap.aaf.authz</groupId>
 	<artifactId>miscparent</artifactId>
 	<name>AAF Misc Parent</name>
-	<version>2.1.0-SNAPSHOT</version>
+	<version>2.1.1-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> -->
@@ -127,6 +120,13 @@
 		</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 +205,12 @@
 					<artifactId>maven-surefire-plugin</artifactId>
 					<version>2.17</version>
 					<configuration>
+						<skipTests>false</skipTests>
+						<includes>
+							<include>**/JU*.java</include>
+						</includes>
+						<excludes>
+						</excludes>
 					</configuration>
 				</plugin>
 
@@ -270,12 +276,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,12 +319,7 @@
 		</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>