From 00acf3d39898cc712e8f3fd2afb69f26bc922f61 Mon Sep 17 00:00:00 2001
From: ChrisC <christophe.closset@intl.att.com>
Date: Mon, 22 Mar 2021 13:54:06 +0100
Subject: Update Master to Istambul

Set version 1.9.0 to ensure no clash of dockers when H branch stage jobs are going to produce stage dockers

Issue-ID: SDC-3527
Signed-off-by: ChrisC <christophe.closset@intl.att.com>
Change-Id: I008a90101d89bbd50fae98cc7ce5caae1958059b
---
 .../conflict-rest/conflict-rest-services/pom.xml                        | 2 +-
 .../openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/pom.xml | 2 +-
 openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/pom.xml        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest')

diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/pom.xml
index 544655b62a..ba854132d4 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/pom.xml
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.openecomp.sdc</groupId>
     <artifactId>conflict-rest</artifactId>
-    <version>1.8.4-SNAPSHOT</version>
+    <version>1.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>conflict-rest-services</artifactId>
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/pom.xml
index f361fe3dcc..87541d7677 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/pom.xml
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.openecomp.sdc</groupId>
     <artifactId>conflict-rest</artifactId>
-    <version>1.8.4-SNAPSHOT</version>
+    <version>1.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>conflict-rest-types</artifactId>
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/pom.xml
index c96651ce23..5c0dd367d2 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/pom.xml
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.openecomp.sdc</groupId>
         <artifactId>openecomp-sdc-rest-webapp</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>conflict-rest</artifactId>
-- 
cgit 1.2.3-korg