skipping package in boost-gradle if war plugin is present

scottkurz · Feb 6, 2019 · c29826c · c29826c
1 parent 57d38e7
commit c29826c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/boost-gradle/src/main/groovy/io/openliberty/boost/gradle/tasks/BoostPackageTask.groovy b/boost-gradle/src/main/groovy/io/openliberty/boost/gradle/tasks/BoostPackageTask.groovy
@@ -117,8 +117,10 @@ public class BoostPackageTask extends AbstractBoostTask {
                 //installFeature should check the server.xml in the server directory and install the missing feature
                 project.tasks.getByName('libertyPackage').dependsOn 'installApps', 'installFeature'
                 project.tasks.getByName('installApps').mustRunAfter 'installFeature'
-                finalizedBy 'libertyPackage'
                 boostPackage.include = "runnable, minify"
+                 if (!project.plugins.hasPlugin('war')) {
+                    finalizedBy 'libertyPackage'
+                }
             }
 
             //The task will perform this before any other task actions

diff --git a/boost-gradle/src/test/groovy/BoostPackageJaxRS20Test.groovy b/boost-gradle/src/test/groovy/BoostPackageJaxRS20Test.groovy
@@ -59,7 +59,8 @@ public class BoostPackageJaxRS20Test extends AbstractBoostTest {
         assertEquals(SUCCESS, result.task(":boostPackage").getOutcome())
         assertEquals(SUCCESS, result.task(":boostStart").getOutcome())
 
-        assertTrue(new File(testProjectDir, "testWar.jar").exists())
+        //Add back in with packaging option
+        //assertTrue(new File(testProjectDir, "testWar.jar").exists())
     }
 
     @Test

diff --git a/boost-gradle/src/test/groovy/BoostPackageJaxRS21Test.groovy b/boost-gradle/src/test/groovy/BoostPackageJaxRS21Test.groovy
@@ -56,7 +56,8 @@ public class BoostPackageJaxRS21Test extends AbstractBoostTest {
         assertEquals(SUCCESS, result.task(":boostPackage").getOutcome())
         assertEquals(SUCCESS, result.task(":boostStart").getOutcome())
 
-        assertTrue(new File(testProjectDir, "testWar.jar").exists())
+        //Add back in with packaging option
+        //assertTrue(new File(testProjectDir, "testWar.jar").exists())
     }
 
     @Test