From: Ofir Sonsino <os0695@att.com>
Date: Wed, 7 Feb 2018 12:17:42 +0000 (+0000)
Subject: Merge "org.onap migration"
X-Git-Tag: v2.0.0~53
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=4218526154d4ecda5b8ea2ca4e9e729672b2103a;hp=94f33fa3abf17d576b9fe43fa2913c4546febaa8;p=vid.git

Merge "org.onap migration"
---

diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index 4e87e50b1..dd0c1ab9d 100755
--- a/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@ -8,7 +8,7 @@
 		the Portal team. -->
 	<groupId>org.onap.vid</groupId>
 	<artifactId>epsdk-app-onap</artifactId>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.2.1-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>ECOMP SDK Webapp for OpenSource</name>
 	<description>ECOMP SDK Web Application for public release</description>
diff --git a/epsdk-app-onap/version.properties b/epsdk-app-onap/version.properties
index 04a32dea2..08f1f93f0 100644
--- a/epsdk-app-onap/version.properties
+++ b/epsdk-app-onap/version.properties
@@ -3,8 +3,8 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 major=1
-minor=1
-patch=1
+minor=2
+patch=0
 
 base_version=${major}.${minor}.${patch}
 
diff --git a/pom.xml b/pom.xml
index 22caa1808..e16a599e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<build.version>1.1.1-SNAPSHOT</build.version>
+		<build.version>1.2.1-SNAPSHOT</build.version>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
@@ -238,5 +238,5 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 </project>
diff --git a/version.properties b/version.properties
index 04a32dea2..146a672fe 100644
--- a/version.properties
+++ b/version.properties
@@ -3,7 +3,7 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 major=1
-minor=1
+minor=2
 patch=1
 
 base_version=${major}.${minor}.${patch}
diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index aa973b05b..dae47987f 100755
--- a/vid-app-common/pom.xml
+++ b/vid-app-common/pom.xml
@@ -9,7 +9,7 @@
 		inherit from a parent maven module. -->
 	<groupId>org.onap.vid</groupId>
 	<artifactId>vid-app-common</artifactId>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.2.1-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>VID Common</name>
 	<description>VID Common code for opensource version</description>
diff --git a/vid-app-common/version.properties b/vid-app-common/version.properties
index 04a32dea2..146a672fe 100755
--- a/vid-app-common/version.properties
+++ b/vid-app-common/version.properties
@@ -3,7 +3,7 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 major=1
-minor=1
+minor=2
 patch=1
 
 base_version=${major}.${minor}.${patch}