Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvladt2011-04-26 16:39:29 -0400
committervladt2011-04-26 16:40:03 -0400
commit787c808d588753ee7f4c2257d088138af03448e5 (patch)
tree694e0e9ea1c2d92863bcb0e768d0ca52bfb665ed
parent6f3ca2cea38cd74c38be7dc6c6f450c27026ef2e (diff)
downloadm2e-core-787c808d588753ee7f4c2257d088138af03448e5.tar.gz
m2e-core-787c808d588753ee7f4c2257d088138af03448e5.tar.xz
m2e-core-787c808d588753ee7f4c2257d088138af03448e5.zip
342776: Added support for lifecycle mapping metadata xml files referenced as maven artifacts
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java2
-rw-r--r--org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/connectors.xml20
-rw-r--r--org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/pom.xml3
3 files changed, 23 insertions, 2 deletions
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java
index 0ec2fe59..2c37468e 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java
@@ -111,7 +111,7 @@ public class LifecycleMappingFactory {
public static final String EXTENSION_PROJECT_CONFIGURATORS = IMavenConstants.PLUGIN_ID + ".projectConfigurators"; //$NON-NLS-1$
- private static final String EXTENSION_LIFECYCLE_MAPPING_METADATA_SOURCE = IMavenConstants.PLUGIN_ID
+ public static final String EXTENSION_LIFECYCLE_MAPPING_METADATA_SOURCE = IMavenConstants.PLUGIN_ID
+ ".lifecycleMappingMetadataSource"; //$NON-NLS-1$
private static final String ELEMENT_LIFECYCLE_MAPPING_METADATA = "lifecycleMappingMetadata"; //$NON-NLS-1$
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/connectors.xml b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/connectors.xml
index 6e90b1a8..8d5d0680 100644
--- a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/connectors.xml
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/connectors.xml
@@ -37,6 +37,26 @@
<catalogItems>
<catalogItem>
<categoryId>org.eclipse.m2e.discovery.category.lifecycles</categoryId>
+ <description>m2e discovery catalog publisher</description>
+ <groupId>lifecycles</groupId>
+ <id>org.sonatype.m2e.discovery.publisher.maven-plugin</id>
+ <kind>lifecycles</kind>
+ <license>EPL</license>
+ <name>m2e discovery catalog publisher</name>
+ <provider>Sonatype, Inc.</provider>
+ <maven>
+ <repositoryUrl>http://repository.sonatype.org/content/groups/public</repositoryUrl>
+ <groupId>org.sonatype.m2e.discovery.publisher</groupId>
+ <artifactId>org.sonatype.m2e.discovery.publisher.maven-plugin</artifactId>
+ <classifier>lifecycle-mapping-metadata</classifier>
+ <version>0.0.1-SNAPSHOT</version>
+ </maven>
+ <overview>
+ <summary>m2e discovery catalog publisher</summary>
+ </overview>
+ </catalogItem>
+ <catalogItem>
+ <categoryId>org.eclipse.m2e.discovery.category.lifecycles</categoryId>
<description>Tycho Configurator bridges tycho based projects and PDE</description>
<groupId>lifecycles</groupId>
<id>org.eclipse.m2e.discovery.lifecycles.tycho</id>
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/pom.xml b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/pom.xml
index 895ac9e8..f1816476 100644
--- a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/pom.xml
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/pom.xml
@@ -53,7 +53,7 @@
<pluginManagement>
<plugins>
- <!--TODO TEXT. This plugin's configuration is used in m2e only.-->
+ <!-- This plugin's configuration is used in m2e only.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
@@ -71,6 +71,7 @@
</goals>
</pluginExecutionFilter>
<action>
+ <!-- org.sonatype.m2e.discovery.publisher.maven-plugin uses an Equinox instance, so it cannot be executed from within eclipse -->
<ignore/>
</action>
</pluginExecution>

Back to the top