Merge pull request #1863 from scottkurz/1696-fix

Add ServerStatusUtil check for liberty:deploy
OpenLiberty · Feb 13, 2025 · fddf86e · fddf86e
2 parents 48accde + 519437c
commit fddf86e
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/...maven-plugin/src/main/java/io/openliberty/tools/maven/applications/DeployMojoSupport.java b/...maven-plugin/src/main/java/io/openliberty/tools/maven/applications/DeployMojoSupport.java
@@ -45,6 +45,7 @@
 import io.openliberty.tools.common.plugins.config.LooseConfigData;
 import io.openliberty.tools.common.plugins.util.DevUtil;
 import io.openliberty.tools.common.plugins.util.OSUtil;
+import io.openliberty.tools.common.plugins.util.ServerStatusUtil;
 
 /**
  * Support for installing and deploying applications to a Liberty server.
@@ -301,11 +302,7 @@ protected void installLooseConfigEar(MavenProject proj, LooseConfigData config,
     }
 
     private boolean shouldValidateAppStart() throws MojoExecutionException {
-        try {
-            return new File(serverDirectory.getCanonicalPath()  + "/workarea/.sRunning").exists();
-        } catch (IOException ioe) {
-            throw new MojoExecutionException("Could not get the server directory to determine the state of the server.");
-        }
+        return ServerStatusUtil.isServerRunning(installDirectory, outputDirectory, serverName);
     }
 
     protected void verifyAppStarted(String appFile) throws MojoExecutionException {