From: Gary Wu <gary.i.wu@huawei.com>
Date: Thu, 7 Jun 2018 21:14:07 +0000 (-0700)
Subject: Bump oparent master to 1.2.0-SNAPSHOT
X-Git-Tag: 1.2.0~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oparent.git;a=commitdiff_plain;h=3299e5ae951bd07a4c9519153a1e0b1de79181fe

Bump oparent master to 1.2.0-SNAPSHOT

Change-Id: Ib0ade741e66762822cfac67fd2f010bec9e66f89
Issue-ID: INT-506
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---

diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml
index 30fa320..485765d 100644
--- a/checkstyle/pom.xml
+++ b/checkstyle/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>version</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>checkstyle</artifactId>
diff --git a/license/pom.xml b/license/pom.xml
index c5a6ebe..7b807f1 100644
--- a/license/pom.xml
+++ b/license/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>version</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>onap-license</artifactId>
diff --git a/oparent-python/pom.xml b/oparent-python/pom.xml
index fe79ab7..c27b48e 100644
--- a/oparent-python/pom.xml
+++ b/oparent-python/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>oparent</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../oparent</relativePath>
   </parent>
   <packaging>pom</packaging>
diff --git a/oparent/pom.xml b/oparent/pom.xml
index 1e3dff1..4a733b2 100644
--- a/oparent/pom.xml
+++ b/oparent/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>version</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>oparent</artifactId>
@@ -459,7 +459,7 @@
           <dependency>
             <groupId>org.onap.oparent</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>1.1.2-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
           </dependency>
         </dependencies>
         <executions>
diff --git a/pom.xml b/pom.xml
index a6c4abb..700e20d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   <name>oparent</name>
   <groupId>org.onap.oparent</groupId>
   <artifactId>version</artifactId>
-  <version>1.1.2-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <modules>
     <!-- oparent tools -->
diff --git a/version.properties b/version.properties
index 855a8c4..9c95207 100644
--- a/version.properties
+++ b/version.properties
@@ -4,8 +4,8 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 major_version=1
-minor_version=1
-patch_version=2
+minor_version=2
+patch_version=0
 
 base_version=${major_version}.${minor_version}.${patch_version}