Merge "org.onap migration"

diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index 4e87e50..dd0c1ab 100755 (executable)
--- a/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@ -8,7 +8,7 @@
                the Portal team. -->\r
        <groupId>org.onap.vid</groupId>\r
        <artifactId>epsdk-app-onap</artifactId>\r
-       <version>1.1.1-SNAPSHOT</version>\r
+       <version>1.2.1-SNAPSHOT</version>\r
        <packaging>war</packaging>\r
        <name>ECOMP SDK Webapp for OpenSource</name>\r
        <description>ECOMP SDK Web Application for public release</description>\r

diff --git a/epsdk-app-onap/version.properties b/epsdk-app-onap/version.properties
index 04a32de..08f1f93 100644 (file)
--- 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\r
 \r
 major=1\r
-minor=1\r
-patch=1\r
+minor=2\r
+patch=0\r
 \r
 base_version=${major}.${minor}.${patch}\r
 \r

diff --git a/pom.xml b/pom.xml
index 22caa18..e16a599 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
        <properties>\r
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>\r
-               <build.version>1.1.1-SNAPSHOT</build.version>\r
+               <build.version>1.2.1-SNAPSHOT</build.version>\r
                <nexusproxy>https://nexus.onap.org</nexusproxy>\r
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
@@ -238,5 +238,5 @@
                        <scope>test</scope>\r
                </dependency>\r
        </dependencies>\r
-       <version>1.1.0-SNAPSHOT</version>\r
+       <version>1.2.0-SNAPSHOT</version>\r
 </project>\r

diff --git a/version.properties b/version.properties
index 04a32de..146a672 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -3,7 +3,7 @@
 # because they are used in Jenkins, whose plug-in doesn't support\r
 \r
 major=1\r
-minor=1\r
+minor=2\r
 patch=1\r
 \r
 base_version=${major}.${minor}.${patch}\r

diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index aa973b0..dae4798 100755 (executable)
--- a/vid-app-common/pom.xml
+++ b/vid-app-common/pom.xml
@@ -9,7 +9,7 @@
                inherit from a parent maven module. -->\r
        <groupId>org.onap.vid</groupId>\r
        <artifactId>vid-app-common</artifactId>\r
-       <version>1.1.1-SNAPSHOT</version>\r
+       <version>1.2.1-SNAPSHOT</version>\r
        <packaging>war</packaging>\r
        <name>VID Common</name>\r
        <description>VID Common code for opensource version</description>\r

diff --git a/vid-app-common/version.properties b/vid-app-common/version.properties
index 04a32de..146a672 100755 (executable)
--- 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\r
 \r
 major=1\r
-minor=1\r
+minor=2\r
 patch=1\r
 \r
 base_version=${major}.${minor}.${patch}\r