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>
---
 vio/pom.xml | 60 +++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 35 insertions(+), 25 deletions(-)

(limited to 'vio')

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