Use newer m2e-core

eclipse-m2e · Jun 28, 2022 · 0705044 · 0705044
1 parent fd28253
commit 0705044
Show file tree

Hide file tree

Showing 19 changed files with 61 additions and 209 deletions.
diff --git a/org.eclipse.m2e.wtp.feature/feature.xml b/org.eclipse.m2e.wtp.feature/feature.xml
@@ -24,7 +24,6 @@
       <import feature="org.eclipse.wst.common.fproj" version="3.2.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.jst.common.fproj.enablement.jdt" version="3.2.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.m2e.feature" version="1.5.0" match="greaterOrEqual"/>
-      <import feature="org.sonatype.m2e.mavenarchiver.feature" version="0.17.4" match="greaterOrEqual"/>
    </requires>
 
    <plugin

diff --git a/org.eclipse.m2e.wtp.jaxrs/META-INF/MANIFEST.MF b/org.eclipse.m2e.wtp.jaxrs/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
  org.eclipse.jdt.core,
  org.eclipse.m2e.maven.runtime,
- org.eclipse.m2e.core;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.m2e.wtp,
  org.eclipse.jst.common.project.facet.core,
  org.eclipse.jst.j2ee,

diff --git a/org.eclipse.m2e.wtp.jpa/META-INF/MANIFEST.MF b/org.eclipse.m2e.wtp.jpa/META-INF/MANIFEST.MF
@@ -12,8 +12,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jpt.jpa.core;bundle-version="3.3.0",
  org.eclipse.jpt.common.core;bundle-version="1.3.0",
  org.eclipse.wst.common.project.facet.core,
- org.eclipse.m2e.core;bundle-version="[1.6.0,2.0.0)",
- org.eclipse.m2e.maven.runtime;bundle-version="[1.6.0,2.0.0)",
+ org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.m2e.maven.runtime;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.core.resources,
  org.eclipse.jdt.core,
  org.eclipse.emf.common,

diff --git a/org.eclipse.m2e.wtp.jsf/META-INF/MANIFEST.MF b/org.eclipse.m2e.wtp.jsf/META-INF/MANIFEST.MF
@@ -12,8 +12,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jst.jsf.core;bundle-version="1.3.4",
  org.eclipse.core.resources,
  org.eclipse.emf.common,
- org.eclipse.m2e.core;bundle-version="[1.6.0,2.0.0)",
- org.eclipse.m2e.maven.runtime;bundle-version="[1.6.0,2.0.0)",
+ org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.m2e.maven.runtime;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.wst.common.frameworks,
  org.eclipse.wst.common.project.facet.core,
  org.eclipse.jst.common.project.facet.core,

diff --git a/org.eclipse.m2e.wtp.site/category.xml b/org.eclipse.m2e.wtp.site/category.xml
@@ -5,40 +5,32 @@
    </description>
    <category name="m2e-wtp"/>
 
-   <feature url="features/org.eclipse.m2e.wtp.feature_0.0.0.qualifier.jar" id="org.eclipse.m2e.wtp.feature" version="0.0.0">
+   <feature id="org.eclipse.m2e.wtp.feature" version="0.0.0">
       <category name="m2e-wtp"/>
    </feature>
-   <feature url="features/org.eclipse.m2e.wtp.jaxrs.feature_0.0.0.qualifier.jar" id="org.eclipse.m2e.wtp.jaxrs.feature" version="0.0.0">
+   <feature id="org.eclipse.m2e.wtp.jaxrs.feature" version="0.0.0">
       <category name="m2e-wtp"/>
    </feature>
-   <feature url="features/org.eclipse.m2e.wtp.jsf.feature_0.0.0.qualifier.jar" id="org.eclipse.m2e.wtp.jsf.feature" version="0.0.0">
+   <feature id="org.eclipse.m2e.wtp.jsf.feature" version="0.0.0">
       <category name="m2e-wtp"/>
    </feature>
-   <feature url="features/org.eclipse.m2e.wtp.jpa.feature_0.0.0.qualifier.jar" id="org.eclipse.m2e.wtp.jpa.feature" version="0.0.0">
+   <feature id="org.eclipse.m2e.wtp.jpa.feature" version="0.0.0">
       <category name="m2e-wtp"/>
    </feature>
    <category-def name="m2e-wtp" label="Maven Integration for WTP"/>
 
