From: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
Date: Thu, 31 Aug 2017 16:02:22 +0000 (+0200)
Subject: Restore oparent
X-Git-Tag: 6.0.0~11^2~1031
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=e751aed27dbe17700e3ad17b9602964f9bfaf304;p=policy%2Fclamp.git

Restore oparent

Restore the oparent that has been removed due to local build failure

Change-Id: I4356fe50e9a8adbef6c7df2cc4f97bafbebe4534
Issue-Id: CLAMP-43
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
---

diff --git a/pom.xml b/pom.xml
index 8bcd5ef13..6632806ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,14 +27,14 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.onap.clamp</groupId>
 	<artifactId>clds</artifactId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0</version>
 	<name>ONAP CLAMP</name>
 
-<!-- 	<parent> -->
-<!-- 		<groupId>org.onap.oparent</groupId> -->
-<!-- 		<artifactId>oparent</artifactId> -->
-<!-- 		<version>1.0.0-SNAPSHOT</version> -->
-<!-- 	</parent> -->
+	<parent>
+		<groupId>org.onap.oparent</groupId>
+		<artifactId>oparent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
 
 	<description>
            This project build the ONAP CLAMP JAR that contains AJSC + CLAMP code.
@@ -823,8 +823,8 @@
 			<properties>
 				<skip.staging.artifacts>true</skip.staging.artifacts>
 				<skip.docker.build>false</skip.docker.build>
-				<skip.docker.tag>true</skip.docker.tag>
-				<skip.docker.push>true</skip.docker.push>
+				<skip.docker.tag>false</skip.docker.tag>
+				<skip.docker.push>false</skip.docker.push>
 			</properties>
 		</profile>
 	</profiles>