From: Jim Hahn <jrh3@att.com>
Date: Fri, 11 Sep 2020 19:18:51 +0000 (-0400)
Subject: Handle CR in pom property files
X-Git-Tag: 1.7.2~6
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d2c75de1b5f62fb05fefa7fa6cfd108f959a94ed;p=policy%2Fdrools-pdp.git

Handle CR in pom property files

Fixed deploy-artifacts to strip carriage returns from pom.properties
files before attempting to extract variables from them.
Switched to using 'sed' instead of dos2unix.

Issue-ID: POLICY-2823
Change-Id: I1114af13a3262e49b87fb270d5c78cda4de9e5c9
Signed-off-by: Jim Hahn <jrh3@att.com>
---

diff --git a/policy-management/src/main/server-gen/bin/deploy-artifact b/policy-management/src/main/server-gen/bin/deploy-artifact
index b142bcde..b25aaf9c 100644
--- a/policy-management/src/main/server-gen/bin/deploy-artifact
+++ b/policy-management/src/main/server-gen/bin/deploy-artifact
@@ -94,6 +94,7 @@ function init
     if [[ -n ${pomProperties} ]]; then
         jar xf "${jar}" "${pomProperties}"
         WORKING_POM_PROPERTIES=$(realpath ${pomProperties})
+        sed -i 's/\r$//' "${WORKING_POM_PROPERTIES}"
         source "${WORKING_POM_PROPERTIES}"
         echo "${artifact}: sourcing in ${WORKING_POM_PROPERTIES}"
     else