reorder in test after default execution id is passed

Signed-off-by: Arun Venmany <[email protected]>
arunvenmany-ibm · Jan 17, 2025 · 1c5bbc6 · 1c5bbc6
1 parent 3b221fa
commit 1c5bbc6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/...gin/src/it/dev-it/src/test/java/net/wasdev/wlp/test/dev/it/MultiModuleUpdatePomsTest.java b/...gin/src/it/dev-it/src/test/java/net/wasdev/wlp/test/dev/it/MultiModuleUpdatePomsTest.java
@@ -47,18 +47,19 @@ public void updatePomsTest() throws Exception {
       // Wait until the last module (ear) finishes compiling during dev mode startup
       // TODO: this can be removed if dev mode does not recompile after first starting up
       verifyLogMessageExists("guide-maven-multimodules-ear tests compilation was successful", 10000);
-      // verify that generated-features.xml file exists
-      File newFeatureFile = getGeneratedFeaturesFile("ear");
-      assertTrue(getLogTail(), verifyFileExists(newFeatureFile, 1000));
-      long newFeatureFileLastModified = newFeatureFile.lastModified();
-      waitLongEnough();
 
       int jarSourceCount = countOccurrences("guide-maven-multimodules-jar source compilation was successful.", logFile);
       int jarTestsCount = countOccurrences("guide-maven-multimodules-jar tests compilation was successful.", logFile);
       int warSourceCount = countOccurrences("guide-maven-multimodules-war source compilation was successful.", logFile);
       int warTestsCount = countOccurrences("guide-maven-multimodules-war tests compilation was successful.", logFile);
       int earTestsCount = countOccurrences("guide-maven-multimodules-ear tests compilation was successful.", logFile);
 
+      // verify that generated-features.xml file exists
+      File newFeatureFile = getGeneratedFeaturesFile("ear");
+      assertTrue(getLogTail(), verifyFileExists(newFeatureFile, 1000));
+      long newFeatureFileLastModified = newFeatureFile.lastModified();
+      waitLongEnough();
+
       touchFileTwice("jar/pom.xml");
 
       // Give time for recompile to occur

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
@@ -2058,6 +2058,7 @@ private void runCompileMojoLogWarningWithException(String goal) throws MojoExecu
         MavenProject tempProject = project;
         Xpp3Dom config = ExecuteMojoUtil.getPluginGoalConfig(plugin, goal, getLog());
         config = Xpp3Dom.mergeXpp3Dom(configuration(element(name("failOnError"), "true")), config);
+        goal = goal + "#" + getExecutionId(goal, plugin);
         getLog().info("Running maven-compiler-plugin:" + goal + " on " + tempProject.getFile());
         getLog().debug("configuration:\n" + config);
         executeMojo(plugin, goal(goal), config, executionEnvironment(tempProject, tempSession, pluginManager));