-   <category name="maven-archiver"/>
-
-   <feature url="features/org.sonatype.m2e.mavenarchiver.feature_0.0.0.qualifier.jar" id="org.sonatype.m2e.mavenarchiver.feature" version="0.0.0">
-      <category name="maven-archiver"/>
-   </feature>
-
-   <category-def name="maven-archiver" label="M2E Maven Archiver Connector (3rd party)"/>
-
    <category name="m2e-wtp-sdk"/>
 
-   <feature url="features/org.eclipse.m2e.wtp.sdk.feature_0.0.0.qualifier.jar" id="org.eclipse.m2e.wtp.sdk.feature" version="0.0.0">
+   <feature id="org.eclipse.m2e.wtp.sdk.feature" version="0.0.0">
       <category name="m2e-wtp-sdk"/>
    </feature>
-   <feature url="features/org.eclipse.m2e.wtp.jsf.feature.source_0.0.0.qualifier.jar" id="org.eclipse.m2e.wtp.jsf.feature.source" version="0.0.0">
+   <feature id="org.eclipse.m2e.wtp.jsf.feature.source" version="0.0.0">
       <category name="m2e-wtp-sdk"/>
    </feature>
-   <feature url="features/org.eclipse.m2e.wtp.jaxrs.feature.source_0.0.0.qualifier.jar" id="org.eclipse.m2e.wtp.jaxrs.feature.source" version="0.0.0">
+   <feature id="org.eclipse.m2e.wtp.jaxrs.feature.source" version="0.0.0">
       <category name="m2e-wtp-sdk"/>
    </feature>
-   <feature url="features/org.eclipse.m2e.wtp.jpa.feature.source_0.0.0.qualifier.jar" id="org.eclipse.m2e.wtp.jpa.feature.source" version="0.0.0">
+   <feature id="org.eclipse.m2e.wtp.jpa.feature.source" version="0.0.0">
       <category name="m2e-wtp-sdk"/>
    </feature>
    <category-def name="m2e-wtp-sdk" label="Maven Integration for WTP - SDK"/>

diff --git a/org.eclipse.m2e.wtp/META-INF/MANIFEST.MF b/org.eclipse.m2e.wtp/META-INF/MANIFEST.MF
@@ -20,9 +20,9 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.wst.common.frameworks,
  org.eclipse.wst.common.modulecore;visibility:=reexport,
  org.eclipse.wst.common.project.facet.core,
- org.eclipse.m2e.maven.runtime;bundle-version="[1.6.0,2.0.0)",
- org.eclipse.m2e.core;bundle-version="[1.6.0,2.0.0)",
- org.eclipse.m2e.jdt;bundle-version="[1.6.0,2.0.0)",
+ org.eclipse.m2e.maven.runtime;bundle-version="[3.8.0,4.0.0)",
+ org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.m2e.jdt;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.ui.console,
  org.eclipse.emf.ecore,
  org.eclipse.jem.util,
@@ -32,7 +32,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui.ide,
  org.eclipse.m2e.wtp.overlay;visibility:=reexport,
  org.eclipse.wst.server.core,
- org.sonatype.m2e.mavenarchiver;bundle-version="0.17.4",
+ org.eclipse.m2e.mavenarchiver,
  org.eclipse.jdt.launching,
  org.eclipse.jst.jee.web,
  org.eclipse.jst.jee.ejb,

diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/AbstractDependencyConfigurator.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/AbstractDependencyConfigurator.java
@@ -18,7 +18,6 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.m2e.core.embedder.MavenRuntimeManager;
 import org.eclipse.m2e.core.internal.markers.IMavenMarkerManager;
 import org.eclipse.m2e.core.project.IMavenProjectRegistry;
 
