--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/MavenPluginActivator.java.orig	2014-02-16 17:42:33.535701239 +0000
+++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/MavenPluginActivator.java	2014-02-16 17:47:37.883953842 +0000
@@ -40,7 +40,6 @@
 import org.codehaus.plexus.PlexusContainerException;
 import org.codehaus.plexus.classworlds.ClassWorld;
 
-import org.apache.maven.archetype.Archetype;
 import org.apache.maven.archetype.ArchetypeGenerationRequest;
 import org.apache.maven.archetype.common.ArchetypeArtifactManager;
 import org.apache.maven.archetype.source.ArchetypeDataSource;
@@ -406,8 +405,8 @@
   /**
    * @deprecated use {@link ArchetypeManager#getArchetyper()}
    */
-  public Archetype getArchetype() {
-    return archetypeManager.getArchetyper();
+  public org.apache.maven.archetype.ArchetypeManager getArchetype() {
+    return maven.lookupComponent(org.apache.maven.archetype.ArchetypeManager.class);
   }
 
   /**
--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeCatalogFactory.java.orig	2012-07-19 15:47:14.000000000 +0100
+++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeCatalogFactory.java	2012-07-19 16:13:07.000000000 +0100
@@ -21,7 +21,7 @@
 import org.eclipse.core.runtime.Status;
 import org.eclipse.osgi.util.NLS;
 
-import org.apache.maven.archetype.Archetype;
+import org.apache.maven.archetype.ArchetypeManager;
 import org.apache.maven.archetype.catalog.ArchetypeCatalog;
 import org.apache.maven.archetype.source.ArchetypeDataSource;
 import org.apache.maven.archetype.source.ArchetypeDataSourceException;
@@ -67,7 +67,7 @@
     return getId();
   }
 
-  protected Archetype getArchetyper() {
+  protected ArchetypeManager getArchetyper() {
     return MavenPluginActivator.getDefault().getArchetype();
   }
 
--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectConfigurationManager.java.orig	2012-07-19 15:39:54.000000000 +0100
+++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectConfigurationManager.java	2012-07-19 17:22:31.000000000 +0100
@@ -768,7 +768,7 @@
     }
   }
 
-  private org.apache.maven.archetype.Archetype getArchetyper() {
+  private org.apache.maven.archetype.ArchetypeManager getArchetyper() {
     return MavenPluginActivator.getDefault().getArchetype();
   }
 
--- org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java.orig	2012-08-08 14:46:26.924975744 +0100
+++ org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java	2012-08-04 14:51:10.000000000 +0100
@@ -790,7 +790,7 @@
               archetype.setArtifactId(archetypeArtifactId);
               archetype.setVersion(archetypeVersion);
               archetype.setRepository(repositoryUrl);
-              org.apache.maven.archetype.Archetype archetyper = MavenPluginActivator.getDefault().getArchetype();
+              org.apache.maven.archetype.ArchetypeManager archetyper = MavenPluginActivator.getDefault().getArchetype();
               archetyper.updateLocalCatalog(archetype);
 
               loadArchetypes(archetypeGroupId, archetypeArtifactId, archetypeVersion);
--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeManager.java.orig	2014-02-16 18:31:33.962586816 +0000
+++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeManager.java	2014-02-16 18:32:47.757137914 +0000
@@ -65,7 +65,7 @@
 
   final ArchetypeArtifactManager aaMgr;
 
-  private final org.apache.maven.archetype.Archetype archetyper;
+  private final org.apache.maven.archetype.ArchetypeManager archetyper;
 
   private final PlexusContainer container;
 
@@ -75,7 +75,7 @@
     this.writer = new ArchetypeCatalogsWriter();
     try {
       this.aaMgr = container.lookup(ArchetypeArtifactManager.class);
-      this.archetyper = container.lookup(org.apache.maven.archetype.Archetype.class);
+      this.archetyper = container.lookup(org.apache.maven.archetype.ArchetypeManager.class);
     } catch(ComponentLookupException ex) {
       throw new NoSuchComponentException(ex);
     }
@@ -246,7 +246,7 @@
   /**
    * @since 1.5
    */
-  public org.apache.maven.archetype.Archetype getArchetyper() {
+  public org.apache.maven.archetype.ArchetypeManager getArchetyper() {
     return archetyper;
   }