diff options
| author |   Jim Hahn <jrh3@att.com> | 2020-09-11 15:18:51 -0400 |
|---|---|---|
| committer | Jim Hahn <jrh3@att.com> | 2020-09-11 18:07:57 -0400 |
| commit | d2c75de1b5f62fb05fefa7fa6cfd108f959a94ed (patch) | |
| tree | 6a0db4e4ae341adc7ce8dae6f6e7c043d738a6ea | |
| parent | f476f3616b0d48ef346498d52b6faa03e1ad312d (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>
| -rw-r--r-- | policy-management/src/main/server-gen/bin/deploy-artifact | 1 |
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 |