Changes based on PR code review

openmrs · Sep 23, 2024 · c5e8d41 · c5e8d41
1 parent 8ddadf5
commit c5e8d41
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/maven-plugin/src/main/java/org/openmrs/maven/plugins/BuildDistro.java b/maven-plugin/src/main/java/org/openmrs/maven/plugins/BuildDistro.java
@@ -294,17 +294,15 @@ private String buildDistro(File targetDirectory, Artifact distroArtifact, Distro
 
 				File owasDir = new File(tempDir, "bundledOwas");
 				owasDir.mkdir();
-				downloadOWAs(targetDirectory, distroProperties, owasDir);	
-				//downloadAndMoveContentBackendConfig(targetDirectory, distroProperties);
-				spaInstaller.installFromDistroProperties(tempDir, distroProperties, ignorePeerDependencies, overrideReuseNodeCache);				
+				downloadOWAs(targetDirectory, distroProperties, owasDir);
+				spaInstaller.installFromDistroProperties(tempDir, distroProperties, ignorePeerDependencies, overrideReuseNodeCache);
 				File frontendDir = new File(tempDir, "frontend");
 				if(frontendDir.exists()) {
 					frontendDir.renameTo(new File(tempDir, "bundledFrontend"));
 				}
 
 				warfile.addFolder(tempDir, new ZipParameters());
 				try {
-					//ContentHelper.deleteTempContentFolder(targetDirectory);
 					FileUtils.deleteDirectory(tempDir);
 				}
 				catch (IOException e) {
@@ -325,7 +323,7 @@ private String buildDistro(File targetDirectory, Artifact distroArtifact, Distro
 
 			File configDir = new File(web, SDKConstants.OPENMRS_SERVER_CONFIGURATION);
 			configDir.mkdir();
-			setConfigFolder(configDir, distroProperties, distroArtifact);			
+			setConfigFolder(configDir, distroProperties, distroArtifact);
 			ContentHelper.downloadAndMoveContentBackendConfig(web, distroProperties, moduleInstaller, wizard);
 			spaInstaller.installFromDistroProperties(web, distroProperties, ignorePeerDependencies, overrideReuseNodeCache);
 
@@ -621,5 +619,6 @@ public boolean accept(File dir, String name) {
 				throw new MojoExecutionException("Distro should contain only single war file");
 			}
 		}
-	}	
+	}
+
 }