Add LifecycleExecutionPlanCalculatorFacade and update usages

Co-authored-by: laeubi <[email protected]>

Author: Copilot

org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenExecutionContext.java

@@ -60,6 +60,7 @@
 import org.apache.maven.lifecycle.internal.LifecycleExecutionPlanCalculator;
 import org.apache.maven.lifecycle.internal.MojoExecutor;
 import org.apache.maven.plugin.BuildPluginManager;
+import org.eclipse.m2e.internal.maven.compat.LifecycleExecutionPlanCalculatorFacade;
 import org.apache.maven.plugin.LegacySupport;
 import org.apache.maven.plugin.MojoExecution;
 import org.apache.maven.project.DefaultProjectBuildingRequest;
@@ -395,7 +396,8 @@ private static void executeMojo(MavenSession session, MojoExecution execution, I
     MojoExecution clone = cloneMojoExecution(execution);
     try {
       MavenProject currentProject = session.getCurrentProject();
-      LifecycleExecutionPlanCalculator executionPlanCalculator = lookup.lookup(LifecycleExecutionPlanCalculator.class);
+      LifecycleExecutionPlanCalculatorFacade executionPlanCalculator = new LifecycleExecutionPlanCalculatorFacade(
+          lookup.lookup(LifecycleExecutionPlanCalculator.class));
       executionPlanCalculator.setupMojoExecution(session, currentProject, clone);
       MojoExecutor mojoExecutor = lookup.lookup(MojoExecutor.class);
       DependencyContext dependencyContext = mojoExecutor.newDependencyContext(session, List.of(clone));

org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenImpl.java

@@ -85,6 +85,7 @@
 import org.apache.maven.lifecycle.MavenExecutionPlan;
 import org.apache.maven.lifecycle.internal.LifecycleExecutionPlanCalculator;
 import org.apache.maven.model.ConfigurationContainer;
+import org.eclipse.m2e.internal.maven.compat.LifecycleExecutionPlanCalculatorFacade;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.Profile;
@@ -238,7 +239,8 @@ private MojoExecution setupMojoExecution(MavenSession session, MavenProject proj
       clone.setConfiguration(new Xpp3Dom(execution.getConfiguration()));
     }
     clone.setLifecyclePhase(execution.getLifecyclePhase());
-    LifecycleExecutionPlanCalculator executionPlanCalculator = lookup(LifecycleExecutionPlanCalculator.class);
+    LifecycleExecutionPlanCalculatorFacade executionPlanCalculator = new LifecycleExecutionPlanCalculatorFacade(
+        lookup(LifecycleExecutionPlanCalculator.class));
     try {
       executionPlanCalculator.setupMojoExecution(session, project, clone);
     } catch(Exception ex) {

org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/MavenProjectFacade.java

@@ -47,6 +47,7 @@
 import org.apache.maven.project.MavenProject;
 
 import org.eclipse.m2e.core.embedder.ArtifactKey;
+import org.eclipse.m2e.internal.maven.compat.LifecycleExecutionPlanCalculatorFacade;
 import org.eclipse.m2e.core.embedder.ArtifactRef;
 import org.eclipse.m2e.core.embedder.ArtifactRepositoryRef;
 import org.eclipse.m2e.core.embedder.IComponentLookup;
@@ -541,8 +542,8 @@ private MojoExecution setupMojoExecution(MojoExecution mojoExecution, IProgressM
     }
     clone.setLifecyclePhase(mojoExecution.getLifecyclePhase());
     createExecutionContext().execute(mavenProject, (ctx, mon) -> {
-      LifecycleExecutionPlanCalculator executionPlanCalculator = ctx.getComponentLookup()
-          .lookup(LifecycleExecutionPlanCalculator.class);
+      LifecycleExecutionPlanCalculatorFacade executionPlanCalculator = new LifecycleExecutionPlanCalculatorFacade(
+          ctx.getComponentLookup().lookup(LifecycleExecutionPlanCalculator.class));
       try {
         executionPlanCalculator.setupMojoExecution(ctx.getSession(), mavenProject, clone);
       } catch(Exception ex) {

org.eclipse.m2e.maven.runtime/src/main/java/org/eclipse/m2e/internal/maven/compat/LifecycleExecutionPlanCalculatorFacade.java

@@ -0,0 +1,45 @@
+/********************************************************************************
+ * Copyright (c) 2025 Christoph Läubrich and others
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *   Christoph Läubrich - initial API and implementation
+ ********************************************************************************/
+
+package org.eclipse.m2e.internal.maven.compat;
+
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.lifecycle.internal.LifecycleExecutionPlanCalculator;
+import org.apache.maven.plugin.MojoExecution;
+import org.apache.maven.project.MavenProject;
+
+/**
+ * Facade for {@link LifecycleExecutionPlanCalculator} to avoid direct usage that might change in Maven 4.
+ * This facade wraps the calculator and provides delegate methods for the functionality m2e actually uses.
+ */
+public class LifecycleExecutionPlanCalculatorFacade {
+
+  private final LifecycleExecutionPlanCalculator delegate;
+
+  public LifecycleExecutionPlanCalculatorFacade(LifecycleExecutionPlanCalculator delegate) {
+    this.delegate = delegate;
+  }
+
+  /**
+   * Sets up the MojoExecution with its configuration from the project's POM.
+   * 
+   * @param session the Maven session
+   * @param project the Maven project
+   * @param mojoExecution the mojo execution to setup
+   * @throws Exception if setup fails
+   */
+  public void setupMojoExecution(MavenSession session, MavenProject project, MojoExecution mojoExecution)
+      throws Exception {
+    delegate.setupMojoExecution(session, project, mojoExecution);
+  }
+}