From: Gary Wu <gary.i.wu@huawei.com>
Date: Wed, 14 Sep 2016 23:00:55 +0000 (-0700)
Subject: Fix build errors in autorelease full clean build
X-Git-Tag: release/sun~54
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=3bbfc4eb4d73011db19eb362bcebdde09124da9c;p=vfc%2Fnfvo%2Fcatalog.git

Fix build errors in autorelease full clean build

Fix build errors found in autorelease during full clean build of all
projects.

Change-Id: I8131b7ca968dc48aa87000837003e69931967830
Issue-id: INT-9
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---

diff --git a/catalog-core/catalog-mgr/pom.xml b/catalog-core/catalog-mgr/pom.xml
index efc1a26e..986c94b0 100644
--- a/catalog-core/catalog-mgr/pom.xml
+++ b/catalog-core/catalog-mgr/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!--
 
     Copyright 2016 [ZTE] and others.
@@ -48,7 +49,7 @@
                                     </goals>
                                 </pluginExecutionFilter>
                                 <action>
-                                    <ignore />
+                                    <ignore/>
                                 </action>
                             </pluginExecution>
                         </pluginExecutions>
diff --git a/catalog-core/distribution/catalog-all/pom.xml b/catalog-core/distribution/catalog-all/pom.xml
index 88c45c4b..341a070d 100644
--- a/catalog-core/distribution/catalog-all/pom.xml
+++ b/catalog-core/distribution/catalog-all/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!--
 
     Copyright 2016 [ZTE] and others.
@@ -105,7 +106,7 @@
                         <configuration>
                             <tasks name="${project.artifactId}">
                                 <zip destfile="target/${packagename}-${project.version}.zip" update="true">
-                                    <zipfileset dir="target/assembly" includes="**" />
+                                    <zipfileset dir="target/assembly" includes="**"/>
                                 </zip>
                             </tasks>
                         </configuration>
@@ -149,4 +150,4 @@
             <type>zip</type>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/catalog-core/distribution/catalog-standalone/pom.xml b/catalog-core/distribution/catalog-standalone/pom.xml
index dc8efdf3..e06a6bc7 100644
--- a/catalog-core/distribution/catalog-standalone/pom.xml
+++ b/catalog-core/distribution/catalog-standalone/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!--
 
     Copyright 2016 [ZTE] and others.
@@ -96,7 +97,7 @@
                         <configuration>
                             <tasks name="${project.artifactId}">
                                 <zip destfile="target/${packagename}-${project.version}.zip" update="true">
-                                    <zipfileset dir="target/assembly" includes="**" />
+                                    <zipfileset dir="target/assembly" includes="**"/>
                                 </zip>
                             </tasks>
                         </configuration>
@@ -135,4 +136,3 @@
         </dependency>
     </dependencies>  
 </project>
-
diff --git a/catalog-core/distribution/pom.xml b/catalog-core/distribution/pom.xml
index 7ac93a9c..6d6d0b02 100644
--- a/catalog-core/distribution/pom.xml
+++ b/catalog-core/distribution/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!--
 
     Copyright 2016 [ZTE] and others.
diff --git a/catalog-core/httpserver/pom.xml b/catalog-core/httpserver/pom.xml
index 93900fd0..a7480987 100644
--- a/catalog-core/httpserver/pom.xml
+++ b/catalog-core/httpserver/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!--
 
     Copyright 2016 [ZTE] and others.
@@ -96,7 +97,7 @@
                             <tasks name="${project.artifactId}">
                                 <copydir src="src/main/assembly/" dest="target/assembly"/>
                                 <zip destfile="target/${packagename}-${project.version}.zip" update="true">
-                                    <zipfileset dir="target/assembly" includes="**" />
+                                    <zipfileset dir="target/assembly" includes="**"/>
                                 </zip>
                             </tasks>
                         </configuration>
@@ -134,4 +135,4 @@
             <type>zip</type>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/catalog-core/pom.xml b/catalog-core/pom.xml
index c602eaf2..28b0bb89 100644
--- a/catalog-core/pom.xml
+++ b/catalog-core/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!--
 
     Copyright 2016 [ZTE] and others.
diff --git a/catalog-parent/catalogparent-lite/pom.xml b/catalog-parent/catalogparent-lite/pom.xml
index d57da778..3cf43712 100644
--- a/catalog-parent/catalogparent-lite/pom.xml
+++ b/catalog-parent/catalogparent-lite/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!--
 
     Copyright 2016 [ZTE] and others.
@@ -20,7 +21,7 @@
         <groupId>org.openo.oparent</groupId>
         <artifactId>oparent</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath></relativePath>
+        <relativePath>../../../oparent</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/catalog-parent/catalogparent/pom.xml b/catalog-parent/catalogparent/pom.xml
index f0bddd82..00801a23 100644
--- a/catalog-parent/catalogparent/pom.xml
+++ b/catalog-parent/catalogparent/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!--
 
     Copyright 2016 [ZTE] and others.
diff --git a/catalog-parent/pom.xml b/catalog-parent/pom.xml
index c1a38903..a857dfa0 100644
--- a/catalog-parent/pom.xml
+++ b/catalog-parent/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!--
 
     Copyright 2016 [ZTE] and others.
diff --git a/pom.xml b/pom.xml
index e1fbb455..89e65c2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!--
 
     Copyright 2016 [ZTE] and others.