You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2016/11/18 16:26:09 UTC

svn commit: r1770406 - /sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/EmbeddedArchetypeInstaller.java

Author: kwin
Date: Fri Nov 18 16:26:09 2016
New Revision: 1770406

URL: http://svn.apache.org/viewvc?rev=1770406&view=rev
Log:
SLING-6268 make compatible with latest archiver 2.3 (being included in m2e 1.6)

Modified:
    sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/EmbeddedArchetypeInstaller.java

Modified: sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/EmbeddedArchetypeInstaller.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/EmbeddedArchetypeInstaller.java?rev=1770406&r1=1770405&r2=1770406&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/EmbeddedArchetypeInstaller.java (original)
+++ sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/EmbeddedArchetypeInstaller.java Fri Nov 18 16:26:09 2016
@@ -39,6 +39,7 @@ import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.maven.DefaultMaven;
 import org.apache.maven.Maven;
+import org.apache.maven.archetype.ArchetypeManager;
 import org.apache.maven.archetype.catalog.Archetype;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.DefaultArtifact;
@@ -149,8 +150,10 @@ public class EmbeddedArchetypeInstaller
             archetype.setGroupId(groupId);
             archetype.setArtifactId(artifactId);
             archetype.setVersion(version);
-            org.apache.maven.archetype.Archetype archetyper = MavenPluginActivator.getDefault().getArchetype();
-            archetyper.updateLocalCatalog(archetype);
+            // Archetype has been renamed to ArchetypeManager in
+            // https://github.com/apache/maven-archetype/commit/c7321c93ab5fc27d9e8fccd4a69ee5bdd18c9c60
+            ArchetypeManager archetypeManager = MavenPluginActivator.getDefault().getArchetypeManager().getArchetyper();
+            archetypeManager.updateLocalCatalog(archetype);
         } catch (CoreException | RuntimeException e) {
             throw e;
         } catch (Exception e) {