Fix the SO build issues

Fix the AAI java package names that was still openecomp,
remove the variable for LF repositories due to Oparent, Fix the
jacoco to overwrite the oparent settings (fix test coverage)

Change-Id: I40b9b326e33ff27992a1bf2cc9d3094d338f8828
Issue-ID: SO-168
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

6 files changed, 125 insertions, 162 deletions

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIRestClient.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIRestClient.java
index 725a289be0..ca815cf904 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIRestClient.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIRestClient.java
@@ -23,9 +23,9 @@ import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
 
-import org.openecomp.aai.domain.yang.GenericVnf;
-import org.openecomp.aai.domain.yang.Pserver;
-import org.openecomp.aai.domain.yang.Pservers;
+import org.onap.aai.domain.yang.GenericVnf;
+import org.onap.aai.domain.yang.Pserver;
+import org.onap.aai.domain.yang.Pservers;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIRestClientImpl.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIRestClientImpl.java
index 6b7b1692b2..c58f22f949 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIRestClientImpl.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIRestClientImpl.java
@@ -35,10 +35,10 @@ import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 
-import org.openecomp.aai.domain.yang.GenericVnf;
-import org.openecomp.aai.domain.yang.GenericVnfs;
-import org.openecomp.aai.domain.yang.Pserver;
-import org.openecomp.aai.domain.yang.Pservers;
+import org.onap.aai.domain.yang.GenericVnf;
+import org.onap.aai.domain.yang.GenericVnfs;
+import org.onap.aai.domain.yang.Pserver;
+import org.onap.aai.domain.yang.Pservers;
 import org.openecomp.mso.bpmn.core.PropertyConfiguration;
 import org.openecomp.mso.client.aai.entities.CustomQuery;
 import org.openecomp.mso.client.aai.entities.Results;
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIValidatorImpl.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIValidatorImpl.java
index 724b2d378a..ce248f010c 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIValidatorImpl.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIValidatorImpl.java
@@ -23,8 +23,8 @@ package org.openecomp.mso.client.aai;
 import java.io.IOException;
 import java.util.List;
 
-import org.openecomp.aai.domain.yang.GenericVnf;
-import org.openecomp.aai.domain.yang.Pserver;
+import org.onap.aai.domain.yang.GenericVnf;
+import org.onap.aai.domain.yang.Pserver;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/aai/AAIPServerTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/aai/AAIPServerTest.java
index 0a8660fcee..bee0a828ea 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/aai/AAIPServerTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/aai/AAIPServerTest.java
@@ -29,7 +29,7 @@ import java.util.UUID;
 import org.junit.BeforeClass;

 import org.junit.Ignore;

 import org.junit.Test;

-import org.openecomp.aai.domain.yang.Pserver;

+import org.onap.aai.domain.yang.Pserver;

 import static org.junit.Assert.assertEquals;

 import com.fasterxml.jackson.core.JsonParseException;

 import com.fasterxml.jackson.databind.JsonMappingException;

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/aai/AAIValidatorTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/aai/AAIValidatorTest.java
index 9c657f800b..2272f31685 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/aai/AAIValidatorTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/aai/AAIValidatorTest.java
@@ -33,8 +33,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
-import org.openecomp.aai.domain.yang.GenericVnf;
-import org.openecomp.aai.domain.yang.Pserver;
+import org.onap.aai.domain.yang.GenericVnf;
+import org.onap.aai.domain.yang.Pserver;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
diff --git a/bpmn/pom.xml b/bpmn/pom.xml
index ebaa5c4860..98628d9030 100644
--- a/bpmn/pom.xml
+++ b/bpmn/pom.xml
@@ -1,157 +1,120 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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>
+<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.openecomp.so</groupId>
-		<artifactId>so</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
-	</parent>
+  <parent>
+    <groupId>org.openecomp.so</groupId>
+    <artifactId>so</artifactId>
+    <version>1.1.0-SNAPSHOT</version>
+  </parent>
 
-	<groupId>org.openecomp.so</groupId>
-	<artifactId>bpmn</artifactId>
-	<name>BPMN Subsystem</name>
-	<description>BPMN Subsystem for MSO</description>
-	<packaging>pom</packaging>
-	
-	<properties>
-		<camunda.version>7.7.0</camunda.version>
-		<camunda.bpm.assert.version>1.2</camunda.bpm.assert.version>
-		<h2.version>1.3.173</h2.version>
-		<groovy.version>2.4.7</groovy.version>
-		<saxon.version>9.5.1-8</saxon.version>
-		<xmlunit.version>1.6</xmlunit.version>
-		
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		
-	</properties>
+  <groupId>org.openecomp.so</groupId>
+  <artifactId>bpmn</artifactId>
+  <name>BPMN Subsystem</name>
+  <description>BPMN Subsystem for MSO</description>
+  <packaging>pom</packaging>
 
