Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvladt2011-04-13 18:28:06 -0400
committervladt2011-04-13 18:29:36 -0400
commit791e819a7f4aa64f8164a37df80b9050508e483f (patch)
treeba0db61c4718d19ebff623dd3bb331b2b434e92a /org.eclipse.m2e.discovery-directory
parent4117e0572e05b88fc75ed9394cdc735b2e959526 (diff)
downloadm2e-core-791e819a7f4aa64f8164a37df80b9050508e483f.tar.gz
m2e-core-791e819a7f4aa64f8164a37df80b9050508e483f.tar.xz
m2e-core-791e819a7f4aa64f8164a37df80b9050508e483f.zip
342776: Build org.eclipse.m2e.discovery.oss as jar, not osgi bundle
Diffstat (limited to 'org.eclipse.m2e.discovery-directory')
-rw-r--r--org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/directory.xml4
-rw-r--r--org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/pom.xml101
-rw-r--r--org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/src/org/eclipse/m2e/discovery/directory/tests/DiscoveryDirectoryTest.java4
-rw-r--r--org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/src/org/eclipse/m2e/discovery/directory/tests/TestM2EBundleStrategy.java77
-rw-r--r--org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-parent/pom.xml36
-rw-r--r--org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/connectors.xml238
-rw-r--r--org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/pom.xml156
8 files changed, 459 insertions, 160 deletions
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/META-INF/MANIFEST.MF b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/META-INF/MANIFEST.MF
index c9018ce9..87ba337e 100644
--- a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/META-INF/MANIFEST.MF
@@ -9,8 +9,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.equinox.p2.discovery,
org.eclipse.equinox.p2.discovery.compatibility,
org.eclipse.equinox.p2.core,
- org.eclipse.equinox.p2.ui.discovery,
- org.eclipse.m2e.discovery.oss
+ org.eclipse.equinox.p2.ui.discovery
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6
Bundle-ClassPath: .
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/directory.xml b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/directory.xml
new file mode 100644
index 00000000..a46c8c86
--- /dev/null
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/directory.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<directory xmlns="http://www.eclipse.org/mylyn/discovery/directory/">
+ <entry url="file:../org.eclipse.m2e.discovery.oss/target/org.eclipse.m2e.discovery.oss-1.0.0-SNAPSHOT.jar" permitCategories="true"/>
+</directory> \ No newline at end of file
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/pom.xml b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/pom.xml
index 31e2dd7e..8d7d1523 100644
--- a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/pom.xml
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/pom.xml
@@ -1,36 +1,71 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>org.eclipse.m2e.discovery-parent</artifactId>
- <groupId>org.eclipse.m2e</groupId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../org.eclipse.m2e.discovery-parent/pom.xml</relativePath>
- </parent>
- <artifactId>org.eclipse.m2e.discovery-directory.tests</artifactId>
- <packaging>eclipse-test-plugin</packaging>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>org.eclipse.m2e.discovery-parent</artifactId>
+ <groupId>org.eclipse.m2e</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../org.eclipse.m2e.discovery-parent/pom.xml</relativePath>
+ </parent>
+ <artifactId>org.eclipse.m2e.discovery-directory.tests</artifactId>
+ <packaging>eclipse-test-plugin</packaging>
- <repositories>
- <repository>
- <id>snapshots</id>
- <url>https://repository.sonatype.org/content/repositories/snapshots/</url>
- </repository>
- <repository>
- <id>m2e-latest-build</id>
- <layout>p2</layout>
- <url>${m2e-core.url}</url>
- </repository>
- </repositories>
+ <repositories>
+ <repository>
+ <id>snapshots</id>
+ <url>https://repository.sonatype.org/content/repositories/snapshots/</url>
+ </repository>
+ <repository>
+ <id>m2e-latest-build</id>
+ <layout>p2</layout>
+ <url>${m2e-core.url}</url>
+ </repository>
+ </repositories>
- <build>
- <sourceDirectory>src</sourceDirectory>
- <resources>
- <resource>
- <directory>src</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- </build>
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>src</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>maven-osgi-test-plugin</artifactId>
+ <configuration>
+ <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
+ <environmentVariables>
+ <TEMP>${java.io.tmpdir}</TEMP>
+ </environmentVariables>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <resolver>p2</resolver>
+ <pomDependencies>consider</pomDependencies>
+ <target>
+ <artifact>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>target-platform</artifactId>
+ <version>0.13.0-SNAPSHOT</version>
+ <classifier>m2e-e37</classifier>
+ </artifact>
+ </target>
+ <ignoreTychoRepositories>true</ignoreTychoRepositories>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project> \ No newline at end of file
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/src/org/eclipse/m2e/discovery/directory/tests/DiscoveryDirectoryTest.java b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/src/org/eclipse/m2e/discovery/directory/tests/DiscoveryDirectoryTest.java
index 58a1f05a..88a32068 100644
--- a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/src/org/eclipse/m2e/discovery/directory/tests/DiscoveryDirectoryTest.java
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/src/org/eclipse/m2e/discovery/directory/tests/DiscoveryDirectoryTest.java
@@ -101,6 +101,8 @@ public class DiscoveryDirectoryTest extends TestCase implements IShellProvider {
public void testImagesPresent() throws Exception {
updateMavenCatalog();
+ assertTrue( "Expected at least one category", catalog.getCategories().size() > 0 );
+
for(CatalogCategory category : catalog.getCategories()) {
assertNotNull("Icon missing for catalog category: " + category.getId(),
getIconImage(category.getSource(), category.getIcon(), 48, true));
@@ -114,6 +116,8 @@ public class DiscoveryDirectoryTest extends TestCase implements IShellProvider {
updateMavenCatalog();
IMetadataRepositoryManager mgr = getMetadataRepositoryManager();
+ assertTrue( "Expected at least one item", catalog.getItems().size() > 0 );
+
for(CatalogItem item : catalog.getItems()) {
URI uri = getUri(item);
if(uri.getHost().equals("localhost")) {
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/src/org/eclipse/m2e/discovery/directory/tests/TestM2EBundleStrategy.java b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/src/org/eclipse/m2e/discovery/directory/tests/TestM2EBundleStrategy.java
index df681e96..352bbbd9 100644
--- a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/src/org/eclipse/m2e/discovery/directory/tests/TestM2EBundleStrategy.java
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-directory.tests/src/org/eclipse/m2e/discovery/directory/tests/TestM2EBundleStrategy.java
@@ -1,43 +1,52 @@
package org.eclipse.m2e.discovery.directory.tests;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IContributor;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.equinox.internal.p2.discovery.AbstractCatalogSource;
-import org.eclipse.equinox.internal.p2.discovery.Policy;
-import org.eclipse.equinox.internal.p2.discovery.compatibility.BundleDiscoverySource;
-import org.eclipse.equinox.internal.p2.discovery.compatibility.ConnectorDiscoveryExtensionReader;
import org.eclipse.m2e.internal.discovery.strategy.M2ERemoteBundleDiscoveryStrategy;
@SuppressWarnings("restriction")
public class TestM2EBundleStrategy extends M2ERemoteBundleDiscoveryStrategy {
+ private static String DIRECTORY_XML_URL = "file:directory.xml";
+ public TestM2EBundleStrategy()
+ {
+ super.setDirectoryUrl( DIRECTORY_XML_URL );
+ }
- @Override
- public void performDiscovery(IProgressMonitor monitor) throws CoreException {
- if (items == null || categories == null) {
- throw new IllegalStateException();
- }
- IExtensionPoint extensionPoint = getExtensionRegistry().getExtensionPoint(ConnectorDiscoveryExtensionReader.EXTENSION_POINT_ID);
- IExtension[] extensions = extensionPoint.getExtensions();
- monitor.beginTask("Loading local extensions", extensions.length == 0 ? 1 : extensions.length);
- try {
- if (extensions.length > 0) {
- processExtensions(new SubProgressMonitor(monitor, extensions.length), extensions);
- }
- } finally {
- monitor.done();
- }
- }
+ @Override
+ public void setDirectoryUrl( String directoryUrl )
+ {
+ super.setDirectoryUrl( DIRECTORY_XML_URL );
+ }
- @Override
- protected AbstractCatalogSource computeDiscoverySource(IContributor contributor) {
- Policy policy = new Policy(true);
- BundleDiscoverySource bundleDiscoverySource = new BundleDiscoverySource(Platform.getBundle(contributor.getName()));
- bundleDiscoverySource.setPolicy(policy);
- return bundleDiscoverySource;
- }
+ // @Override
+ // public void performDiscovery( IProgressMonitor monitor )
+ // throws CoreException
+ // {
+ // if ( items == null || categories == null )
+ // {
+ // throw new IllegalStateException();
+ // }
+ // IExtensionPoint extensionPoint =
+ // getExtensionRegistry().getExtensionPoint( ConnectorDiscoveryExtensionReader.EXTENSION_POINT_ID );
+ // IExtension[] extensions = extensionPoint.getExtensions();
+ // monitor.beginTask( "Loading local extensions", extensions.length == 0 ? 1 : extensions.length );
+ // try
+ // {
+ // if ( extensions.length > 0 )
+ // {
+ // processExtensions( new SubProgressMonitor( monitor, extensions.length ), extensions );
+ // }
+ // }
+ // finally
+ // {
+ // monitor.done();
+ // }
+ // }
+ //
+ // @Override
+ // protected AbstractCatalogSource computeDiscoverySource(IContributor contributor) {
+ // Policy policy = new Policy(true);
+ // BundleDiscoverySource bundleDiscoverySource = new
+ // BundleDiscoverySource(Platform.getBundle(contributor.getName()));
+ // bundleDiscoverySource.setPolicy(policy);
+ // return bundleDiscoverySource;
+ // }
}
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-parent/pom.xml b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-parent/pom.xml
index c7939f5c..308bc59d 100644
--- a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-parent/pom.xml
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery-parent/pom.xml
@@ -20,7 +20,7 @@
<properties>
<discovery.folder>/home/data/users/prapicau/downloads/technology/m2e/discovery/</discovery.folder>
- <tycho-version>0.10.0</tycho-version>
+ <tycho-version>0.11.0</tycho-version>
<!-- References the latest m2eclipse build over https by default -->
<m2e-core.url>https://grid.sonatype.org/ci/view/M2E/job/m2eclipse-core-e37-at-eclipse/jdk=java-5x,label=m2e/lastSuccessfulBuild/artifact/org.eclipse.m2e.site/target/site/</m2e-core.url>
</properties>
@@ -35,40 +35,6 @@
</extension>
</extensions>
<plugins>
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho-version}</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>maven-osgi-test-plugin</artifactId>
- <configuration>
- <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
- <environmentVariables>
- <TEMP>${java.io.tmpdir}</TEMP>
- </environmentVariables>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <resolver>p2</resolver>
- <pomDependencies>consider</pomDependencies>
- <target>
- <artifact>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>target-platform</artifactId>
- <version>0.13.0-SNAPSHOT</version>
- <classifier>m2e-e37</classifier>
- </artifact>
- </target>
- <ignoreTychoRepositories>true</ignoreTychoRepositories>
- </configuration>
- </plugin>
</plugins>
<pluginManagement>
<plugins>
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
new file mode 100644
index 00000000..8cec9e56
--- /dev/null
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/connectors.xml
@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog>
+ <categories>
+ <category>
+ <id>org.eclipse.m2e.discovery.category.lifecycles</id>
+ <name>Lifecycle Mappings</name>
+ <description>Lifecycle Mappings</description>
+ <relevance>30</relevance>
+ <icon>
+ <size>48</size>
+ <path>images/extras-48.png</path>
+ </icon>
+ <groupId>lifecycles</groupId>
+ </category>
+ <category>
+ <id>org.eclipse.m2e.discovery.category.scm</id>
+ <name>m2e Team providers</name>
+ <description>m2e integration with Eclipse team providers</description>
+ <relevance>10</relevance>
+ <icon>
+ <size>48</size>
+ <path>images/extras-48.png</path>
+ </icon>
+ </category>
+ <category>
+ <id>org.eclipse.m2e.discovery.category.maven</id>
+ <name>embedded maven runtimes</name>
+ <description>embedded maven runtimes</description>
+ <relevance>10</relevance>
+ <icon>
+ <size>48</size>
+ <path>images/extras-48.png</path>
+ </icon>
+ </category>
+ </categories>
+ <catalogItems>
+ <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>
+ <kind>lifecycles</kind>
+ <license>EPL</license>
+ <name>Tycho Configurator</name>
+ <provider>Sonatype, Inc.</provider>
+ <p2>
+ <siteUrl>https://repository.sonatype.org/content/repositories/forge-sites/m2eclipse-tycho/0.5.0/N/0.5.0.201104051705</siteUrl>
+ <iuId>org.sonatype.tycho.m2e.feature.feature.group</iuId>
+ <lifecycleMappingIU>
+ <iuId>org.sonatype.tycho.m2e</iuId>
+ </lifecycleMappingIU>
+ </p2>
+ <overview>
+ <summary>Tycho is focused on a Maven-centric, manifest-first approach to building Eclipse plug-ins, features, update sites, RCP applications and OSGi bundles. Tycho is a set of Maven plugins and extensions for building Eclipse plugins and OSGi bundles with Maven. Eclipse plugins and OSGi bundles have their own metadata for expressing dependencies, source folder locations, etc. that are normally found in a Maven POM. Tycho uses native metadata for Eclipse plugins and OSGi bundles and uses
+ the POM to configure and drive the build. Tycho supports bundles, fragments, features, update site projects and RCP applications. Tycho also knows how to run JUnit test plugins using OSGi runtime and there is also support for sharing build results using Maven artifact repositories. Tycho plugins introduce new packaging types and the corresponding lifecycle bindings that allow Maven to use OSGi and Eclipse metadata during a Maven build. </summary>
+ <url>http://eclipse.org/tycho/</url>
+ </overview>
+ </catalogItem>
+ <catalogItem>
+ <categoryId>org.eclipse.m2e.discovery.category.lifecycles</categoryId>
+ <description>antlr</description>
+ <groupId>lifecycles</groupId>
+ <id>org.eclipse.m2e.discovery.lifecyclemapping.antlr</id>
+ <kind>lifecycles</kind>
+ <license>EPL</license>
+ <name>antlr</name>
+ <provider>Sonatype, Inc.</provider>
+ <p2>
+ <siteUrl>https://repository.sonatype.org/content/repositories/forge-sites/m2e-extras/0.13.0/N/0.13.0.201104061100/</siteUrl>
+ <iuId>org.sonatype.m2e.antlr</iuId>
+ </p2>
+ <overview>
+ <summary>antlr</summary>
+ </overview>
+ </catalogItem>
+ <catalogItem>
+ <categoryId>org.eclipse.m2e.discovery.category.lifecycles</categoryId>
+ <description>buildhelper</description>
+ <groupId>lifecycles</groupId>
+ <id>org.eclipse.m2e.discovery.lifecyclemapping.buildhelper</id>
+ <kind>lifecycles</kind>
+ <license>EPL</license>
+ <name>buildhelper</name>
+ <provider>Sonatype, Inc.</provider>
+ <p2>
+ <siteUrl>https://repository.sonatype.org/content/repositories/forge-sites/m2e-extras/0.13.0/N/0.13.0.201104061100/</siteUrl>
+ <iuId>org.sonatype.m2e.buildhelper</iuId>
+ </p2>
+ <overview>
+ <summary>buildhelper</summary>
+ </overview>
+ </catalogItem>
+ <catalogItem>
+ <categoryId>org.eclipse.m2e.discovery.category.lifecycles</categoryId>
+ <description>mavenarchiver pomproperties</description>
+ <groupId>lifecycles</groupId>
+ <id>org.eclipse.m2e.discovery.lifecyclemapping.mavenarchiver.pomproperties</id>
+ <kind>lifecycles</kind>
+ <license>EPL</license>
+ <name>mavenarchiver pomproperties</name>
+ <provider>Sonatype, Inc.</provider>
+ <p2>
+ <siteUrl>https://repository.sonatype.org/content/repositories/forge-sites/m2e-extras/0.13.0/N/0.13.0.201104061100/</siteUrl>
+ <iuId>org.sonatype.m2e.mavenarchiver.pomproperties</iuId>
+ </p2>
+ <overview>
+ <summary>mavenarchiver pomproperties</summary>
+ </overview>
+ </catalogItem>
+ <catalogItem>
+ <categoryId>org.eclipse.m2e.discovery.category.lifecycles</categoryId>
+ <description>modello</description>
+ <groupId>lifecycles</groupId>
+ <id>org.eclipse.m2e.discovery.lifecyclemapping.modello</id>
+ <kind>lifecycles</kind>
+ <license>EPL</license>
+ <name>modello</name>
+ <provider>Sonatype, Inc.</provider>
+ <p2>
+ <siteUrl>https://repository.sonatype.org/content/repositories/forge-sites/m2e-extras/0.13.0/N/0.13.0.201104061100/</siteUrl>
+ <iuId>org.sonatype.m2e.modello</iuId>
+ </p2>
+ <overview>
+ <summary>modello</summary>
+ </overview>
+ </catalogItem>
+ <catalogItem>
+ <categoryId>org.eclipse.m2e.discovery.category.lifecycles</categoryId>
+ <description>plexus-annotations</description>
+ <groupId>lifecycles</groupId>
+ <id>org.eclipse.m2e.discovery.lifecyclemapping.plexus-annotations</id>
+ <kind>lifecycles</kind>
+ <license>EPL</license>
+ <name>plexus-annotations</name>
+ <provider>Sonatype, Inc.</provider>
+ <p2>
+ <siteUrl>https://repository.sonatype.org/content/repositories/forge-sites/m2e-extras/0.13.0/N/0.13.0.201104061100/</siteUrl>
+ <iuId>org.sonatype.m2e.plexus.annotations</iuId>
+ </p2>
+ <overview>
+ <summary>plexus-annotations</summary>
+ </overview>
+ </catalogItem>
+ <catalogItem>
+ <categoryId>org.eclipse.m2e.discovery.category.lifecycles</categoryId>
+ <description>m2e-wtp</description>
+ <groupId>lifecycles</groupId>
+ <id>org.eclipse.m2e.discovery.lifecyclemapping.m2e-wtp</id>
+ <kind>lifecycles</kind>
+ <license>EPL</license>
+ <name>m2e-wtp</name>
+ <provider>Sonatype, Inc.</provider>
+ <p2>
+ <siteUrl>https://repository.sonatype.org/content/repositories/forge-sites/m2eclipse-wtp/0.13.0/N/0.13.0.201103072204</siteUrl>
+ <iuId>org.maven.ide.eclipse.wtp.feature.feature.group</iuId>
+ <lifecycleMappingIU>
+ <iuId>org.maven.ide.eclipse.wtp</iuId>
+ </lifecycleMappingIU>
+ </p2>
+ <overview>
+ <summary>m2e-wtp</summary>
+ <url>https://github.com/sonatype/m2eclipse-wtp</url>
+ </overview>
+ </catalogItem>
+ <catalogItem>
+ <categoryId>org.eclipse.m2e.discovery.category.scm</categoryId>
+ <description>Maven SCM Handler for EGit</description>
+ <groupId>extras</groupId>
+ <id>org.eclipse.m2e.discovery.lifecyclemapping.m2e-egit</id>
+ <kind>extras</kind>
+ <license>EPL</license>
+ <name>m2e-egit</name>
+ <provider>Sonatype, Inc.</provider>
+ <p2>
+ <siteUrl>https://repository.sonatype.org/content/repositories/forge-sites/m2eclipse-egit/0.13.0/N/0.13.0.201103031543/</siteUrl>
+ <iuId>org.sonatype.m2e.egit.feature.feature.group</iuId>
+ </p2>
+ <overview>
+ <summary>Maven SCM Handler for EGit</summary>
+ <url>https://github.com/sonatype/m2eclipse-egit</url>
+ </overview>
+ </catalogItem>
+ <catalogItem>
+ <categoryId>org.eclipse.m2e.discovery.category.scm</categoryId>
+ <description>Maven SCM Handler for CVS</description>
+ <groupId>extras</groupId>
+ <id>org.eclipse.m2e.discovery.lifecyclemapping.m2e-cvs</id>
+ <kind>extras</kind>
+ <license>EPL</license>
+ <name>m2e-cvs</name>
+ <provider>Sonatype, Inc.</provider>
+ <p2>
+ <siteUrl>https://repository.sonatype.org/content/sites/forge-sites/m2eclipse-cvs/0.13.0/N/0.13.0.201103071338/</siteUrl>
+ <iuId>org.sonatype.m2e.cvs.feature.feature.group</iuId>
+ </p2>
+ <overview>
+ <summary>Maven SCM Handler for CVS</summary>
+ <url>https://github.com/sonatype/m2eclipse-cvs</url>
+ </overview>
+ </catalogItem>
+ <catalogItem>
+ <categoryId>org.eclipse.m2e.discovery.category.scm</categoryId>
+ <description>Maven SCM Handler for Subversive</description>
+ <groupId>extras</groupId>
+ <id>org.eclipse.m2e.discovery.lifecyclemapping.m2e-subversive</id>
+ <kind>extras</kind>
+ <license>EPL</license>
+ <name>m2e-subversive</name>
+ <provider>Sonatype, Inc.</provider>
+ <p2>
+ <siteUrl>https://repository.sonatype.org/content/sites/forge-sites/m2eclipse-subversive/0.13.0/N/0.13.0.201103011512/</siteUrl>
+ <iuId>org.sonatype.m2e.subversive.feature.feature.group</iuId>
+ </p2>
+ <overview>
+ <summary>Maven SCM Handler for Subversive</summary>
+ <url>https://github.com/sonatype/m2eclipse-subversive</url>
+ </overview>
+ </catalogItem>
+ <catalogItem>
+ <categoryId>org.eclipse.m2e.discovery.category.maven</categoryId>
+ <description>Embedded Maven Runtime version 3.0.3</description>
+ <groupId>maven</groupId>
+ <id>org.eclipse.m2e.discovery.maven-runtime-3.0.3</id>
+ <kind>maven</kind>
+ <license>EPL</license>
+ <name>maven.runtime.3.0.3</name>
+ <provider>Sonatype, Inc.</provider>
+ <p2>
+ <siteUrl>https://repository.sonatype.org/content/sites/forge-sites/m2eclipse-subversive/0.13.0/N/0.13.0.201103011512/</siteUrl>
+ <iuId>org.sonatype.m2e.subversive.feature.feature.group</iuId>
+ </p2>
+ <overview>
+ <summary>Embedded Maven Runtime version 3.0.3</summary>
+ <url>http://www.sonatype.com/</url>
+ </overview>
+ </catalogItem>
+ </catalogItems>
+</catalog>
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 9c287754..f7b709f8 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
@@ -1,62 +1,106 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <parent>
- <artifactId>org.eclipse.m2e.discovery-parent</artifactId>
- <groupId>org.eclipse.m2e</groupId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../org.eclipse.m2e.discovery-parent/pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <parent>
+ <artifactId>org.eclipse.m2e.discovery-parent</artifactId>
+ <groupId>org.eclipse.m2e</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../org.eclipse.m2e.discovery-parent/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
- <artifactId>org.eclipse.m2e.discovery.oss</artifactId>
- <packaging>eclipse-plugin</packaging>
+ <artifactId>org.eclipse.m2e.discovery.oss</artifactId>
+ <packaging>jar</packaging>
- <build>
- <resources>
- <resource>
- <targetPath>.</targetPath>
- <filtering>false</filtering>
- <directory>${basedir}/</directory>
- <includes>
- <include>plugin.*</include>
- <include>images/**</include>
- <include>lifecycle/**</include>
- </includes>
- </resource>
- </resources>
- </build>
+ <build>
+ <resources>
+ <resource>
+ <targetPath>.</targetPath>
+ <filtering>false</filtering>
+ <directory>${basedir}/</directory>
+ <includes>
+ <include>plugin.*</include>
+ <include>images/**</include>
+ <include>lifecycle/**</include>
+ </includes>
+ </resource>
+ </resources>
+ <!--
+ <plugins>
+ <plugin>
+ <groupId>org.sonatype.m2e.discovery.publisher</groupId>
+ <artifactId>org.sonatype.m2e.discovery.publisher.maven-plugin</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>standard</id>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ -->
+ <pluginManagement>
+ <plugins>
+ <!--TODO TEXT. This plugin's configuration is used in m2e only.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.sonatype.m2e.discovery.publisher</groupId>
+ <artifactId>org.sonatype.m2e.discovery.publisher.maven-plugin</artifactId>
+ <versionRange>[0.0.1-SNAPSHOT,)</versionRange>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore/>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
- <profiles>
- <profile>
- <id>publish-site</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>wagon-maven-plugin</artifactId>
- <version>1.0-beta-4-SNAPSHOT</version>
- <executions>
- <execution>
- <id>upload-file</id>
- <phase>deploy</phase>
- <goals>
- <goal>upload</goal>
- </goals>
- <configuration>
- <fromDir>${project.build.directory}</fromDir>
- <serverId>download.eclipse.org</serverId>
- <includes>org.eclipse.m2e.discovery.oss-1.0.0-SNAPSHOT.jar</includes>
- <url>scpexe://dev.eclipse.org/</url>
- <toDir>${discovery.folder}/${project.artifactId}/</toDir>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>publish-site</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>wagon-maven-plugin</artifactId>
+ <version>1.0-beta-4-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>upload-file</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>upload</goal>
+ </goals>
+ <configuration>
+ <fromDir>${project.build.directory}</fromDir>
+ <serverId>download.eclipse.org</serverId>
+ <includes>org.eclipse.m2e.discovery.oss-1.0.0-SNAPSHOT.jar</includes>
+ <url>scpexe://dev.eclipse.org/</url>
+ <toDir>${discovery.folder}/${project.artifactId}/</toDir>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
- </profile>
- </profiles>
+ </profile>
+ </profiles>
</project> \ No newline at end of file

Back to the top