Merge pull request #1732 from cherylking/fixMultiModRestart

Fix for multimod restart server problem
OpenLiberty · Oct 2, 2023 · aa177ff · aa177ff
2 parents fa18b0e + b63f5df
commit aa177ff
Showing 1 changed file with 8 additions and 2 deletions.
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
@@ -288,9 +288,13 @@ protected Plugin getLibertyPluginForProject(MavenProject currentProject) {
         }
         Plugin projectPlugin = currentProject.getPlugin(LIBERTY_MAVEN_PLUGIN_GROUP_ID + ":" + LIBERTY_MAVEN_PLUGIN_ARTIFACT_ID);
         if (projectPlugin == null) {
+            getLog().debug("Did not find liberty-maven-plugin configured in currentProject: "+currentProject.toString());
             projectPlugin = getPluginFromPluginManagement(LIBERTY_MAVEN_PLUGIN_GROUP_ID, LIBERTY_MAVEN_PLUGIN_ARTIFACT_ID, currentProject);
+        } else {
+            getLog().debug("Found liberty-maven-plugin configured in currentProject: "+currentProject.toString());
         }
         if (projectPlugin == null) {
+            getLog().debug("Did not find liberty-maven-plugin in pluginManagement in currentProject: "+currentProject.toString());
             projectPlugin = plugin(LIBERTY_MAVEN_PLUGIN_GROUP_ID, LIBERTY_MAVEN_PLUGIN_ARTIFACT_ID, "LATEST");
         }
         if (version != null) {
@@ -370,8 +374,10 @@ protected void runLibertyMojoGenerateFeatures(Element classFiles, boolean optimi
     private void runLibertyMojo(String goal, Xpp3Dom config) throws MojoExecutionException {
         getLog().info("Running liberty:" + goal);
         getLog().debug("configuration:\n" + config);
-        executeMojo(getLibertyPlugin(), goal(goal), config,
-                executionEnvironment(project, session, pluginManager));
+        getLog().debug("project:\n" + project);
+        MavenSession tempSession = session.clone();
+        tempSession.setCurrentProject(project);
+        executeMojo(getLibertyPlugin(), goal(goal), config, executionEnvironment(project, tempSession, pluginManager));
     }
 
     private void copyDependencies() throws MojoExecutionException, IOException {