From 28fe563dc68ba0b85823ab24a191d160c53f27e9 Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dtimoney@att.com>
Date: Thu, 18 Jul 2019 08:17:32 -0400
Subject: Fix dublin build failure

dublin branch builds were failing due to errors in one of the pom.xml files

Change-Id: Ic38025fc9bfecb469bf35121abd0e3122644cbae
Issue-ID: CCSDK-1378
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
---
 ccsdk-app-os/pom.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/ccsdk-app-os/pom.xml b/ccsdk-app-os/pom.xml
index e9c6480..55e9f4f 100644
--- a/ccsdk-app-os/pom.xml
+++ b/ccsdk-app-os/pom.xml
@@ -2,16 +2,14 @@
 <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.onap.ccsdk.dashboard</groupId>
 		<artifactId>ccsdk-app-parent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.1-SNAPSHOT</version>
 	</parent>
-	-->
 	<groupId>org.onap.ccsdk.dashboard</groupId>
 	<artifactId>ccsdk-app-os</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.1.1-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>ONAP Operations Manager Dashboard app</name>
 	<description>CCSDK Dashboard Web Application for external release</description>
@@ -21,7 +19,7 @@
 		<springframework.version>4.3.22.RELEASE</springframework.version>
 		<hibernate.version>4.3.11.Final</hibernate.version>
 		<epsdk.version>2.5.0</epsdk.version>
-		<ccsdk.version>1.1.0-SNAPSHOT</ccsdk.version>
+		<ccsdk.version>${project.version}</ccsdk.version>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
 		<snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>content/repositories/releases/</releaseNexusPath>
-- 
cgit 1.2.3-korg