From: Venkata Harish K Kajur <vk250x@att.com>
Date: Mon, 4 Jun 2018 12:13:17 +0000 (+0000)
Subject: Update the version and aai_keystore
X-Git-Tag: v1.2.2^0
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=de1d0f875d361e30a3fc4754f03d955aae7f4f3f;p=aai%2Fresources.git

Update the version and aai_keystore

Issue-ID: AAI-1204
Change-Id: Ib27ef875118bd139b309735e5b20dabc1ddb410f
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
---

diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml
index eb3a3123..527ea66a 100644
--- a/aai-resources/pom.xml
+++ b/aai-resources/pom.xml
@@ -25,7 +25,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.aai.resources</groupId>
     <artifactId>aai-resources</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
diff --git a/aai-resources/src/main/resources/etc/auth/aai_keystore b/aai-resources/src/main/resources/etc/auth/aai_keystore
index 16d93a7e..83cae952 100644
Binary files a/aai-resources/src/main/resources/etc/auth/aai_keystore and b/aai-resources/src/main/resources/etc/auth/aai_keystore differ
diff --git a/pom.xml b/pom.xml
index 59cea321..029149a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
     <groupId>org.onap.aai.resources</groupId>
     <artifactId>resources</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
     <name>aai-resources</name>
     <packaging>pom</packaging>
     <modules>
diff --git a/version.properties b/version.properties
index dfe0c654..e6fc35ba 100644
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
 
 major_version=1
 minor_version=2
-patch_version=1
+patch_version=2
 
 base_version=${major_version}.${minor_version}.${patch_version}