[MNG-8244] Fix mojos not bound to "started only" phases

apache · Dec 13, 2024 · 6cbe1c3 · 6cbe1c3
1 parent 7be65f2
commit 6cbe1c3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 25 deletions.
diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java
@@ -411,21 +411,22 @@ public Collection<Phase> phases() {
         public Collection<Phase> v3phases() {
             return List.of(phase(
                     ALL,
-                    phase(VALIDATE),
-                    phase(INITIALIZE),
-                    phase(SOURCES),
-                    phase(RESOURCES),
-                    phase(COMPILE),
-                    phase(READY),
-                    phase(TEST_SOURCES),
-                    phase(TEST_RESOURCES),
-                    phase(TEST_COMPILE),
-                    phase(TEST),
-                    phase(UNIT_TEST),
-                    phase(PACKAGE),
-                    phase(BUILD),
-                    phase(INTEGRATION_TEST),
-                    phase(VERIFY),
+                    phase(VALIDATE,
+                        phase(INITIALIZE)),
+                    phase(
+                        BUILD,
+                        phase(SOURCES),
+                        phase(RESOURCES),
+                        phase(COMPILE),
+                        phase(READY),
+                        phase(TEST_SOURCES),
+                        phase(TEST_RESOURCES),
+                        phase(TEST_COMPILE),
+                        phase(TEST),
+                        phase(UNIT_TEST),
+                        phase(PACKAGE)),
+                    phase(VERIFY,
+                        phase(INTEGRATION_TEST)),
                     phase(INSTALL),
                     phase(DEPLOY)));
         }

diff --git a/...re/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java b/...re/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
@@ -172,7 +172,7 @@ private Map<PhaseId, List<MojoExecution>> getPhaseBindings(
             Map<String, Map<PhaseId, List<MojoExecution>>> mappings, String phase) {
         if (phase != null) {
             PhaseId id = PhaseId.of(phase);
-            return mappings.get(id.phase());
+            return mappings.get(id.executionPoint().prefix() + id.phase());
         }
         return null;
     }

diff --git a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/PhaseComparator.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/PhaseComparator.java
@@ -43,8 +43,8 @@ public PhaseComparator(List<String> lifecyclePhases) {
     public int compare(String o1, String o2) {
         PhaseId p1 = PhaseId.of(o1);
         PhaseId p2 = PhaseId.of(o2);
-        int i1 = lifecyclePhases.indexOf(p1.phase());
-        int i2 = lifecyclePhases.indexOf(p2.phase());
+        int i1 = lifecyclePhases.indexOf(p1.executionPoint().prefix() + p1.phase());
+        int i2 = lifecyclePhases.indexOf(p2.executionPoint().prefix() + p2.phase());
         if (i1 == -1 && i2 == -1) {
             // unknown phases, leave in existing order
             return 0;
@@ -61,13 +61,6 @@ public int compare(String o1, String o2) {
         if (rv != 0) {
             return rv;
         }
-        // same phase, now compare execution points
-        i1 = p1.executionPoint().ordinal();
-        i2 = p2.executionPoint().ordinal();
-        rv = Integer.compare(i1, i2);
-        if (rv != 0) {
-            return rv;
-        }
         // same execution point, now compare priorities
         return Integer.compare(p1.priority(), p2.priority());
     }