diff --git a/0001-Fix-manifests-for-guava-and-use-OSGi-fied-archetypes.patch b/0001-Fix-manifests-for-guava-and-use-OSGi-fied-archetypes.patch index 9c66970..b96af7c 100644 --- a/0001-Fix-manifests-for-guava-and-use-OSGi-fied-archetypes.patch +++ b/0001-Fix-manifests-for-guava-and-use-OSGi-fied-archetypes.patch @@ -1,4 +1,4 @@ -From 65d22d3bb41c5c8cf9e8f7f512ef839b15bcfa0a Mon Sep 17 00:00:00 2001 +From f96fbe9b7373e28fd2ee7a2f5352f8ac5382501f Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 18 Jun 2019 15:35:48 +0100 Subject: [PATCH 1/6] Fix manifests for guava and use OSGi-fied archetypes diff --git a/0002-Port-to-latest-versions-of-maven-indexer-and-lucene.patch b/0002-Port-to-latest-versions-of-maven-indexer-and-lucene.patch index 35764f1..052901e 100644 --- a/0002-Port-to-latest-versions-of-maven-indexer-and-lucene.patch +++ b/0002-Port-to-latest-versions-of-maven-indexer-and-lucene.patch @@ -1,4 +1,4 @@ -From 07055ab88ebbe85a14846839a3bd4919cceb1529 Mon Sep 17 00:00:00 2001 +From b99caf3246bde1237b5e645ab0b972fe3f5dbdba Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 18 Jun 2019 15:45:18 +0100 Subject: [PATCH 2/6] Port to latest versions of maven-indexer and lucene diff --git a/0003-Adapt-to-API-change-in-aether.patch b/0003-Adapt-to-API-change-in-aether.patch index 8c3f412..06acc24 100644 --- a/0003-Adapt-to-API-change-in-aether.patch +++ b/0003-Adapt-to-API-change-in-aether.patch @@ -1,4 +1,4 @@ -From 109bc51f5eab1e29ea3928fbd3efc9cb48712c6a Mon Sep 17 00:00:00 2001 +From fc7bcc5a8a5548be7916b1aba5169d5644d7e3db Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 21 Jun 2019 11:24:15 +0100 Subject: [PATCH 3/6] Adapt to API change in aether diff --git a/0004-Remove-mandatory-attirbutes-from-OSGi-manifests-whic.patch b/0004-Remove-mandatory-attirbutes-from-OSGi-manifests-whic.patch index b67ef6c..10d300f 100644 --- a/0004-Remove-mandatory-attirbutes-from-OSGi-manifests-whic.patch +++ b/0004-Remove-mandatory-attirbutes-from-OSGi-manifests-whic.patch @@ -1,4 +1,4 @@ -From 8e70962da8183da5476130f470e75f23d7b2c2f9 Mon Sep 17 00:00:00 2001 +From 139c88b7412e236b7357bc8fc5f1217f2f6655fc Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 21 Jun 2019 11:27:12 +0100 Subject: [PATCH 4/6] Remove mandatory attirbutes from OSGi manifests, which diff --git a/0005-Port-to-latest-version-of-maven-archetypes.patch b/0005-Port-to-latest-version-of-maven-archetypes.patch index 4887483..a9b308f 100644 --- a/0005-Port-to-latest-version-of-maven-archetypes.patch +++ b/0005-Port-to-latest-version-of-maven-archetypes.patch @@ -1,4 +1,4 @@ -From cb5abc1b4420421bbba1b35e46cb58cc37e1524c Mon Sep 17 00:00:00 2001 +From 69b028840c120ea2516eeed37e6e5f9f251704cb Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 25 Mar 2020 11:26:45 +0000 Subject: [PATCH 5/6] Port to latest version of maven-archetypes @@ -6,14 +6,14 @@ Subject: [PATCH 5/6] Port to latest version of maven-archetypes --- .../org.eclipse.m2e.archetype.common/pom.xml | 9 +- .../MavenArchetypesPreferencePage.java | 93 +-------- - .../MavenProjectWizardArchetypePage.java | 4 +- + .../MavenProjectWizardArchetypePage.java | 14 +- .../m2e/core/internal/ExtensionReader.java | 27 +-- .../eclipse/m2e/core/internal/Messages.java | 2 - .../archetype/ArchetypeCatalogFactory.java | 192 +++--------------- .../archetype/ArchetypeCatalogsWriter.java | 49 +---- .../internal/archetype/ArchetypeManager.java | 4 +- .../index/nexus/NexusIndexManager.java | 2 +- - 9 files changed, 43 insertions(+), 339 deletions(-) + 9 files changed, 51 insertions(+), 341 deletions(-) diff --git a/m2e-maven-runtime/org.eclipse.m2e.archetype.common/pom.xml b/m2e-maven-runtime/org.eclipse.m2e.archetype.common/pom.xml index 96ec268..6bb1bd0 100644 @@ -172,24 +172,39 @@ index 0c95b17..486e3c9 100644 return factory.isEditable() ? text : NLS.bind(Messages.MavenArchetypesPreferencePage_SystemLabel, text); } diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java -index 90547dd..a3d9aa6 100644 +index 90547dd..acd296f 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java -@@ -82,6 +82,7 @@ import org.apache.maven.artifact.Artifact; +@@ -82,11 +82,13 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; -+import org.apache.maven.project.DefaultProjectBuildingRequest; ++import org.apache.maven.project.ProjectBuildingRequest; import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.archetype.ArchetypeUtil; -@@ -848,7 +849,8 @@ public class MavenProjectWizardArchetypePage extends AbstractMavenWizardPage imp + import org.eclipse.m2e.core.embedder.ArtifactKey; + import org.eclipse.m2e.core.embedder.IMaven; ++import org.eclipse.m2e.core.embedder.IMavenExecutionContext; + import org.eclipse.m2e.core.internal.MavenPluginActivator; + import org.eclipse.m2e.core.internal.archetype.ArchetypeCatalogFactory; + import org.eclipse.m2e.core.internal.archetype.ArchetypeManager; +@@ -846,9 +848,15 @@ public class MavenProjectWizardArchetypePage extends AbstractMavenWizardPage imp + archetype.setArtifactId(archetypeArtifactId); + archetype.setVersion(archetypeVersion); archetype.setRepository(repositoryUrl); - org.apache.maven.archetype.ArchetypeManager archetyper = MavenPluginActivator.getDefault() - .getArchetypeManager().getArchetyper(); +- org.apache.maven.archetype.ArchetypeManager archetyper = MavenPluginActivator.getDefault() +- .getArchetypeManager().getArchetyper(); - archetyper.updateLocalCatalog(archetype); + -+ archetyper.updateLocalCatalog(new DefaultProjectBuildingRequest(), archetype); ++ IMavenExecutionContext ctx = maven.createExecutionContext(); ++ Void v = ctx.execute((context, pm) -> { ++ org.apache.maven.archetype.ArchetypeManager archetyper = MavenPluginActivator.getDefault() ++ .getArchetypeManager().getArchetyper(); ++ ProjectBuildingRequest projectBuildingRequest = context.newProjectBuildingRequest(); ++ archetyper.updateLocalCatalog(projectBuildingRequest, archetype); ++ return null; ++ }, new NullProgressMonitor()); archetypesCache.clear(); diff --git a/0006-Remove-dep-on-aether-connector.patch b/0006-Remove-dep-on-aether-connector.patch index 2db21e0..5b2e776 100644 --- a/0006-Remove-dep-on-aether-connector.patch +++ b/0006-Remove-dep-on-aether-connector.patch @@ -1,4 +1,4 @@ -From 87b628fc0fc231a690708bbfe798e8e0836d2fce Mon Sep 17 00:00:00 2001 +From 6483400667ee34972a392d7efef4eb817bec9862 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 17 Nov 2020 10:32:54 +0000 Subject: [PATCH 6/6] Remove dep on aether-connector diff --git a/eclipse-m2e-core.spec b/eclipse-m2e-core.spec index 13780b6..cdc386e 100644 --- a/eclipse-m2e-core.spec +++ b/eclipse-m2e-core.spec @@ -2,7 +2,7 @@ Name: eclipse-m2e-core Version: 1.16.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Maven integration for Eclipse # Most of components are under EPL, but some of them are licensed under @@ -366,6 +366,10 @@ xmvn-subst -s $(find %{buildroot}%{_datadir}/eclipse/droplets/m2e-core -name jar %license LICENSE-2.0.txt %changelog +* Wed Nov 18 2020 Mat Booth - 1.16.2-3 +- Improved maven-archetypes patch to fix NPE when adding new archetypes from the + new project wizard dialog + * Tue Nov 17 2020 Mat Booth - 1.16.2-2 - Fix failure to transfer artifacts from remote repositories caused missing wagon provider for http connections