From 93722f9202d0f487dd1aceb2f40e88dd8f5f128c Mon Sep 17 00:00:00 2001
From: Shadi Haidar <sh1986@att.com>
Date: Thu, 6 Feb 2020 10:48:20 -0500
Subject: Get keyStorePassword from file

Instead of storing actual passsword in config file's keyStorePassword
get the path to the password file from keyStorePassword and create a
new config file with actual password in keyStorePassword then
continue with normal application startup
This also has bug fix for log errors per DCAEGEN2-2086; where logs
dir and files are not getting created due to inventory user not
having permissions to create dir/logs under /opt/logs/

Issue-ID: DCAEGEN2-2017
Issue-ID: DCAEGEN2-2086

Signed-off-by: Shadi Haidar <sh1986@att.com>
Change-Id: I45b5867e9f73b9355c0fa2a0be18cf610291511d
Signed-off-by: Shadi Haidar <sh1986@att.com>
---
 pom.xml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index b1071ec..a25e0a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 ================================================================================
-Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved.
+Copyright (c) 2017-2020 AT&T Intellectual Property. 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.
@@ -29,7 +29,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 
     <groupId>org.onap.dcaegen2.platform</groupId>
     <artifactId>inventory-api</artifactId>
-    <version>3.4.0-SNAPSHOT</version>
+    <version>3.4.1-SNAPSHOT</version>
     <name>dcaegen2-platform-inventory-api</name>
     <!--internal <version>3.0.0</version>-->
 
@@ -198,7 +198,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-
+			<version>19.0</version>	
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
@@ -211,6 +211,11 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
             <version>4.12</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+    		<groupId>org.json</groupId>
+    		<artifactId>json</artifactId>
+    		<version>20131018</version>
+		</dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
@@ -353,6 +358,8 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
                     <runs>
                         <run>addgroup -S inventory</run>
                         <run>adduser -S -G inventory inventory</run>
+                        <run>mkdir -p /opt/logs</run>
+                        <run>chown -R inventory:inventory /opt</run>
                     </runs>
                     <entryPoint>["java", "-jar", "/opt/${project.build.finalName}.jar", "server"]</entryPoint>
                     <resources>
-- 
cgit 1.2.3-korg