Moved the project configurators from o.s.m2e.temporary.mojos to separate bundles

10 files changed, 190 insertions, 137 deletions

diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.antlr.pluginxml b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.antlr.pluginxml
new file mode 100644
index 00000000..6536166c
--- /dev/null
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.antlr.pluginxml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.m2e.core.projectConfigurators">
+      <configurator
+            class="org.sonatype.m2e.antlr.internal.AntlrProjectConfigurator"
+            id="org.sonatype.m2e.antlr.antlrConfigurator"
+            name="ANTLR Project Configurator">
+      </configurator>
+   </extension>
+   <extension
+         point="org.eclipse.m2e.core.lifecycleMappingMetadataSource">
+   </extension>
+</plugin>
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.antlr.xml b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.antlr.xml
new file mode 100644
index 00000000..ad89e089
--- /dev/null
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.antlr.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lifecycleMappingMetadata>
+  <pluginExecutions>
+    <pluginExecution>
+      <pluginExecutionFilter>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>antlr-maven-plugin</artifactId>
+        <versionRange>[2.1,)</versionRange>
+        <goals>
+          <goal>generate</goal>
+        </goals>
+      </pluginExecutionFilter>
+      <action>
+        <configurator>
+          <id>org.sonatype.m2e.antlr.antlrConfigurator</id>
+        </configurator>
+      </action>
+    </pluginExecution>
+    <pluginExecution>
+      <pluginExecutionFilter>
+        <groupId>org.antlr</groupId>
+        <artifactId>antlr3-maven-plugin</artifactId>
+        <versionRange>[3.1.1,)</versionRange>
+        <goals>
+          <goal>antlr</goal>
+        </goals>
+      </pluginExecutionFilter>
+      <action>
+        <configurator>
+          <id>org.sonatype.m2e.antlr.antlrConfigurator</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/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.buildhelper.pluginxml b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.buildhelper.pluginxml
new file mode 100644
index 00000000..34c15844
--- /dev/null
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.buildhelper.pluginxml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.m2e.core.projectConfigurators">
+      <configurator
+            class="org.sonatype.m2e.buildhelper.BuildhelperProjectConfigurator"
+            id="org.sonatype.m2e.buildhelper.buildhelperConfigurator"
+            name="build-helper-maven-plugin">
+      </configurator>
+   </extension>
+   <extension
+         point="org.eclipse.m2e.core.lifecycleMappingMetadataSource">
+   </extension>
+</plugin>
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.buildhelper.xml b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.buildhelper.xml
new file mode 100644
index 00000000..a1807b90
--- /dev/null
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.buildhelper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lifecycleMappingMetadata>
+  <pluginExecutions>
+    <pluginExecution>
+      <pluginExecutionFilter>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <versionRange>[1.0,)</versionRange>
+        <goals>
+          <goal>add-source</goal>
+          <goal>add-test-source</goal>
+        </goals>
+      </pluginExecutionFilter>
+      <action>
+        <configurator>
+          <id>org.sonatype.m2e.buildhelper.buildhelperConfigurator</id>
+        </configurator>
+      </action>
+    </pluginExecution>
+    <pluginExecution>
+      <pluginExecutionFilter>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <versionRange>[1.0,)</versionRange>
+        <goals>
+          <goal>maven-version</goal>
+          <goal>parse-version</goal>
+        </goals>
+      </pluginExecutionFilter>
+      <action>
+        <execute/>
+      </action>
+    </pluginExecution>
+  </pluginExecutions>
+</lifecycleMappingMetadata>
\ No newline at end of file
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.mavenarchiver.pomproperties.pluginxml b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.mavenarchiver.pomproperties.pluginxml
new file mode 100644
index 00000000..bdcd3b33
--- /dev/null
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.mavenarchiver.pomproperties.pluginxml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.m2e.core.projectConfigurators">
+      <configurator
+            class="org.sonatype.m2e.mavenarchiver.pomproperties.internal.PomPropertiesConfigurator"
+            id="org.sonatype.m2e.mavenarchiver.pomProperties"
+            name="MavenArchiver pom.properties Generator">
+      </configurator>
+   </extension>
+   <extension
+         point="org.eclipse.m2e.core.lifecycleMappingMetadataSource">
+   </extension>
+</plugin>
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.mavenarchiver.pomproperties.xml b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.mavenarchiver.pomproperties.xml
new file mode 100644
index 00000000..ad2cd10d
--- /dev/null
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.mavenarchiver.pomproperties.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lifecycleMappingMetadata>
+  <pluginExecutions>
+    <pluginExecution>
+      <pluginExecutionFilter>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <versionRange>[2.0,)</versionRange>
+        <goals>
+          <goal>jar</goal>
+        </goals>
+      </pluginExecutionFilter>
+      <action>
+        <configurator>
+          <id>org.sonatype.m2e.mavenarchiver.pomProperties</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/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.modello.pluginxml b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.modello.pluginxml
new file mode 100644
index 00000000..6930a0cb
--- /dev/null
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.modello.pluginxml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.m2e.core.projectConfigurators">
+      <configurator
+            class="org.sonatype.m2e.modello.internal.ModelloProjectConfigurator"
+            id="org.sonatype.m2e.modello.modelloConfigurator"
+            name="Modello Project Configurator">
+      </configurator>
+   </extension>
+   <extension
+         point="org.eclipse.m2e.core.lifecycleMappingMetadataSource">
+   </extension>
+</plugin>
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.modello.xml b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.modello.xml
new file mode 100644
index 00000000..6ae7dc00
--- /dev/null
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.modello.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lifecycleMappingMetadata>
+  <pluginExecutions>
+    <pluginExecution>
+      <pluginExecutionFilter>
+        <groupId>org.codehaus.modello</groupId>
+        <artifactId>modello-maven-plugin</artifactId>
+        <versionRange>[1.0.1,)</versionRange>
+        <goals>
+          <goal>java</goal>
+          <goal>xpp3-reader</goal>
+          <goal>xpp3-writer</goal>
+          <goal>xpp3-extended-reader</goal>
+          <goal>xsd</goal>
+          <goal>stax-reader</goal>
+        </goals>
+      </pluginExecutionFilter>
+      <action>
+        <configurator>
+          <id>org.sonatype.m2e.modello.modelloConfigurator</id>
+        </configurator>
+      </action>
+    </pluginExecution>
+    <pluginExecution>
+      <pluginExecutionFilter>
+        <groupId>org.sonatype.plugins</groupId>
+        <artifactId>modello-plugin-upgrade</artifactId>
+        <versionRange>[1.1,)</versionRange>
+        <goals>
+          <goal>upgrade</goal>
+        </goals>
+      </pluginExecutionFilter>
+      <action>
+        <configurator>
+          <id>org.sonatype.m2e.modello.modelloConfigurator</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/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.temporary-mojos.pluginxml b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.temporary-mojos.pluginxml
deleted file mode 100644
index 0e831f3e..00000000
--- a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.temporary-mojos.pluginxml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         point="org.eclipse.m2e.core.projectConfigurators">
-      <configurator
-            class="org.sonatype.m2e.buildhelper.BuildhelperProjectConfigurator"
-            id="org.sonatype.m2e.buildhelper.buildhelperConfigurator"
-            name="build-helper-maven-plugin">
-      </configurator>
-      <configurator
-            class="org.sonatype.m2e.modello.internal.ModelloProjectConfigurator"
-            id="org.sonatype.m2e.modello.modelloConfigurator"
-            name="Modello Project Configurator">
-      </configurator>
-      <configurator
-            class="org.sonatype.m2e.antlr.internal.AntlrProjectConfigurator"
-            id="org.sonatype.m2e.antlr.antlrConfigurator"
-            name="ANTLR Project Configurator">
-      </configurator>
-      <configurator
-            class="org.sonatype.m2e.pomproperties.internal.PomPropertiesConfigurator"
-            id="org.sonatype.m2e.mavenarchiver.pomProperties"
-            name="MavenArchiver pom.properties Generator">
-      </configurator>
-   </extension>
-   <extension
-         point="org.eclipse.m2e.core.lifecycleMappingMetadataSource">
-   </extension>
-</plugin>
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.temporary-mojos.xml b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.temporary-mojos.xml
deleted file mode 100644
index 3f81900b..00000000
--- a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/lifecycle/org.eclipse.m2e.discovery.lifecyclemapping.temporary-mojos.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<lifecycleMappingMetadata>
-  <pluginExecutions>
-    <pluginExecution>
-      <pluginExecutionFilter>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <versionRange>[1.0,)</versionRange>
-        <goals>
-          <goal>add-source</goal>
-          <goal>add-test-source</goal>
-        </goals>
-      </pluginExecutionFilter>
-      <action>
-        <configurator>
-          <id>org.sonatype.m2e.buildhelper.buildhelperConfigurator</id>
-        </configurator>
-      </action>
-    </pluginExecution>
-
-    <pluginExecution>
-      <pluginExecutionFilter>
-        <groupId>org.codehaus.modello</groupId>
-        <artifactId>modello-maven-plugin</artifactId>
-        <versionRange>[1.0.1,)</versionRange>
-        <goals>
-          <goal>java</goal>
-          <goal>xpp3-reader</goal>
-          <goal>xpp3-writer</goal>
-          <goal>xpp3-extended-reader</goal>
-          <goal>xsd</goal>
-          <goal>stax-reader</goal>
-        </goals>
-      </pluginExecutionFilter>
-      <action>
-        <configurator>
-          <id>org.sonatype.m2e.modello.modelloConfigurator</id>
-        </configurator>
-      </action>
-    </pluginExecution>
-    <pluginExecution>
-      <pluginExecutionFilter>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>modello-plugin-upgrade</artifactId>
-        <versionRange>[1.1,)</versionRange>
-        <goals>
-          <goal>upgrade</goal>
-        </goals>
-      </pluginExecutionFilter>
-      <action>
-        <configurator>
-          <id>org.sonatype.m2e.modello.modelloConfigurator</id>
-        </configurator>
-      </action>
-    </pluginExecution>
-
-
-    <pluginExecution>
-      <pluginExecutionFilter>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>antlr-maven-plugin</artifactId>
-        <versionRange>[2.1,)</versionRange>
-        <goals>
-          <goal>generate</goal>
-        </goals>
-      </pluginExecutionFilter>
-      <action>
-        <configurator>
-          <id>org.sonatype.m2e.antlr.antlrConfigurator</id>
-        </configurator>
-      </action>
-    </pluginExecution>
-    <pluginExecution>
-      <pluginExecutionFilter>
-        <groupId>org.antlr</groupId>
-        <artifactId>antlr3-maven-plugin</artifactId>
-        <versionRange>[3.1.1,)</versionRange>
-        <goals>
-          <goal>antlr</goal>
-        </goals>
-      </pluginExecutionFilter>
-      <action>
-        <configurator>
-          <id>org.sonatype.m2e.antlr.antlrConfigurator</id>
-        </configurator>
-      </action>
-    </pluginExecution>
-
-
-    <pluginExecution>
-      <pluginExecutionFilter>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <versionRange>[2.0,)</versionRange>
-        <goals>
-          <goal>jar</goal>
-        </goals>
-      </pluginExecutionFilter>
-      <action>
-        <configurator>
-          <id>org.sonatype.m2e.mavenarchiver.pomProperties</id>
-        </configurator>
-      </action>
-    </pluginExecution>
-
-  </pluginExecutions>
-</lifecycleMappingMetadata>
\ No newline at end of file