X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=121209ba45379247452e23ce1956d67689d1dda2;hb=refs%2Fheads%2Fcasablanca;hp=0f5792afbd91837f2ed8d6903e9a30ece7c07837;hpb=185a849076f7d604b62d9ee7fd49cacf95657e3c;p=vfc%2Fnfvo%2Fdriver%2Fvnfm%2Fsvnfm.git

diff --git a/pom.xml b/pom.xml
index 0f5792af..121209ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,16 +14,17 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
+<!-- trigger merge -->
 <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">
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>oparent</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId>
   <artifactId>vfc-nfvo-driver-vnfm-svnfm</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.2-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>vfc-nfvo-driver-vnfm-svnfm</name>
   <description>vfc-nfvo-driver-vnfm-svnfm</description>