From d39c92b143c29c5f5d2a51940bb99785031b7364 Mon Sep 17 00:00:00 2001
From: Ethan Lynn <ethanlynnl@vmware.com>
Date: Wed, 24 Jul 2019 11:19:41 +0800
Subject: Modify pom.xml for docker build

Modify pom.xml for docker build

Change-Id: Ibf469bbf5de1df3412f82ec3ec135813e5c1212c
Issue-ID: MULTICLOUD-706
Signed-off-by: Ethan Lynn <ethanlynnl@vmware.com>
---
 pom.xml     | 77 ++++---------------------------------------------------------
 vio/pom.xml | 60 +++++++++++++++++++++++++++--------------------
 2 files changed, 40 insertions(+), 97 deletions(-)

diff --git a/pom.xml b/pom.xml
index 71536e3..d7fb318 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,80 +21,13 @@
         <version>2.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.onap.multicloud.openstack.vmware</groupId>
-    <artifactId>multicloud-openstack-vmware</artifactId>
+    <groupId>org.onap.multicloud.openstack.vmware.root</groupId>
+    <artifactId>multicloud-openstack-vmware-root</artifactId>
     <version>1.4.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-openstack-vmware</name>
     <description>multicloud openstack vmware</description>
-    <properties>
-        <encoding>UTF-8</encoding>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <nexusproxy>https://nexus.onap.org</nexusproxy>
-
-        <sonar.sourceEncoding>UTF-8</sonar.sourceEncoding>
-        <sonar.sources>.</sonar.sources>
-        <sonar.junit.reportsPath>xunit-results.xml</sonar.junit.reportsPath>
-        <sonar.python.coverage.reportPath>vio/coverage.xml</sonar.python.coverage.reportPath>
-        <sonar.language>py</sonar.language>
-        <sonar.pluginName>Python</sonar.pluginName>
-        <sonar.inclusions>**/*.py</sonar.inclusions>
-        <sonar.exclusions>**/tests/*,setup.py</sonar.exclusions>
-    </properties>
-    <build>
-      <pluginManagement>
-        <plugins>
-            <plugin>
-              <groupId>org.codehaus.mojo</groupId>
-              <artifactId>exec-maven-plugin</artifactId>
-              <version>1.2.1</version>
-              <configuration>
-                <executable>${session.executionRootDirectory}/sonar.sh</executable>
-                <environmentVariables>
-                  <!-- make mvn properties as env for our script -->
-                  <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID>
-                  <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID>
-                  <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION>
-                </environmentVariables>
-              </configuration>
-            </plugin>
-        </plugins>
-      </pluginManagement>
-        <plugins>
-        <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>exec-maven-plugin</artifactId>
-            <version>1.2.1</version>
-            <executions>
-              <execution>
-                <id>clean phase script</id>
-                <phase>clean</phase>
-                <goals>
-                  <goal>exec</goal>
-                </goals>
-                <configuration>
-                  <arguments>
-                    <argument>__</argument>
-                    <argument>clean</argument>
-                  </arguments>
-                </configuration>
-              </execution>
-              <execution>
-                <id>test script</id>
-                <phase>test</phase>
-                <goals>
-                  <goal>exec</goal>
-                </goals>
-                <configuration>
-                  <arguments>
-                    <argument>__</argument>
-                    <argument>test</argument>
-                  </arguments>
-                </configuration>
-              </execution>
-            </executions>
-        </plugin>
-        </plugins>
-    </build>
+    <modules>
+        <module>vio</module>
+    </modules>
 </project>
diff --git a/vio/pom.xml b/vio/pom.xml
index ce9f502..210875f 100644
--- a/vio/pom.xml
+++ b/vio/pom.xml
@@ -12,7 +12,8 @@
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 -->
-<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">
+<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">
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
@@ -30,28 +31,37 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <nexusproxy>https://nexus.onap.org</nexusproxy>
+
+        <sonar.sourceEncoding>UTF-8</sonar.sourceEncoding>
+        <sonar.sources>.</sonar.sources>
+        <sonar.junit.reportsPath>xunit-results.xml</sonar.junit.reportsPath>
+        <sonar.python.coverage.reportPath>vio/coverage.xml</sonar.python.coverage.reportPath>
+        <sonar.language>py</sonar.language>
+        <sonar.pluginName>Python</sonar.pluginName>
+        <sonar.inclusions>**/*.py</sonar.inclusions>
+        <sonar.exclusions>**/tests/*,setup.py</sonar.exclusions>
     </properties>
     <build>
-      <plugins>
-        <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <configuration>
-                <appendAssemblyId>false</appendAssemblyId>
-                <descriptors>
-                    <descriptor>assembly.xml</descriptor>
-                </descriptors>
-            </configuration>
-            <executions>
-                <execution>
-                    <id>make-assembly</id>
-                    <phase>package</phase>
-                    <goals>
-                        <goal>single</goal>
-                    </goals>
-                </execution>
-            </executions>
-        </plugin>
-      </plugins>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <appendAssemblyId>false</appendAssemblyId>
+                    <descriptors>
+                        <descriptor>assembly.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
 
     </build>
     <profiles>
@@ -93,10 +103,10 @@
                                 <configuration>
                                     <target>
                                         <exec executable="docker">
-                                           <arg value="build"/>
-                                           <arg value="-t"/>
-                                           <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/vio:${project.version}"/>
-                                           <arg value="docker_target"/>
+                                            <arg value="build"/>
+                                            <arg value="-t"/>
+                                            <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/vio:${project.version}"/>
+                                            <arg value="docker_target"/>
                                         </exec>
                                         <exec executable="docker">
                                             <arg value="tag"/>
-- 
cgit 1.2.3-korg