From 05ce09b9c8d365af554ea993ad0a7d5a696c053c Mon Sep 17 00:00:00 2001
From: Gary Wu <gary.i.wu@huawei.com>
Date: Wed, 14 Sep 2016 15:54:40 -0700
Subject: [PATCH] Fix build errors in autorelease full clean build

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

Change-Id: I30d4fb6afac5ae7a36f607ddcefc4089444ad5d1
Issue-id: INT-9
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---
 common-util/pom.xml | 4 +---
 pom.xml             | 5 ++---
 rest-client/pom.xml | 3 +--
 winery/pom.xml      | 8 ++++----
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/common-util/pom.xml b/common-util/pom.xml
index e99cfd3..e8ed309 100644
--- a/common-util/pom.xml
+++ b/common-util/pom.xml
@@ -14,8 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
        <groupId>org.openo.common-services.common-utilities</groupId>
@@ -140,4 +139,3 @@
 
 
 </project>
-
diff --git a/pom.xml b/pom.xml
index 298b1d9..c4cb3cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,15 +14,14 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<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/maven-v4_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/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
 	  <groupId>org.openo.oparent</groupId>
 	  <artifactId>oparent</artifactId>
 	  <version>1.0.0-SNAPSHOT</version>
-	  <relativePath></relativePath>
+	  <relativePath>../oparent</relativePath>
 	</parent>
 
 	<groupId>org.openo.common-services.common-utilities</groupId>
diff --git a/rest-client/pom.xml b/rest-client/pom.xml
index 6634b55..a2dfd20 100644
--- a/rest-client/pom.xml
+++ b/rest-client/pom.xml
@@ -14,8 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
        <groupId>org.openo.common-services.common-utilities</groupId>
diff --git a/winery/pom.xml b/winery/pom.xml
index 91ad3c5..3080c10 100644
--- a/winery/pom.xml
+++ b/winery/pom.xml
@@ -17,10 +17,10 @@
 <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.openo.oparent</groupId>
-		<artifactId>oparent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath></relativePath>
+	  <groupId>org.openo.oparent</groupId>
+	  <artifactId>oparent</artifactId>
+	  <version>1.0.0-SNAPSHOT</version>
+	  <relativePath>../../oparent</relativePath>
 	</parent>
 	
 	<groupId>org.eclipse.winery</groupId>
-- 
2.16.6