summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhh <jorge.hernandez-herrero@att.com>2019-05-01 23:30:45 -0500
committerjhh <jorge.hernandez-herrero@att.com>2019-05-01 23:30:45 -0500
commit6da702fafb473a08efd112cdc38cef1cfdef2f7a (patch)
tree7213b46cb9bcb048b4e881c435872aa61d62271b
parent0164484fe9a0a70f0cf6da5259046a3e23132308 (diff)
relax check in features for multiversion deps
print a warning instead, and the base install one wins. Change-Id: I666481e270bc03a8a7164e0fa947822d1ac8bbb6 Issue-ID: POLICY-1726 Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
-rw-r--r--policy-management/src/main/server-gen/bin/features7
1 files changed, 4 insertions, 3 deletions
diff --git a/policy-management/src/main/server-gen/bin/features b/policy-management/src/main/server-gen/bin/features
index d9c6eb28..8aa863c4 100644
--- a/policy-management/src/main/server-gen/bin/features
+++ b/policy-management/src/main/server-gen/bin/features
@@ -314,12 +314,13 @@ function enableDepAnalysis ()
continue
fi
- # unadvisable if multiple versions exist
+ # unadvisable if multiple versions exist but the base or
+ # installed one wins.
multiVersionJars=$(ls "${LIB}"/"${depJarName%%-[0-9]*.jar}"-*.jar 2> /dev/null)
if [[ -n "${multiVersionJars}" ]]; then
- echo "error: other version of library ${depJarName} present: ${multiVersionJars}"
- return 2
+ echo "warning: other version of library ${depJarName} present: ${multiVersionJars}"
+ continue
fi
done
}