addressing review comments

Author: mattbsox

boost-gradle/src/main/groovy/io/openliberty/boost/gradle/tasks/BoostPackageTask.groovy

@@ -194,22 +194,22 @@ public class BoostPackageTask extends AbstractBoostTask {
     }
 
     protected void generateServerConfigEE() throws GradleException {
-        String warName = null
+        List<String> warNames = new ArrayList<String>()
 
         if (project.plugins.hasPlugin('war')) {
 
             if (project.war.version == null) {
-                warName = project.war.baseName
+                warNames.add(project.war.baseName)
             } else {
-                warName = project.war.baseName + "-" + project.war.version
+                warNames.add(project.war.baseName + "-" + project.war.version)
             }
         } else {
-            warName = getWarNameFromBoostApps()
+            warNames = getWarNameFromBoostApps()
         }
 
         try {
 
-            BoosterConfigurator.generateLibertyServerConfig(libertyServerPath, boosterPackConfigurators, warName, BoostLogger.getInstance());
+            BoosterConfigurator.generateLibertyServerConfig(libertyServerPath, boosterPackConfigurators, warNames, BoostLogger.getInstance());
 
         } catch (Exception e) {
             throw new GradleException("Unable to generate server configuration for the Liberty server.", e);
@@ -300,12 +300,13 @@ public class BoostPackageTask extends AbstractBoostTask {
     }
 
     //Runs through the dependencies in the boostApp configuration and pulls out the first war name.
-    protected String getWarNameFromBoostApps() {
+    protected List<String> getWarNameFromBoostApps() {
+        List<String> warNames = new ArrayList<String>()
         for (def dep : project.configurations.boostApp) {
             if (FilenameUtils.getExtension(dep.name).equals('war')) {
-                return dep.name.substring(0, dep.name.length() - 4)
+                warNames.add(dep.name.substring(0, dep.name.length() - 4))
             }
         }
-        return null
+        return warNames
     }
 }

boost-gradle/src/main/groovy/io/openliberty/boost/gradle/utils/GradleProjectUtil.groovy

@@ -61,18 +61,21 @@ public class GradleProjectUtil {
         }
 
         //Will always have the boostApp configuration since we create it in apply()
-        dependencies.putAll(getAllDependenciesFromConfiguration(project.configurations.boostApp, logger))
+        //Just pulling in the transitive booster dependencies for the apps
+        dependencies.putAll(getAllBoosterDependenciesFromConfiguration(project.configurations.boostApp, logger))
 
         return dependencies
     }
 
-    public static Map<String, String> getAllDependenciesFromConfiguration(Configuration configuration, BoostLogger logger) {
+    private static Map<String, String> getAllBoosterDependenciesFromConfiguration(Configuration configuration, BoostLogger logger) {
         Map<String, String> dependencies = new HashMap<String, String>()
         configuration.resolvedConfiguration.resolvedArtifacts.collect { it.moduleVersion.id }.each { ModuleVersionIdentifier id ->
         	logger.debug("Found dependency while processing project: " + id.group.toString() + ":"
                     + id.name.toString() + ":" + id.version.toString())
 
-            dependencies.put(id.group.toString() + ":" + id.name.toString(), id.version.toString())
+            if (id.group.toString().equals('io.openliberty.boosters')) {
+                dependencies.put(id.group.toString() + ":" + id.name.toString(), id.version.toString())
+            }
         }
         return dependencies
     }

boost-gradle/src/test/resources/devReleaseApp/dev/build.gradle

@@ -35,16 +35,16 @@ targetCompatibility = 1.8
 
 dependencyManagement {
     imports {
-          mavenBom "io.openliberty.boosters:ee8-bom:${boosterVersion}"
+        mavenBom "io.openliberty.boosters:ee8-bom:${boosterVersion}"
     }
 }
 
 dependencies {
-	compile "io.openliberty.boosters:jaxrs"
-	compile "io.openliberty.boosters:jdbc"
-	compile("org.apache.httpcomponents:httpclient:4.5.6")
+    compile "io.openliberty.boosters:jaxrs"
+    compile "io.openliberty.boosters:jdbc"
+    compile("org.apache.httpcomponents:httpclient:4.5.6")
     compile("org.apache.httpcomponents:httpcore:4.4.10")
     compile "javax.servlet:javax.servlet-api:4.0.0"
 
-    libertyRuntime "io.openliberty:openliberty-runtime:18.0.0.4"
+    libertyRuntime "$runtimeGroup:$runtimeArtifactId:$runtimeVersion"
 }