From: ying.yunlong <ying.yunlong@zte.com.cn>
Date: Fri, 2 Mar 2018 08:10:37 +0000 (+0800)
Subject: Fix vfc-vnfmgr sonar job failure
X-Git-Tag: v1.1.0~14
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=53074686f083ca91043acb16cb04fd9d115099c5;p=vfc%2Fgvnfm%2Fvnfmgr.git

Fix vfc-vnfmgr sonar job failure

Change-Id: Ib91b65bf609a2d5b6b4526e3ec7f0637746768b7
Issue-ID: VFC-786
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
---

diff --git a/mgr/pom.xml b/mgr/pom.xml
index 2f60d0f..6675296 100644
--- a/mgr/pom.xml
+++ b/mgr/pom.xml
@@ -25,89 +25,6 @@
     <artifactId>vfc-gvnfm-vnfmgr-mgr</artifactId>
     <version>1.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>vfc/gvnfm/vnfmgr/mgr</name>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <sonar.sources>.</sonar.sources>
-        <sonar.junit.reportsPath>xunit-results.xml</sonar.junit.reportsPath>
-        <sonar.python.coverage.reportPath>coverage.xml</sonar.python.coverage.reportPath>
-        <sonar.language>py</sonar.language>
-        <sonar.pluginname>python</sonar.pluginname>
-        <sonar.inclusions>**/**.py</sonar.inclusions>
-        <sonar.exclusions>**/tests/**.py,**/test*.py,**/__init__.py,setup.py</sonar.exclusions>
-    </properties>
+    <name>vfc-gvnfm-vnfmgr-mgr</name>
     <description>vfc gvnfm vnfmgr mgr</description>
-    <build>
-      <pluginManagement>
-        <plugins>
-            <plugin>
-              <groupId>org.codehaus.mojo</groupId>
-              <artifactId>exec-maven-plugin</artifactId>
-              <version>1.2.1</version>
-              <configuration>
-                <executable>${session.executionRootDirectory}/mvn-phase-script.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>
-        <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>
 </project>
diff --git a/pom.xml b/pom.xml
index 9793c19..a3280e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,8 +26,91 @@
     <version>1.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>vfc-gvnfm-vnfmgr</name>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <sonar.sources>.</sonar.sources>
+        <sonar.junit.reportsPath>xunit-results.xml</sonar.junit.reportsPath>
+        <sonar.python.coverage.reportPath>coverage.xml</sonar.python.coverage.reportPath>
+        <sonar.language>py</sonar.language>
+        <sonar.pluginname>python</sonar.pluginname>
+        <sonar.inclusions>**/**.py</sonar.inclusions>
+        <sonar.exclusions>**/tests/**.py,**/test*.py,**/__init__.py,setup.py</sonar.exclusions>
+    </properties>
     <description>vfc gvnfm vnfmgr</description>
     <modules>
         <module>mgr</module>
     </modules>
+    <build>
+      <pluginManagement>
+        <plugins>
+            <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>exec-maven-plugin</artifactId>
+              <version>1.2.1</version>
+              <configuration>
+                <executable>${session.executionRootDirectory}/mvn-phase-script.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>
+        <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>
 </project>