From: Huabing Zhao <zhaohuabing@gmail.com>
Date: Sat, 29 Jun 2019 03:03:40 +0000 (+0000)
Subject: Merge "Update oparent version"
X-Git-Tag: 1.2.6~18
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=18352a47ee8f6e4fbb499dc1eee20587b1e53439;hp=-c;p=msb%2Fapigateway.git

Merge "Update oparent version"
---

18352a47ee8f6e4fbb499dc1eee20587b1e53439
diff --combined pom.xml
index 8d69605,da25013..b646d31
--- a/pom.xml
+++ b/pom.xml
@@@ -20,11 -20,11 +20,11 @@@
    <parent>
      <groupId>org.onap.oparent</groupId>
      <artifactId>oparent</artifactId>
-     <version>1.2.0</version>
+     <version>2.0.0</version>
    </parent>
    <groupId>org.onap.msb.apigateway</groupId>
    <artifactId>msb-apigateway-parent</artifactId>
 -  <version>1.2.4-SNAPSHOT</version>
 +  <version>1.2.5-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>msb-apigateway</name>
    <properties>