From 3a3dab8f3d23e10e60ecef0218a584cd8221ae17 Mon Sep 17 00:00:00 2001
From: Ram Krishna Verma <ram_krishna.verma@bell.ca>
Date: Wed, 16 Sep 2020 10:53:17 -0400
Subject: Remove base64 encoding of password from pap

Remove base64 encoding of db password from pap configuration.

Issue-ID: POLICY-2550
Change-Id: I08f25adbe75b9573ed58424d142895eb8353b3f0
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
---
 packages/policy-pap-tarball/src/main/resources/etc/defaultConfig.json  | 2 +-
 pom.xml                                                                | 3 ++-
 .../src/main/resources/papsetup/config/pap/etc/defaultConfig.json      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/policy-pap-tarball/src/main/resources/etc/defaultConfig.json b/packages/policy-pap-tarball/src/main/resources/etc/defaultConfig.json
index e1e06722..f0bee8af 100644
--- a/packages/policy-pap-tarball/src/main/resources/etc/defaultConfig.json
+++ b/packages/policy-pap-tarball/src/main/resources/etc/defaultConfig.json
@@ -25,7 +25,7 @@
         "databaseDriver": "org.mariadb.jdbc.Driver",
         "databaseUrl": "jdbc:mariadb://mariadb:3306/policyadmin",
         "databaseUser": "policy_user",
-        "databasePassword": "cG9saWN5X3VzZXI=",
+        "databasePassword": "policy_user",
         "persistenceUnit": "PolicyMariaDb"
     },
     "topicParameterGroup": {
diff --git a/pom.xml b/pom.xml
index a1c36b8a..a0f841f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,6 +4,7 @@
   ================================================================================
   Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
   Copyright (C) 2019 Nordix Foundation.
+  Modifications Copyright (C) 2020 Bell Canada. All rights reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -41,7 +42,7 @@
 
     <properties>
         <policy.common.version>1.7.1</policy.common.version>
-        <policy.models.version>2.3.1</policy.models.version>
+        <policy.models.version>2.3.2-SNAPSHOT</policy.models.version>
     </properties>
 
     <modules>
diff --git a/testsuites/stability/src/main/resources/papsetup/config/pap/etc/defaultConfig.json b/testsuites/stability/src/main/resources/papsetup/config/pap/etc/defaultConfig.json
index aca21fe7..4af2f5df 100644
--- a/testsuites/stability/src/main/resources/papsetup/config/pap/etc/defaultConfig.json
+++ b/testsuites/stability/src/main/resources/papsetup/config/pap/etc/defaultConfig.json
@@ -25,7 +25,7 @@
         "databaseDriver": "org.mariadb.jdbc.Driver",
         "databaseUrl": "jdbc:mariadb://mariadb:3306/policyadmin",
         "databaseUser": "policy_user",
-        "databasePassword": "cG9saWN5X3VzZXI=",
+        "databasePassword": "policy_user",
         "persistenceUnit": "PolicyMariaDb"
     },
     "topicParameterGroup": {
-- 
cgit 1.2.3-korg