Add IPluginFacade and migrate PDEMavenBundlePluginConfigurator off raw

Plugin/MojoExecution

Author: laeubi

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

@@ -21,6 +21,7 @@
 import org.eclipse.m2e.core.internal.embedder.MavenImpl;
 import org.eclipse.m2e.core.project.IMavenProjectFacade;
 import org.eclipse.m2e.core.project.IMojoExecutionFacade;
+import org.eclipse.m2e.core.project.IPluginFacade;
 import org.eclipse.m2e.core.project.configurator.MojoExecutionKey;
 
 
@@ -48,6 +49,11 @@ public MojoExecutionKey getKey() {
     return key;
   }
 
+  @Override
+  public IPluginFacade getPlugin() {
+    return IPluginFacade.wrap(mojoExecution.getPlugin());
+  }
+
   @Override
   public <T> T getMojoParameterValue(String parameter, Class<T> asType, IProgressMonitor monitor)
       throws CoreException {

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

@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2026 Christoph Läubrich and others
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package org.eclipse.m2e.core.internal.project.registry;
+
+import org.apache.maven.model.Plugin;
+
+import org.eclipse.m2e.core.project.IPluginFacade;
+
+
+/**
+ * Default {@link IPluginFacade} implementation simply wrapping a Maven-core {@link Plugin}.
+ */
+public class PluginFacade implements IPluginFacade {
+
+  private final Plugin plugin;
+
+  public PluginFacade(Plugin plugin) {
+    this.plugin = plugin;
+  }
+
+  @Override
+  public String getGroupId() {
+    return plugin.getGroupId();
+  }
+
+  @Override
+  public String getArtifactId() {
+    return plugin.getArtifactId();
+  }
+
+  @Override
+  public String getVersion() {
+    return plugin.getVersion();
+  }
+
+  @Override
+  public String getKey() {
+    return plugin.getKey();
+  }
+
+  @Override
+  public String toString() {
+    return getKey();
+  }
+
+}

org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/IMojoExecutionFacade.java

@@ -36,6 +36,12 @@ public interface IMojoExecutionFacade {
    */
   MojoExecutionKey getKey();
 
+  /**
+   * @return a facade for the plugin that provides the wrapped mojo execution
+   * @since 2.9
+   */
+  IPluginFacade getPlugin();
+
   /**
    * Resolves a configuration parameter from the wrapped mojo execution. It coerces from String to the given type and
    * considers expressions and default values.

org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/IPluginFacade.java

@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2026 Christoph Läubrich and others
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package org.eclipse.m2e.core.project;
+
+import org.apache.maven.model.Plugin;
+
+import org.eclipse.m2e.core.internal.project.registry.PluginFacade;
+
+
+/**
+ * Facade for the (build) plugin backing a {@link IMojoExecutionFacade}. This decouples consumers that just need the
+ * plugin's coordinates from depending directly on Maven-core API such as {@link Plugin}.
+ *
+ * @noimplement This interface is not intended to be implemented by clients.
+ * @since 2.9
+ */
+public interface IPluginFacade {
+
+  /**
+   * @return the group id of the plugin
+   */
+  String getGroupId();
+
+  /**
+   * @return the artifact id of the plugin
+   */
+  String getArtifactId();
+
+  /**
+   * @return the version of the plugin
+   */
+  String getVersion();
+
+  /**
+   * @return the {@code groupId:artifactId} key uniquely identifying the plugin (independent of its version)
+   */
+  String getKey();
+
+  /**
+   * Wraps a raw {@link Plugin} into an {@link IPluginFacade}.
+   * <p>
+   * This is intended as a transitional helper for client code that still acquires or receives (e.g. through a
+   * framework callback) a raw {@link Plugin} instance, until such code can be migrated to acquire an
+   * {@link IPluginFacade} directly from {@link IMojoExecutionFacade#getPlugin()}.
+   * </p>
+   *
+   * @param plugin the raw plugin to wrap
+   * @return a facade wrapping the given plugin, or {@code null} if {@code plugin} is {@code null}
+   */
+  static IPluginFacade wrap(Plugin plugin) {
+    if(plugin == null) {
+      return null;
+    }
+    return new PluginFacade(plugin);
+  }
+
+}

org.eclipse.m2e.pde.connector/src/org/eclipse/m2e/pde/connector/PDEMavenBundlePluginConfigurator.java

@@ -53,6 +53,7 @@
 import org.eclipse.m2e.core.project.IMavenProjectFacade;
 import org.eclipse.m2e.core.project.IMavenProjectRegistry;
 import org.eclipse.m2e.core.project.IMojoExecutionFacade;
+import org.eclipse.m2e.core.project.IPluginFacade;
 import org.eclipse.m2e.core.project.configurator.AbstractBuildParticipant;
 import org.eclipse.m2e.core.project.configurator.AbstractProjectConfigurator;
 import org.eclipse.m2e.core.project.configurator.ILifecycleMappingConfiguration;
@@ -88,15 +89,13 @@ public class PDEMavenBundlePluginConfigurator extends AbstractProjectConfigurato
 
 	@Override
 	public void configure(ProjectConfigurationRequest request, IProgressMonitor monitor) throws CoreException {
-		List<MojoExecution> executions = getMojoExecutions(request, monitor);
+		List<IMojoExecutionFacade> executions = getMojoExecutionFacades(request, monitor);
 		boolean hasManifestExecution = false;
-		for (MojoExecution execution : executions) {
-			Plugin plugin = execution.getPlugin();
+		for (IMojoExecutionFacade execution : executions) {
+			IPluginFacade plugin = execution.getPlugin();
 			if (isFelix(plugin)) {
 				if (isFelixManifestGoal(execution)) {
-					IMojoExecutionFacade executionFacade = IMojoExecutionFacade.wrap(request.mavenProjectFacade(),
-							execution);
-					Boolean supportIncremental = executionFacade.getMojoParameterValue(
+					Boolean supportIncremental = execution.getMojoParameterValue(
 							FELIX_PARAM_SUPPORTINCREMENTALBUILD, Boolean.class, monitor);
 					if (supportIncremental == null || !supportIncremental.booleanValue()) {
 						createWarningMarker(request, execution, SourceLocationHelper.CONFIGURATION,
@@ -109,7 +108,7 @@ public void configure(ProjectConfigurationRequest request, IProgressMonitor moni
 			}
 		}
 		if (!hasManifestExecution && !executions.isEmpty()) {
-			MojoExecution execution = executions.get(0);
+			IMojoExecutionFacade execution = executions.get(0);
 			createWarningMarker(request, execution, "executions",
 					"There is currently no execution that generates a manifest, consider adding an execution for one of the following goal: "
 							+ (isFelix(execution.getPlugin()) ? FELIX_MANIFEST_GOAL : BND_MANIFEST_GOALS) + ".");
@@ -120,33 +119,42 @@ public void configure(ProjectConfigurationRequest request, IProgressMonitor moni
 		PDEProjectHelper.addPDENature(facade.getProject(), metainfPath, monitor);
 	}
 
-	private void createWarningMarker(ProjectConfigurationRequest request, MojoExecution execution, String attribute,
-			String message) {
-		createWarningMarker(projectManager, markerManager, request, execution, attribute, message);
+	private void createWarningMarker(ProjectConfigurationRequest request, IMojoExecutionFacade execution,
+			String attribute, String message) {
+		createWarningMarker(projectManager, markerManager, request, execution.getKey(), attribute, message);
 	}
 
 	static void createWarningMarker(IMavenProjectRegistry projectManager, IMavenMarkerManager markerManager,
-			ProjectConfigurationRequest request, MojoExecution execution, String attribute, String message) {
-		SourceLocation location = SourceLocationHelper.findLocation(execution.getPlugin(), attribute);
+			ProjectConfigurationRequest request, MojoExecutionKey executionKey, String attribute, String message) {
+		Plugin plugin = request.mavenProject().getPlugin(executionKey.groupId() + ":" + executionKey.artifactId());
+		SourceLocation location = SourceLocationHelper.findLocation(plugin, attribute);
 
 		String[] gav = location.getResourceId().split(":");
 		IMavenProjectFacade facade = projectManager.getMavenProject(gav[0], gav[1], gav[2]);
 		if (facade == null) {
 			// attribute specifying project (probably parent) is not in the workspace.
 			// The following code returns the location of the project's parent-element.
-			location = SourceLocationHelper.findLocation(request.mavenProject(), new MojoExecutionKey(execution));
+			location = SourceLocationHelper.findLocation(request.mavenProject(), executionKey);
 			facade = request.mavenProjectFacade();
 		}
 		MavenProblemInfo problem = new MavenProblemInfo(message, IMarker.SEVERITY_WARNING, location);
 		markerManager.addErrorMarker(facade.getPom(), IMavenConstants.MARKER_LIFECYCLEMAPPING_ID, problem);
 	}
 
-	private boolean isFelixManifestGoal(MojoExecution execution) {
-		return FELIX_MANIFEST_GOAL.equals(execution.getGoal());
+	private boolean isFelixManifestGoal(IMojoExecutionFacade execution) {
+		return isFelixManifestGoal(execution.getKey().goal());
 	}
 
-	private boolean isBNDBundleGoal(MojoExecution execution) {
-		return BND_MANIFEST_GOALS.contains(execution.getGoal());
+	private boolean isFelixManifestGoal(String goal) {
+		return FELIX_MANIFEST_GOAL.equals(goal);
+	}
+
+	private boolean isBNDBundleGoal(IMojoExecutionFacade execution) {
+		return isBNDBundleGoal(execution.getKey().goal());
+	}
+
+	private boolean isBNDBundleGoal(String goal) {
+		return BND_MANIFEST_GOALS.contains(goal);
 	}
 
 	@Override
@@ -159,26 +167,34 @@ public void configureRawClasspath(ProjectConfigurationRequest request, IClasspat
 			IProgressMonitor monitor) throws CoreException { // nothing to do
 	}
 
-	private IPath getMetainfPath(IMavenProjectFacade facade, List<MojoExecution> executions, IProgressMonitor monitor)
-			throws CoreException {
+	private IPath getMetainfPath(IMavenProjectFacade facade, List<IMojoExecutionFacade> executions,
+			IProgressMonitor monitor) throws CoreException {
 		// TODO: warn on multiple executions and prefer the one without classifier (i.e.
 		// the main artifact or the one for the bnd-process/jar goal??
-		for (MojoExecution execution : executions) {
-			Plugin plugin = execution.getPlugin();
+		for (IMojoExecutionFacade execution : executions) {
+			IPluginFacade plugin = execution.getPlugin();
 			String manifestParameter = isBND(plugin) ? BND_PARAM_MANIFESTLOCATION : FELIX_PARAM_MANIFESTLOCATION;
-			IMojoExecutionFacade executionFacade = IMojoExecutionFacade.wrap(facade, execution);
-			File location = executionFacade.getMojoParameterValue(manifestParameter, File.class, monitor);
+			File location = execution.getMojoParameterValue(manifestParameter, File.class, monitor);
 			if (location != null) {
 				return facade.getProjectRelativePath(location.getAbsolutePath());
 			}
 		}
 		return null;
 	}
 
+	private boolean isBND(IPluginFacade plugin) {
+		return plugin != null && "bnd-maven-plugin".equals(plugin.getArtifactId());
+	}
+
 	private boolean isBND(Plugin plugin) {
 		return plugin != null && "bnd-maven-plugin".equals(plugin.getArtifactId());
 	}
 
+	private boolean isFelix(IPluginFacade plugin) {
+		return plugin != null && "org.apache.felix".equals(plugin.getGroupId())
+				&& "maven-bundle-plugin".equals(plugin.getArtifactId());
+	}
+
 	private boolean isFelix(Plugin plugin) {
 		return plugin != null && "org.apache.felix".equals(plugin.getGroupId())
 				&& "maven-bundle-plugin".equals(plugin.getArtifactId());
@@ -194,7 +210,8 @@ public boolean hasConfigurationChanged(IMavenProjectFacade newFacade,
 	public AbstractBuildParticipant getBuildParticipant(IMavenProjectFacade projectFacade, MojoExecution execution,
 			IPluginExecutionMetadata executionMetadata) {
 		Plugin plugin = execution.getPlugin();
-		if ((isFelix(plugin) && isFelixManifestGoal(execution)) || (isBND(plugin) && isBNDBundleGoal(execution))) {
+		if ((isFelix(plugin) && isFelixManifestGoal(execution.getGoal()))
+				|| (isBND(plugin) && isBNDBundleGoal(execution.getGoal()))) {
 			// Run .classpath synchronization on each incremental build in order to consider
 			// potential changes on the Bundle-ClassPath and the resources recognized by the
 			// '-includeResource' instruction that are caused by previous mojo executions.

org.eclipse.m2e.pde.connector/src/org/eclipse/m2e/pde/connector/TychoDSConfigurator.java

@@ -25,6 +25,7 @@
 import org.eclipse.m2e.core.project.IMavenProjectFacade;
 import org.eclipse.m2e.core.project.IMojoExecutionFacade;
 import org.eclipse.m2e.core.project.configurator.AbstractProjectConfigurator;
+import org.eclipse.m2e.core.project.configurator.MojoExecutionKey;
 import org.eclipse.m2e.core.project.configurator.ProjectConfigurationRequest;
 import org.eclipse.pde.ds.internal.annotations.DSAnnotationVersion;
 import org.osgi.framework.Version;
@@ -105,7 +106,7 @@ private List<MojoExecution> getTychoDsPluginMojoExecutions(IMavenProjectFacade p
 
 	private void createWarningMarker(ProjectConfigurationRequest request, MojoExecution execution, String attribute,
 			String message) {
-		PDEMavenBundlePluginConfigurator.createWarningMarker(projectManager, markerManager, request, execution,
-				attribute, message);
+		PDEMavenBundlePluginConfigurator.createWarningMarker(projectManager, markerManager, request,
+				new MojoExecutionKey(execution), attribute, message);
 	}
 }