Make m2e.core.ui host of archetype-fragments and delete archetype.common

The Plugin o.e.m2e.archetype.common is empty and only serves as host for
the maven-archetype fragment-bundles. Since they are only used by
m2e.core.ui, we can simply make that the host of those fragments and
save one project in m2e.

In o.e.m2e.core.ui import all required packages plus those that are from
fragments that are also needed for archetype.common to function
properly, even if the package is not directly needed in m2e.core.ui.

org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF

@@ -33,7 +33,6 @@ Require-Bundle: org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.core.runtime;bundle-version="3.5.0",
  org.eclipse.m2e.model.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.m2e.maven.runtime;bundle-version="[3.8.6,4.0.0)",
- org.eclipse.m2e.archetype.common;bundle-version="[3.2.1,4.0.0)",
  org.eclipse.ui.console;bundle-version="3.4.0",
  org.eclipse.ui.ide;bundle-version="3.18.0",
  org.eclipse.core.filesystem;bundle-version="1.2.1",
@@ -43,7 +42,14 @@ Require-Bundle: org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.core.filebuffers,
  org.eclipse.ui,
  org.eclipse.ui.navigator
-Import-Package: org.eclipse.compare.rangedifferencer,
+Import-Package: org.apache.maven.archetype.catalog;provider=m2e;version="[3.2.1,4.0.0)",
+ org.apache.maven.archetype.catalog.io.xpp3;provider=m2e;version="[3.2.1,4.0.0)",
+ org.apache.maven.archetype.common;provider=m2e;version="[3.2.1,4.0.0)",
+ org.apache.maven.archetype.exception;provider=m2e;version="[3.2.1,4.0.0)",
+ org.apache.maven.archetype.metadata;provider=m2e;version="[3.2.1,4.0.0)",
+ org.apache.maven.archetype.source;provider=m2e;version="[3.2.1,4.0.0)",
+ org.apache.maven.shared.transfer.artifact;provider=m2e;version="[0.13.1,1.0.0)",
+ org.eclipse.compare.rangedifferencer,
  org.eclipse.ltk.core.refactoring,
  org.slf4j;version="[1.7.0,3.0.0)"
 Service-Component: OSGI-INF/component.xml,

org.eclipse.m2e.feature/build.properties

@@ -13,3 +13,4 @@
 bin.includes = feature.xml,\
                feature.properties,\
                p2.inf
+pom.model.property.tycho.baseline.skip = true

org.eclipse.m2e.feature/feature.xml

@@ -26,7 +26,33 @@
          id="org.eclipse.m2e.archetype.common"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.m2e.archetype.catalog"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.m2e.archetype.descriptor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.m2e.archetype.maven-artifact-transfer"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.m2e.model.edit"

org.eclipse.m2e.repository/category.xml

@@ -29,16 +29,6 @@
    <bundle id="org.apache.commons.cli"/>
    <bundle id="org.apache.commons.cli.source"/>
    <bundle id="jakarta.servlet-api"/>
-   <bundle id="org.eclipse.m2e.archetype.jdom2"/>
-   <bundle id="org.eclipse.m2e.archetype.jdom2.source"/>
-   <bundle id="org.eclipse.m2e.archetype.archetype-catalog"/>
-   <bundle id="org.eclipse.m2e.archetype.archetype-catalog.source"/>
-   <bundle id="org.eclipse.m2e.archetype.archetype-common"/>
-   <bundle id="org.eclipse.m2e.archetype.archetype-common.source"/>
-   <bundle id="org.eclipse.m2e.archetype.archetype-descriptor"/>
-   <bundle id="org.eclipse.m2e.archetype.archetype-descriptor.source"/>
-   <bundle id="org.eclipse.m2e.archetype.maven-artifact-transfer"/>
-   <bundle id="org.eclipse.m2e.archetype.maven-artifact-transfer.source"/>
    <iu>
      <query> 
        <expression type="match">

pom.xml

@@ -42,7 +42,6 @@
 
 		<module>org.eclipse.m2e.maven.runtime</module>
 
-		<module>org.eclipse.m2e.archetype.common</module>
 		<module>org.eclipse.m2e.model.edit</module>
 		<module>org.eclipse.m2e.core</module>
 		<module>org.eclipse.m2e.core.ui</module>