Update versions for next release in DMI

- Updated minor version number (on master) for next release as part of
  creating Jakarta release branch
- Updated default DMI version to point to latest docker image

Issue-ID: CPS-956
Change-Id: I3e1d92fb5719ceaf06dd9afc5fa13859d6437f6b
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 51b1a42..506b9d7 100755 (executable)
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (C) 2021 Nordix Foundation
+# Copyright (C) 2021-2022 Nordix Foundation
 # Modifications Copyright (C) 2021 Bell Canada.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,7 +22,7 @@ version: "3.7"
 services:
   ncmp-dmi-plugin:
     container_name: ncmp-dmi-plugin
-    image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/ncmp-dmi-plugin:${DMI_VERSION:-1.1.1-SNAPSHOT-latest}
+    image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/ncmp-dmi-plugin:${DMI_VERSION:-1.2.0-SNAPSHOT-latest}
     ports:
       - ${DMI_PORT:-8783}:8080
       - ${DMI_MANAGEMENT_PORT:-8787}:8081

diff --git a/pom.xml b/pom.xml
index b6e0f9a..9b3ea9a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
     </organization>
     <groupId>org.onap.cps</groupId>
     <artifactId>ncmp-dmi-plugin</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <name>ncmp-dmi-plugin</name>
     <description>DMI Plugin Service</description>
     <properties>

diff --git a/version.properties b/version.properties
index bca8d9c..da11265 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -1,5 +1,5 @@
 #  ============LICENSE_START=======================================================
-#  Copyright (C) 2021 Nordix Foundation
+#  Copyright (C) 2021-2022 Nordix Foundation
 #  Modifications Copyright (C) 2021 Bell Canada.
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,8 +21,8 @@
 # because they are used in Jenkins, whose plug-in doesn't support this
 
 major=1
-minor=1
-patch=1
+minor=2
+patch=0
 
 base_version=${major}.${minor}.${patch}