[FIXUP]

Author: HannesWell

org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/archetype/ArchetypeCatalogFactory.java

@@ -25,7 +25,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.repository.LocalRepository;
+import org.eclipse.aether.repository.NoLocalRepositoryManagerException;
 import org.eclipse.aether.repository.RemoteRepository;
+import org.eclipse.aether.spi.localrepo.LocalRepositoryManagerFactory;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.osgi.util.NLS;
@@ -38,7 +42,6 @@
 import org.apache.maven.archetype.source.RemoteCatalogArchetypeDataSource;
 
 import org.eclipse.m2e.core.embedder.IMaven;
-import org.eclipse.m2e.core.embedder.IMavenExecutionContext;
 import org.eclipse.m2e.core.internal.Messages;
 
 
@@ -170,12 +173,15 @@ public ArchetypeCatalog getArchetypeCatalog() throws CoreException {
       ArchetypeCatalog catalog = getEmbeddedCatalog();
       if(catalog == null) {
         //local but not embedded catalog
-        IMavenExecutionContext context = maven.createExecutionContext();
-        context.getExecutionRequest().setLocalRepositoryPath(getLocalRepositoryPath());
-        return context.execute((ctx, m) -> {
+        File localRepositoryPath = getLocalRepositoryPath();
+        return maven.createExecutionContext().execute((ctx, m) -> {
           try {
-            return source.getArchetypeCatalog(ctx.getRepositorySession(), ArchetypePlugin.getRemoteRepositories(ctx));
-          } catch(ArchetypeDataSourceException e) {
+            var managerFactory = ctx.getComponentLookup().lookup(LocalRepositoryManagerFactory.class);
+            DefaultRepositorySystemSession session = new DefaultRepositorySystemSession(ctx.getRepositorySession());
+            session.setLocalRepositoryManager(
+                managerFactory.newInstance(session, new LocalRepository(localRepositoryPath)));
+            return source.getArchetypeCatalog(session, List.of());
+          } catch(ArchetypeDataSourceException | NoLocalRepositoryManagerException e) {
             return new ArchetypeCatalog();
           }
         }, null);
@@ -191,7 +197,7 @@ private File getLocalRepositoryPath() {
         try {
           path = Path.of(new URI(getId()));
         } catch(Exception e2) {
-          throw new IllegalStateException("Illegal repository path: " + getId());
+          return new File(getId());
         }
       }
       path = path.toAbsolutePath();
@@ -276,10 +282,10 @@ public ArchetypeCatalog getArchetypeCatalog() throws CoreException {
 
       ArchetypeCatalog catalog = maven.createExecutionContext().execute((ctx, m) -> {
         try {
-          RemoteRepository archeTypeRepo = new RemoteRepository.Builder(
+          RemoteRepository archetypeRepo = new RemoteRepository.Builder(
               RemoteCatalogArchetypeDataSource.ARCHETYPE_REPOSITORY_ID, "", remoteUrl).build();
           List<RemoteRepository> remoteRepositories = new ArrayList<>(ArchetypePlugin.getRemoteRepositories(ctx));
-          remoteRepositories.add(archeTypeRepo);
+          remoteRepositories.add(0, archetypeRepo);
           return source.getArchetypeCatalog(ctx.getRepositorySession(), remoteRepositories);
         } catch(ArchetypeDataSourceException e) {
           return new ArchetypeCatalog();