From 6da702fafb473a08efd112cdc38cef1cfdef2f7a Mon Sep 17 00:00:00 2001 From: jhh Date: Wed, 1 May 2019 23:30:45 -0500 Subject: 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 --- policy-management/src/main/server-gen/bin/features | 7 ++++--- 1 file 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 } -- cgit 1.2.3-korg