diff --git a/liberty-maven-plugin/pom.xml b/liberty-maven-plugin/pom.xml index 0947fa0f3..c6c919883 100644 --- a/liberty-maven-plugin/pom.xml +++ b/liberty-maven-plugin/pom.xml @@ -182,7 +182,7 @@ true -Dfile.encoding=UTF-8 - + cleanTest diff --git a/liberty-maven-plugin/src/it/server-config-props-it/src/test/java/net/wasdev/wlp/test/servlet/it/ServerConfigPropertiesTest.java b/liberty-maven-plugin/src/it/server-config-props-it/src/test/java/net/wasdev/wlp/test/servlet/it/ServerConfigPropertiesTest.java index df1c49f0b..7400b82ca 100644 --- a/liberty-maven-plugin/src/it/server-config-props-it/src/test/java/net/wasdev/wlp/test/servlet/it/ServerConfigPropertiesTest.java +++ b/liberty-maven-plugin/src/it/server-config-props-it/src/test/java/net/wasdev/wlp/test/servlet/it/ServerConfigPropertiesTest.java @@ -130,7 +130,7 @@ public void checkMessagesLogForIncludes() throws Exception { //Check app name/appsDir resolved correctly during create, deploy, and start Assert.assertTrue("Found duplicate application message in console output", duplicateMatches.size() == 0); - Assert.assertEquals("appsDirMessage size: " + appDirMatches.size(), 3, appDirMatches.size()); // once for each goal + Assert.assertEquals("appsDirMessage size: " + appDirMatches.size(), 3, appDirMatches.size()); // once for each goal - create, deploy and start Assert.assertTrue("Did not find app install message in console output", appInstalledMatches.size() == 1); String appMessage = appInstalledMatches.get(0); diff --git a/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/DevMojo.java b/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/DevMojo.java index 45e5a15d4..3e958ce8e 100644 --- a/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/DevMojo.java +++ b/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/DevMojo.java @@ -1992,7 +1992,12 @@ protected void runLibertyMojoCreate() throws MojoExecutionException { if (installDirectory != null) { try { File installDirectoryCanonicalFile = installDirectory.getCanonicalFile(); - // Quick check to see if a Liberty installation exists at the installDirectory + // Quick check to see if a Liberty installation exists at the installDirectory CLK999 + // Do not mark this as a non-new installation if the installDirectory is different than + // the previous one listed in liberty-plugin-config.xml? But the only way it already exists + // and is different is if it is an external installation, which should then be managed outside + // of the plugin goals as far as feature installation goes. So perhaps we leave it be, but + // print a log message to indicate we detected a change in install directory location? File file = new File(installDirectoryCanonicalFile, "lib/ws-launch.jar"); if (file.exists()) { this.isNewInstallation = false; diff --git a/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/PluginConfigSupport.java b/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/PluginConfigSupport.java index f20666fd3..4471d4cf8 100644 --- a/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/PluginConfigSupport.java +++ b/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/PluginConfigSupport.java @@ -99,6 +99,8 @@ protected String getDeployPackages() { } /** + * Overriding this method to add the export of the parameters to the xml file. This method will get called for the + * following goals: create, deploy, run and dev * @throws IOException * @throws MojoExecutionException */