aboutsummaryrefslogtreecommitdiffstats
path: root/policy-management/src/main/server-gen
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2020-09-11 15:18:51 -0400
committerJim Hahn <jrh3@att.com>2020-09-11 18:07:57 -0400
commitd2c75de1b5f62fb05fefa7fa6cfd108f959a94ed (patch)
tree6a0db4e4ae341adc7ce8dae6f6e7c043d738a6ea /policy-management/src/main/server-gen
parentf476f3616b0d48ef346498d52b6faa03e1ad312d (diff)
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>
Diffstat (limited to 'policy-management/src/main/server-gen')
-rw-r--r--policy-management/src/main/server-gen/bin/deploy-artifact1
1 files changed, 1 insertions, 0 deletions
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