@@ -46,16 +45,11 @@ public abstract class AbstractDependencyConfigurator {
   private String name;
 
   protected IMavenProjectRegistry projectManager;
-  protected MavenRuntimeManager runtimeManager;
   protected IMavenMarkerManager markerManager; 
 
   public void setProjectManager(IMavenProjectRegistry projectManager) {
     this.projectManager = projectManager;
   }
-
-  public void setRuntimeManager(MavenRuntimeManager runtimeManager) {
-    this.runtimeManager = runtimeManager;
-  }
 
   public void setMarkerManager(IMavenMarkerManager markerManager) {
     this.markerManager = markerManager;

diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/AbstractProjectConfiguratorDelegate.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/AbstractProjectConfiguratorDelegate.java
@@ -14,14 +14,12 @@
 
 import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Properties;
 import java.util.Set;
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.project.MavenProject;
-import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
@@ -30,11 +28,8 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.common.project.facet.WtpUtils;
 import org.eclipse.jst.j2ee.classpathdep.IClasspathDependencyConstants;
 import org.eclipse.m2e.core.MavenPlugin;
 import org.eclipse.m2e.core.internal.IMavenConstants;
@@ -43,11 +38,8 @@
 import org.eclipse.m2e.core.internal.markers.SourceLocation;
 import org.eclipse.m2e.core.project.IMavenProjectFacade;
 import org.eclipse.m2e.core.project.IMavenProjectRegistry;
-import org.eclipse.m2e.core.project.MavenProjectUtils;
 import org.eclipse.m2e.jdt.IClasspathDescriptor;
 import org.eclipse.m2e.wtp.internal.Messages;
-import org.eclipse.m2e.wtp.internal.utilities.DebugUtilities;
-import org.eclipse.m2e.wtp.internal.webfragment.WebFragmentUtil;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.wst.common.componentcore.ComponentCore;
 import org.eclipse.wst.common.componentcore.internal.StructureEdit;
@@ -56,7 +48,6 @@
 import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
 import org.eclipse.wst.common.project.facet.core.IFacetedProject;
 import org.eclipse.wst.common.project.facet.core.IFacetedProject.Action;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/MavenDeploymentDescriptorManagement.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/MavenDeploymentDescriptorManagement.java
@@ -38,6 +38,7 @@
 import org.eclipse.core.runtime.Status;
 import org.eclipse.m2e.core.MavenPlugin;
 import org.eclipse.m2e.core.embedder.IMaven;
+import org.eclipse.m2e.core.embedder.IMavenExecutionContext;
 import org.eclipse.m2e.core.internal.IMavenConstants;
 import org.eclipse.m2e.core.internal.MavenPluginActivator;
 import org.eclipse.m2e.core.internal.markers.IMavenMarkerManager;
@@ -94,12 +95,11 @@ public void updateConfiguration(IProject project, MavenProject mavenProject, Ear
     IFile pomResource = project.getFile(IMavenConstants.POM_FILE_NAME);
     markerManager.deleteMarkers(pomResource, MavenWtpConstants.WTP_MARKER_GENERATE_APPLICATIONXML_ERROR);
 
+    IMavenExecutionContext executionContext = mavenFacade.createExecutionContext();
     //Create a maven request + session
     IMaven maven = MavenPlugin.getMaven();
-    MavenExecutionRequest request = projectManager.createExecutionRequest(pomResource, mavenFacade.getResolverConfiguration(), monitor);
-    MavenSession session = maven.createSession(request, mavenProject);
 
-    MavenExecutionPlan executionPlan = maven.calculateExecutionPlan(session, mavenProject, Collections.singletonList("ear:generate-application-xml"), true, monitor); //$NON-NLS-1$
+    MavenExecutionPlan executionPlan = maven.calculateExecutionPlan(mavenProject, Collections.singletonList("ear:generate-application-xml"), true, monitor); //$NON-NLS-1$
     MojoExecution genConfigMojo = getExecution(executionPlan, "maven-ear-plugin", "generate-application-xml"); //$NON-NLS-1$ //$NON-NLS-2$
     if(genConfigMojo == null) {
       //TODO Better error management
@@ -148,9 +148,10 @@ public void updateConfiguration(IProject project, MavenProject mavenProject, Ear
     }
 
     //Execute our modified mojo
-    maven.execute(session, genConfigMojo, monitor);
+    executionContext.execute(mavenFacade.getMavenProject(), genConfigMojo, monitor);
 
-    if (session.getResult().hasExceptions()){
+    MavenSession session = executionContext.getSession();
+	if (session.getResult().hasExceptions()){
       markerManager.addMarkers(mavenFacade.getPom(), MavenWtpConstants.WTP_MARKER_GENERATE_APPLICATIONXML_ERROR, session.getResult());
     }
 

diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/MavenSessionHelper.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/MavenSessionHelper.java
@@ -28,6 +28,7 @@
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.m2e.core.MavenPlugin;
+import org.eclipse.m2e.core.embedder.IMavenExecutionContext;
 import org.eclipse.m2e.core.internal.IMavenConstants;
 import org.eclipse.m2e.core.internal.embedder.MavenImpl;
 import org.eclipse.m2e.core.project.IMavenProjectFacade;
@@ -62,17 +63,14 @@ public void ensureDependenciesAreResolved(String pluginId, String goal) throws C
     artifacts = project.getArtifacts();
     dependencyArtifacts = project.getDependencyArtifacts();
     IProgressMonitor monitor = new NullProgressMonitor();
-    MavenSession session = getSession(monitor);
-
-    MavenExecutionPlan executionPlan = MavenPlugin.getMaven().calculateExecutionPlan(session, 
-                                                                                     project, 
+    MavenExecutionPlan executionPlan = MavenPlugin.getMaven().calculateExecutionPlan(project, 
                                                                                      Collections.singletonList(goal), 
                                                                                      true, 
                                                                                      monitor);
 
     MojoExecution execution = getExecution(executionPlan, pluginId);
-
-    ensureDependenciesAreResolved(session, execution, monitor);
+    IMavenExecutionContext context = MavenPlugin.getMaven().createExecutionContext();
+    ensureDependenciesAreResolved(context.getSession(), execution, monitor);
   }
 
   public void ensureDependenciesAreResolved(MavenSession session, MojoExecution execution, IProgressMonitor monitor) throws CoreException {
@@ -91,20 +89,6 @@ public void ensureDependenciesAreResolved(MavenSession session, MojoExecution ex
     }
   }
 
-  private MavenSession getSession(IProgressMonitor monitor) throws CoreException {
-    IMavenProjectRegistry projectManager = MavenPlugin.getMavenProjectRegistry();
-    IMavenProjectFacade mavenFacade = projectManager.getMavenProject(project.getGroupId(), 
-                                                                     project.getArtifactId(), 
-                                                                     project.getVersion());
-
-    MavenExecutionRequest request = projectManager.createExecutionRequest(mavenFacade.getPom(), 
-                                                                          mavenFacade.getResolverConfiguration(), 
-                                                                          monitor);
-
-    MavenSession session = MavenPlugin.getMaven().createSession(request, project);
-    return session;
-  }
-
   public void dispose() {
     project.setArtifactFilter(null);
     project.setResolvedArtifacts(null);

diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/ProjectUtils.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/ProjectUtils.java
@@ -11,11 +11,7 @@
 package org.eclipse.m2e.wtp;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
 import java.util.LinkedHashSet;
-import java.util.List;
 import java.util.Set;
 
 import org.apache.maven.project.MavenProject;

diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WebProjectConfiguratorDelegate.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WebProjectConfiguratorDelegate.java
@@ -233,8 +233,7 @@ public void setModuleDependencies(IProject project, MavenProject mavenProject, I
     WarPluginConfiguration config = new WarPluginConfiguration(mavenProject, project);
     Map<Artifact, String> deployedArtifacts = getDeployedArtifacts(mavenProject.getArtifacts(), config);
 
-    List<AbstractDependencyConfigurator> depConfigurators = ExtensionReader.readDependencyConfiguratorExtensions(projectManager,
-        MavenPlugin.getMavenRuntimeManager(), mavenMarkerManager);
+    List<AbstractDependencyConfigurator> depConfigurators = ExtensionReader.readDependencyConfiguratorExtensions(projectManager, mavenMarkerManager);
 
     Set<IVirtualReference> references = new LinkedHashSet<>();
 

diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/ExtensionReader.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/ExtensionReader.java
@@ -19,7 +19,6 @@
 import org.eclipse.core.runtime.IExtensionPoint;
 import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.m2e.core.embedder.MavenRuntimeManager;
 import org.eclipse.m2e.core.internal.markers.IMavenMarkerManager;
 import org.eclipse.m2e.core.project.IMavenProjectRegistry;
 import org.eclipse.m2e.core.project.configurator.AbstractProjectConfigurator;
@@ -43,8 +42,7 @@ public class ExtensionReader {
 
   private static ArrayList<AbstractDependencyConfigurator> dependencyConfigurators;
 
-  public static List<AbstractDependencyConfigurator> readDependencyConfiguratorExtensions(IMavenProjectRegistry projectManager,
-      MavenRuntimeManager runtimeManager, IMavenMarkerManager markerManager) {
+  public static List<AbstractDependencyConfigurator> readDependencyConfiguratorExtensions(IMavenProjectRegistry projectManager, IMavenMarkerManager markerManager) {
     if (dependencyConfigurators == null) {
       dependencyConfigurators = new ArrayList<>();
 
@@ -61,7 +59,6 @@ public static List<AbstractDependencyConfigurator> readDependencyConfiguratorExt
 
                 AbstractDependencyConfigurator projectConfigurator = (AbstractDependencyConfigurator) o;
                 projectConfigurator.setProjectManager(projectManager);
-                projectConfigurator.setRuntimeManager(runtimeManager);
                 projectConfigurator.setMarkerManager(markerManager);
 
                 dependencyConfigurators.add(projectConfigurator);