From f70a772378b045fbdb15113a2deed9a27c2045d1 Mon Sep 17 00:00:00 2001 From: jjiwooLim Date: Mon, 2 Oct 2023 15:00:45 -0400 Subject: [PATCH] resovle conflict --- .../tools/common/plugins/util/InstallFeatureUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/openliberty/tools/common/plugins/util/InstallFeatureUtil.java b/src/main/java/io/openliberty/tools/common/plugins/util/InstallFeatureUtil.java index 7cc1a3e1..cc415a28 100644 --- a/src/main/java/io/openliberty/tools/common/plugins/util/InstallFeatureUtil.java +++ b/src/main/java/io/openliberty/tools/common/plugins/util/InstallFeatureUtil.java @@ -1150,7 +1150,7 @@ public static String productInfo(File installDirectory, String action) throws Pl } } - private void installFeaturesOnContainer(List features, boolean acceptLicense) throws PluginExecutionException { + private void installFeaturesOnContainer(List features, boolean acceptLicense, VerifyOption verifyOption) throws PluginExecutionException { if (features == null || features.isEmpty()) { debug("Skipping installing features on container " + containerName + " since no features were specified."); return; @@ -1173,7 +1173,7 @@ private void installFeaturesOnContainer(List features, boolean acceptLic featureUtilityCommand += "--verify=" + verifyOption.name(); } - String cmdResult = execDockerCmd(featureUtilityCommand, 600, false); + String cmdResult = execContainerCmd(featureUtilityCommand, 600, false); if (cmdResult.contains(" RC=")) { // This piece of the string is added in execDockerCmd if there is an error if (cmdResult.contains("CWWKF1250I")) { // The features are already installed message