Merge "Update oparent version" dublin
authorHuabing Zhao <zhaohuabing@gmail.com>
Sat, 29 Jun 2019 03:06:33 +0000 (03:06 +0000)
committerGerrit Code Review <gerrit@onap.org>
Sat, 29 Jun 2019 03:06:33 +0000 (03:06 +0000)
1  2 
example-spring-boot/pom.xml
pom.xml

@@@ -5,7 -5,7 +5,7 @@@
        <parent>
                <groupId>org.onap.oparent</groupId>
                <artifactId>oparent</artifactId>
-               <version>1.2.0</version>
+               <version>2.0.0</version>
      </parent>
  
        <groupId>org.onap.msb.sdk</groupId>
@@@ -30,9 -30,9 +30,9 @@@
                                <version>1.5.6.RELEASE</version>
                                <scope>import</scope>
                                <type>pom</type>
 -                      </dependency>   
 +                      </dependency>
                </dependencies>
 -      </dependencyManagement> 
 +      </dependencyManagement>
  
        <dependencies>
                <dependency>
@@@ -51,8 -51,8 +51,8 @@@
                <dependency>
                        <groupId>org.onap.msb.sdk</groupId>
                        <artifactId>msb-java-sdk</artifactId>
 -                      <version>1.2.0-SNAPSHOT</version>
 -              </dependency>    
 +                      <version>1.2.5-SNAPSHOT</version>
 +              </dependency>
        </dependencies>
  
        <build>
diff --combined pom.xml
+++ b/pom.xml
@@@ -4,12 -4,12 +4,12 @@@
    <parent>
      <groupId>org.onap.oparent</groupId>
      <artifactId>oparent</artifactId>
-     <version>1.2.0</version>
+     <version>2.0.0</version>
    </parent>
    <groupId>org.onap.msb.java-sdk</groupId>
    <artifactId>msb-java-sdk</artifactId>
    <name>msb-java-sdk</name>
 -  <version>1.2.0-SNAPSHOT</version>
 +  <version>1.2.5-SNAPSHOT</version>
    <packaging>jar</packaging>
    <dependencies>
      <dependency>