Remove defaultVar for applicationMonitor value. Use maven parameter i…

…nstead.
OpenLiberty · Aug 7, 2023 · a9ba3c6 · a9ba3c6
1 parent 318ec1b
commit a9ba3c6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/applications/DeployMojo.java b/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/applications/DeployMojo.java
@@ -37,6 +37,7 @@
 import io.openliberty.tools.common.plugins.config.LooseConfigData;
 import io.openliberty.tools.common.plugins.config.ServerConfigDocument;
 import io.openliberty.tools.common.plugins.util.DevUtil;
+import io.openliberty.tools.common.plugins.util.PluginExecutionException;
 
 /**
  * Copy applications to the specified directory of the Liberty server. 
@@ -59,12 +60,12 @@ public void execute() throws MojoExecutionException {
 
         try {
             doDeploy();
-        } catch (IOException | ParserConfigurationException | TransformerException e) {
+        } catch (IOException | ParserConfigurationException | TransformerException | PluginExecutionException e) {
             throw new MojoExecutionException("Error deploying application.", e);
         }
     }
 
-    private void doDeploy() throws IOException, MojoExecutionException, TransformerException, ParserConfigurationException {
+    private void doDeploy() throws IOException, MojoExecutionException, TransformerException, ParserConfigurationException, PluginExecutionException {
         checkServerHomeExists();
         checkServerDirectoryExists();
 
@@ -95,7 +96,7 @@ private void doDeploy() throws IOException, MojoExecutionException, TransformerE
             default:
                 return;
         }
-              
+
         if (installDependencies) {
             installDependencies();
         }
@@ -109,8 +110,8 @@ private void doDeploy() throws IOException, MojoExecutionException, TransformerE
             applicationXml.writeApplicationXmlDocument(serverDirectory);
         }
 
-        // create applicationMonitor configuartion in configDropins/defaults
-        appMonXml.writeAppMonitorConfigXmlDocument(serverDirectory);
+        // create applicationMonitor configuration in configDropins/defaults
+        appMonXml.writeAppMonitorConfigXmlDocument(serverDirectory, applicationMonitorValue);
     }
 
     private void installSpringBootApp() throws MojoExecutionException, IOException {

diff --git a/...y-maven-plugin/src/main/java/io/openliberty/tools/maven/server/StartDebugMojoSupport.java b/...y-maven-plugin/src/main/java/io/openliberty/tools/maven/server/StartDebugMojoSupport.java
@@ -124,6 +124,9 @@ public abstract class StartDebugMojoSupport extends ServerFeatureSupport {
     @Parameter
     protected List<String> jvmOptions;
 
+    @Parameter(property = "applicationMonitor")
+    protected String applicationMonitorValue;
+
     /**
      * The current plugin's descriptor. This is auto-filled by Maven 3.
      */
@@ -811,7 +814,6 @@ private void loadLibertyConfigFromProperties(Properties props) {
                 }
             }
         }
-        defaultVarMavenProps.put("io.openliberty.tools.update.trigger", "polled");
     }
 
     // The properties parameter comes from the <bootstrapProperties> configuration in pom.xml and takes precedence over