-	<modules>
-		<module>MSOCoreBPMN</module>
-		<module>MSOMockServer</module>
-		<module>MSORESTClient</module>
-    	<module>MSOCommonBPMN</module>
-		<module>MSOInfrastructureBPMN</module>
-		<module>MSOURN-plugin</module>
-		<module>MSOCockpit</module>
+  <properties>
+    <camunda.version>7.7.0</camunda.version>
+    <camunda.bpm.assert.version>1.2</camunda.bpm.assert.version>
+    <h2.version>1.3.173</h2.version>
+    <groovy.version>2.4.7</groovy.version>
+    <saxon.version>9.5.1-8</saxon.version>
+    <xmlunit.version>1.6</xmlunit.version>
+
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+  </properties>
+
+  <modules>
+    <module>MSOCoreBPMN</module>
+    <module>MSOMockServer</module>
+    <module>MSORESTClient</module>
+    <module>MSOCommonBPMN</module>
+    <module>MSOInfrastructureBPMN</module>
+    <module>MSOURN-plugin</module>
+    <module>MSOCockpit</module>
   </modules>
-	
-	<!-- Define artifact versions for child modules -->
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.camunda.bpm</groupId>
-				<artifactId>camunda-bom</artifactId>
-				<version>${camunda.version}</version>
-				<scope>import</scope>
-				<type>pom</type>
-			</dependency>
-			<dependency>
-				<groupId>org.camunda.bpm.extension</groupId>
-				<artifactId>camunda-bpm-assert</artifactId>
-				<version>${camunda.bpm.assert.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.h2database</groupId>
-				<artifactId>h2</artifactId>
-				<version>${h2.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.codehaus.groovy</groupId>
-				<artifactId>groovy-all</artifactId>
-				<version>${groovy.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>net.sf.saxon</groupId>
-				<artifactId>Saxon-HE</artifactId>
-				<version>${saxon.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>xmlunit</groupId>
-				<artifactId>xmlunit</artifactId>
-				<version>${xmlunit.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>javax.activation</groupId>
-				<artifactId>activation</artifactId>
-				<version>1.1.1</version>
-				<scope>compile</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-beans</artifactId>
-				<version>3.2.4.RELEASE</version>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-	
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpcore</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-		</dependency>
-	</dependencies>
-	
-	<build>
-	<plugins>
-	
-		<plugin>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-surefire-plugin</artifactId>
-			<version>2.17</version>
-			<configuration>
-				<testFailureIgnore>false</testFailureIgnore>
-				<argLine>-Xss1m @{argLine}</argLine>
-				<properties>
-                </properties>
-			</configuration>
-			
-<!-- 			<configuration>
-				<testFailureIgnore>true</testFailureIgnore>
-				<forkCount>1</forkCount>
-				<forkMode>once</forkMode>
-			</configuration> -->
-		</plugin>
 
-	</plugins>
-	<pluginManagement>
-		<plugins>
-			<!--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>
-				<artifactId>lifecycle-mapping</artifactId>
-				<version>1.0.0</version>
-				<configuration>
-					<lifecycleMappingMetadata>
-						<pluginExecutions>
-							<pluginExecution>
-								<pluginExecutionFilter>
-									<groupId>org.jacoco</groupId>
-									<artifactId>
-										jacoco-maven-plugin
-									</artifactId>
-									<versionRange>
-										[0.7.1.201405082137,)
-									</versionRange>
-									<goals>
-										<goal>prepare-agent</goal>
-									</goals>
-								</pluginExecutionFilter>
-								<action>
-									<ignore></ignore>
-								</action>
-							</pluginExecution>
-						</pluginExecutions>
-					</lifecycleMappingMetadata>
-				</configuration>
-			</plugin>
-		
-		</plugins>
-	</pluginManagement>
-	</build>
+  <!-- Define artifact versions for child modules -->
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.camunda.bpm</groupId>
+        <artifactId>camunda-bom</artifactId>
+        <version>${camunda.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+      <dependency>
+        <groupId>org.camunda.bpm.extension</groupId>
+        <artifactId>camunda-bpm-assert</artifactId>
+        <version>${camunda.bpm.assert.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.h2database</groupId>
+        <artifactId>h2</artifactId>
+        <version>${h2.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.groovy</groupId>
+        <artifactId>groovy-all</artifactId>
+        <version>${groovy.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>net.sf.saxon</groupId>
+        <artifactId>Saxon-HE</artifactId>
+        <version>${saxon.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>xmlunit</groupId>
+        <artifactId>xmlunit</artifactId>
+        <version>${xmlunit.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.activation</groupId>
+        <artifactId>activation</artifactId>
+        <version>1.1.1</version>
+        <scope>compile</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-beans</artifactId>
+        <version>3.2.4.RELEASE</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpcore</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.17</version>
+        <configuration>
+          <testFailureIgnore>false</testFailureIgnore>
+          <argLine>-Xss1m</argLine>
+          <forkCount>1</forkCount>
+          <forkMode>once</forkMode>
+          <properties>
+          </properties>
+        </configuration>
+      </plugin>
+
+    </plugins>
+  </build>
 </project>