separate catalog items for plexus-annotations and temorary-mojos extensions

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>

4 files changed, 56 insertions, 29 deletions

diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.plexus-annotations.xml b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.plexus-annotations.xml
new file mode 100644
index 00000000..99ff4182
--- /dev/null
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.plexus-annotations.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lifecycleMappingMetadata>
+  <pluginExecutions>
+    <pluginExecution>
+      <pluginExecutionFilter>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-component-metadata</artifactId>
+        <versionRange>[1.0-beta-3.0.6,)</versionRange>
+        <goals>
+          <goal>generate-metadata</goal>
+          <goal>generate-test-metadata</goal>
+        </goals>
+      </pluginExecutionFilter>
+      <action>
+        <configurator>
+          <id>org.sonatype.m2e.plexus.annotations.plexusConfigurator</id>
+        </configurator>
+      </action>
+    </pluginExecution>
+  </pluginExecutions>
+</lifecycleMappingMetadata>
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.extras.xml b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.temporary-mojos.xml
index 49423021..3f81900b 100644
--- a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.extras.xml
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.temporary-mojos.xml
@@ -103,22 +103,5 @@
       </action>
     </pluginExecution>
 
-    <pluginExecution>
-      <pluginExecutionFilter>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-component-metadata</artifactId>
-        <versionRange>[1.0-beta-3.0.6,)</versionRange>
-        <goals>
-          <goal>generate-metadata</goal>
-          <goal>generate-test-metadata</goal>
-        </goals>
-      </pluginExecutionFilter>
-      <action>
-        <configurator>
-          <id>org.sonatype.m2e.plexus.annotations.plexusConfigurator</id>
-        </configurator>
-      </action>
-    </pluginExecution>
-
   </pluginExecutions>
 </lifecycleMappingMetadata>
\ No newline at end of file
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/plugin.properties b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/plugin.properties
index cecc41fd..874e5f79 100644
--- a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/plugin.properties
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/plugin.properties
@@ -19,8 +19,14 @@ configuratorDescriptor.tycho.overview-summary = Tycho is focused on a Maven-cent
 
 
 # m2e-extras
-configuratorDescriptor.extras.name = m2e-extras
-configuratorDescriptor.extras.description = m2e-extras
-configuratorDescriptor.extras.license = EPL
-configuratorDescriptor.extras.provider = Sonatype, Inc.
-configuratorDescriptor.extras.overview-summary = m2e-extras
+configuratorDescriptor.plexus-annotations.name = plexus-annotations
+configuratorDescriptor.plexus-annotations.description = plexus-annotations
+configuratorDescriptor.plexus-annotations.license = EPL
+configuratorDescriptor.plexus-annotations.provider = Sonatype, Inc.
+configuratorDescriptor.plexus-annotations.overview-summary = plexus-annotations
+
+configuratorDescriptor.temporary-mojos.name = temporary-mojos
+configuratorDescriptor.temporary-mojos.description = temporary-mojos
+configuratorDescriptor.temporary-mojos.license = EPL
+configuratorDescriptor.temporary-mojos.provider = Sonatype, Inc.
+configuratorDescriptor.temporary-mojos.overview-summary = temporary-mojos
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/plugin.xml b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/plugin.xml
index 0e02eaff..7c161d54 100644
--- a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/plugin.xml
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/plugin.xml
@@ -29,17 +29,34 @@
 
       <connectorDescriptor
             categoryId="org.eclipse.m2e.discovery.category.lifecycles"
-            description="%configuratorDescriptor.extras.description"
+            description="%configuratorDescriptor.plexus-annotations.description"
             groupId="lifecycles"
-            id="org.eclipse.m2e.discovery.lifecyclemapping.extras"
+            id="org.eclipse.m2e.discovery.lifecyclemapping.plexus-annotations"
             kind="lifecycles"
-            license="%configuratorDescriptor.extras.license"
-            name="%configuratorDescriptor.extras.name"
-            provider="%configuratorDescriptor.extras.provider"
+            license="%configuratorDescriptor.plexus-annotations.license"
+            name="%configuratorDescriptor.plexus-annotations.name"
+            provider="%configuratorDescriptor.plexus-annotations.provider"
             siteUrl="https://repository.sonatype.org/content/repositories/forge-sites/m2e-extras/0.13.0/N/0.13.0.201102241508/">
-        <iu id="org.sonatype.m2e.temporary.mojos.feature.feature.group"/>
+        <iu id="org.sonatype.m2e.plexus.annotations"/>
          <overview
-               summary="%configuratorDescriptor.extras.overview-summary"
+               summary="%configuratorDescriptor.plexus-annotations.overview-summary"
+               url="http://eclipse.org/tycho/">
+         </overview>
+      </connectorDescriptor>
+
+      <connectorDescriptor
+            categoryId="org.eclipse.m2e.discovery.category.lifecycles"
+            description="%configuratorDescriptor.temporary-mojos.description"
+            groupId="lifecycles"
+            id="org.eclipse.m2e.discovery.lifecyclemapping.temporary-mojos"
+            kind="lifecycles"
+            license="%configuratorDescriptor.temporary-mojos.license"
+            name="%configuratorDescriptor.temporary-mojos.name"
+            provider="%configuratorDescriptor.temporary-mojos.provider"
+            siteUrl="https://repository.sonatype.org/content/repositories/forge-sites/m2e-extras/0.13.0/N/0.13.0.201102241508/">
+        <iu id="org.sonatype.m2e.temporary.mojos"/>
+         <overview
+               summary="%configuratorDescriptor.temporary-mojos.overview-summary"
                url="http://eclipse.org/tycho/">
          </overview>
       </connectorDescriptor>