Skip to content

Commit

Permalink
resolve feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
jjiwooLim committed Oct 13, 2023
1 parent 6e1e7b1 commit febdb50
Showing 1 changed file with 5 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,8 @@ private File downloadEsaArtifact(String mavenCoordinates) throws PluginExecution
downloadSignature(downloadedEsa, groupId, artifactId, "esa.asc", version);
}catch(PluginExecutionException e) {
if(this.verifyOption == VerifyOption.all) {
//At this point, we don't know if the download failed for the Liberty feature or the user feature.
//Only throw exception for VerifyOption.all.
throw e;
}else {
warn("Signature at coordinates " + mavenCoordinates + " could not be downloaded." + e.getMessage());
Expand Down Expand Up @@ -681,12 +683,9 @@ public void installFeatures(boolean isAcceptLicense, List<String> featuresList)
}

if(featuresToInstall.isEmpty()) {
info("featuresToInstall is empty");
debug("featuresToInstall is empty");
return;
}


info("featuresToInstall is not empty: " + featuresToInstall.toString());

if (containerName != null) {
installFeaturesOnContainer(featuresToInstall, isAcceptLicense, verifyOption);
Expand Down Expand Up @@ -726,10 +725,9 @@ public void installFeatures(boolean isAcceptLicense, List<String> featuresList)
}


info("Installing features: " + featuresToInstall);
debug("Installing features: " + featuresToInstall);
StringBuilder installedFeaturesBuilder = new StringBuilder();
Collection<String> actionReturnResult = new ArrayList<String>();
info("local esa install: " + mapBasedInstallKernel.get("install.local.esa"));
for (File esaFile : artifacts) {
mapBasedInstallKernel.put("license.accept", acceptLicenseMapValue);
mapBasedInstallKernel.put("action.install", esaFile);
Expand Down Expand Up @@ -1170,7 +1168,7 @@ private void installFeaturesOnContainer(List<String> features, boolean acceptLic


if(verifyOption != null) {
featureUtilityCommand += "--verify=" + verifyOption.name();
featureUtilityCommand += " --verify=" + verifyOption.name();
}

String cmdResult = execContainerCmd(featureUtilityCommand, 600, false);
Expand Down

0 comments on commit febdb50

Please sign in to comment.