Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.m2e.feature/feature.xml7
-rw-r--r--org.eclipse.m2e.importer.feature/build.properties2
-rw-r--r--org.eclipse.m2e.importer.feature/feature.properties39
-rw-r--r--org.eclipse.m2e.importer.feature/feature.xml32
-rw-r--r--org.eclipse.m2e.importer.feature/pom.xml22
-rw-r--r--org.eclipse.m2e.importer.tests/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.m2e.importer.tests/src/org/eclipse/m2e/importer/tests/MavenImporterTest.java20
-rw-r--r--org.eclipse.m2e.importer/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.m2e.importer/plugin.xml2
-rw-r--r--org.eclipse.m2e.importer/src/org/eclipse/m2e/importer/internal/MavenProjectConfigurator.java57
-rw-r--r--org.eclipse.m2e.incubation.site/category.xml10
-rw-r--r--org.eclipse.m2e.incubation.site/org.eclipse.m2e.incubation.site.product10
-rw-r--r--org.eclipse.m2e.incubation.site/pom.xml95
-rw-r--r--org.eclipse.m2e.incubation.site/src/main/assembly/assembly.xml15
-rw-r--r--pom.xml30
15 files changed, 71 insertions, 275 deletions
diff --git a/org.eclipse.m2e.feature/feature.xml b/org.eclipse.m2e.feature/feature.xml
index 5fac12a7..a3296d9e 100644
--- a/org.eclipse.m2e.feature/feature.xml
+++ b/org.eclipse.m2e.feature/feature.xml
@@ -163,4 +163,11 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.m2e.importer"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/org.eclipse.m2e.importer.feature/build.properties b/org.eclipse.m2e.importer.feature/build.properties
deleted file mode 100644
index b3a611b5..00000000
--- a/org.eclipse.m2e.importer.feature/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = feature.xml,\
- feature.properties
diff --git a/org.eclipse.m2e.importer.feature/feature.properties b/org.eclipse.m2e.importer.feature/feature.properties
deleted file mode 100644
index 982b9b75..00000000
--- a/org.eclipse.m2e.importer.feature/feature.properties
+++ /dev/null
@@ -1,39 +0,0 @@
-###############################################################################
-# Copyright (c) 20015 Red Hat Inc. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Mickael Istria (Red Hat Inc.)
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=m2e support for Smart Import (Optional, Incubating)
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org - m2e
-
-# "updateSiteName" property - label for the update site
-#updateSiteName=The Eclipse Project Updates
-
-# "description" property - description of the feature
-description=This adds to the Smart Import framework support for Maven projects with m2e.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2015-2016 Red Hat Inc. and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- Mickael Istria (Red Hat Inc.)
-################ end of copyright property ####################################
diff --git a/org.eclipse.m2e.importer.feature/feature.xml b/org.eclipse.m2e.importer.feature/feature.xml
deleted file mode 100644
index 51256512..00000000
--- a/org.eclipse.m2e.importer.feature/feature.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.m2e.importer.feature"
- label="%featureName"
- version="1.7.0.qualifier"
- provider-name="%providerName"
- license-feature="org.eclipse.license"
- license-feature-version="0.0.0">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <requires>
- <import feature="org.eclipse.m2e.feature" />
- </requires>
-
- <plugin
- id="org.eclipse.m2e.importer"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-</feature>
diff --git a/org.eclipse.m2e.importer.feature/pom.xml b/org.eclipse.m2e.importer.feature/pom.xml
deleted file mode 100644
index 1db19d23..00000000
--- a/org.eclipse.m2e.importer.feature/pom.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2015 Red Hat Inc.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
--->
-<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>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>m2e-core</artifactId>
- <version>1.7.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>org.eclipse.m2e.importer.feature</artifactId>
- <packaging>eclipse-feature</packaging>
-
-</project>
diff --git a/org.eclipse.m2e.importer.tests/META-INF/MANIFEST.MF b/org.eclipse.m2e.importer.tests/META-INF/MANIFEST.MF
index 9d25c7fc..0219fdcb 100644
--- a/org.eclipse.m2e.importer.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.importer.tests/META-INF/MANIFEST.MF
@@ -7,10 +7,10 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Require-Bundle: org.eclipse.m2e.importer;bundle-version="[1.7.0,1.8.0)",
+ org.eclipse.ui.ide,
org.junit;bundle-version="4.12.0",
org.eclipse.m2e.core;bundle-version="[1.7.0,1.8.0)",
org.eclipse.core.resources,
- org.eclipse.e4.ui.importer;bundle-version="0.2.0",
org.eclipse.core.runtime,
org.eclipse.ui.workbench,
org.apache.ant,
diff --git a/org.eclipse.m2e.importer.tests/src/org/eclipse/m2e/importer/tests/MavenImporterTest.java b/org.eclipse.m2e.importer.tests/src/org/eclipse/m2e/importer/tests/MavenImporterTest.java
index 87330b97..5a900390 100644
--- a/org.eclipse.m2e.importer.tests/src/org/eclipse/m2e/importer/tests/MavenImporterTest.java
+++ b/org.eclipse.m2e.importer.tests/src/org/eclipse/m2e/importer/tests/MavenImporterTest.java
@@ -17,20 +17,22 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.junit.Assert;
+import org.junit.Test;
+
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.ui.internal.wizards.datatransfer.SmartImportJob;
+import org.eclipse.ui.wizards.datatransfer.ProjectConfigurator;
+
import org.eclipse.m2e.core.MavenPlugin;
import org.eclipse.m2e.core.project.IMavenProjectFacade;
import org.eclipse.m2e.importer.internal.MavenProjectConfigurator;
import org.eclipse.m2e.tests.common.AbstractMavenProjectTestCase;
import org.eclipse.m2e.tests.common.JobHelpers;
import org.eclipse.m2e.tests.common.JobHelpers.IJobMatcher;
-import org.eclipse.ui.internal.wizards.datatransfer.EasymportJob;
-import org.eclipse.ui.wizards.datatransfer.ProjectConfigurator;
-import org.junit.Assert;
-import org.junit.Test;
public class MavenImporterTest extends AbstractMavenProjectTestCase {
@@ -47,7 +49,7 @@ public class MavenImporterTest extends AbstractMavenProjectTestCase {
new File(outputDirectory, "module1/.classpath").delete();
Set<IProject> newProjects = null;
- EasymportJob job = new EasymportJob(outputDirectory, Collections.EMPTY_SET, true, true);
+ SmartImportJob job = new SmartImportJob(outputDirectory, Collections.EMPTY_SET, true, true);
Map<File, List<ProjectConfigurator>> proposals = job.getImportProposals(monitor);
Assert.assertEquals("Expected 2 projects to import", 2, proposals.size()); //$NON-NLS-1$
@@ -71,10 +73,10 @@ public class MavenImporterTest extends AbstractMavenProjectTestCase {
Assert.assertEquals("Expected only 2 new projects", 2, newProjects.size()); //$NON-NLS-1$
JobHelpers.waitForJobs(new IJobMatcher() {
- public boolean matches(Job job) {
- return MavenProjectConfigurator.UPDATE_MAVEN_CONFIGURATION_JOB_NAME.equals(job.getName());
- }
- }, 30_000);
+ public boolean matches(Job job) {
+ return MavenProjectConfigurator.UPDATE_MAVEN_CONFIGURATION_JOB_NAME.equals(job.getName());
+ }
+ }, 30_000);
for(IProject project : newProjects) {
Assert
diff --git a/org.eclipse.m2e.importer/META-INF/MANIFEST.MF b/org.eclipse.m2e.importer/META-INF/MANIFEST.MF
index 9e5bd696..79b77855 100644
--- a/org.eclipse.m2e.importer/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.importer/META-INF/MANIFEST.MF
@@ -5,11 +5,10 @@ Bundle-SymbolicName: org.eclipse.m2e.importer;singleton:=true
Bundle-Version: 1.7.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.e4.ui.importer,
+Require-Bundle: org.eclipse.ui.ide,
org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.core.resources,
- org.eclipse.ui.ide,
org.eclipse.m2e.core;bundle-version="1.6.0",
org.eclipse.m2e.core.ui;bundle-version="1.6.0",
org.slf4j.api;bundle-version="1.6.2"
diff --git a/org.eclipse.m2e.importer/plugin.xml b/org.eclipse.m2e.importer/plugin.xml
index d1d0b96e..d264277e 100644
--- a/org.eclipse.m2e.importer/plugin.xml
+++ b/org.eclipse.m2e.importer/plugin.xml
@@ -2,7 +2,7 @@
<?eclipse version="3.4"?>
<plugin>
<extension
- point="org.eclipse.e4.ui.importer.projectConfigurators">
+ point="org.eclipse.ui.ide.projectConfigurators">
<projectConfigurator
class="org.eclipse.m2e.importer.internal.MavenProjectConfigurator"
label="Maven">
diff --git a/org.eclipse.m2e.importer/src/org/eclipse/m2e/importer/internal/MavenProjectConfigurator.java b/org.eclipse.m2e.importer/src/org/eclipse/m2e/importer/internal/MavenProjectConfigurator.java
index ec1f42fc..ce85b84b 100644
--- a/org.eclipse.m2e.importer/src/org/eclipse/m2e/importer/internal/MavenProjectConfigurator.java
+++ b/org.eclipse.m2e.importer/src/org/eclipse/m2e/importer/internal/MavenProjectConfigurator.java
@@ -12,6 +12,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedList;
+import java.util.List;
import java.util.Map;
import java.util.Queue;
import java.util.Set;
@@ -32,6 +33,7 @@ import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.m2e.core.MavenPlugin;
import org.eclipse.m2e.core.internal.IMavenConstants;
+import org.eclipse.m2e.core.internal.jobs.IBackgroundProcessingQueue;
import org.eclipse.m2e.core.internal.lifecyclemapping.discovery.LifecycleMappingDiscoveryRequest;
import org.eclipse.m2e.core.internal.project.ProjectConfigurationManager;
import org.eclipse.m2e.core.project.IProjectConfigurationManager;
@@ -41,7 +43,7 @@ import org.eclipse.m2e.core.project.MavenUpdateRequest;
import org.eclipse.m2e.core.project.ResolverConfiguration;
import org.eclipse.m2e.core.ui.internal.wizards.LifecycleMappingDiscoveryHelper;
import org.eclipse.m2e.core.ui.internal.wizards.MappingDiscoveryJob;
-import org.eclipse.ui.internal.wizards.datatransfer.EasymportJob;
+import org.eclipse.ui.internal.wizards.datatransfer.SmartImportJob;
import org.eclipse.ui.wizards.datatransfer.ProjectConfigurator;
public class MavenProjectConfigurator implements ProjectConfigurator {
@@ -69,7 +71,7 @@ public class MavenProjectConfigurator implements ProjectConfigurator {
try {
// This makes job execution wait until the main Import job is completed
// So the mapping discovery happens as a next step, after projects are imported in workspace
- getJobManager().join(EasymportJob.class, monitor);
+ getJobManager().join(SmartImportJob.class, monitor);
} catch (InterruptedException ex) {
throw new CoreException(new Status(IStatus.WARNING,
Activator.getDefault().getBundle().getSymbolicName(), ex.getMessage(), ex));
@@ -114,7 +116,7 @@ public class MavenProjectConfigurator implements ProjectConfigurator {
* @author mistria
*
*/
- private static class UpdateMavenConfigurationJob extends Job {
+ public static class UpdateMavenConfigurationJob extends Job implements IBackgroundProcessingQueue {
private static UpdateMavenConfigurationJob INSTANCE;
private Set<IProject> toProcess;
@@ -146,7 +148,7 @@ public class MavenProjectConfigurator implements ProjectConfigurator {
}
@Override
- protected IStatus run(IProgressMonitor monitor) {
+ public IStatus run(IProgressMonitor monitor) {
Set<IProject> toProcessNow = new HashSet<IProject>();
while (!monitor.isCanceled()) {
synchronized (this.toProcess) {
@@ -172,13 +174,14 @@ public class MavenProjectConfigurator implements ProjectConfigurator {
"Cancelled by user");
}
+ @Override
+ public boolean isEmpty() {
+ return this.toProcess.isEmpty();
+ }
+
}
- // TODO Uncomment @Override when following API got merged.
- // this is commented in order to check it in build before API is available
- // and avoid
- // build failure because inteface doesn't declare the method (yet).
- // @Override
+ @Override
public Set<File> findConfigurableLocations(File root, IProgressMonitor monitor) {
LocalProjectScanner scanner = new LocalProjectScanner(
ResourcesPlugin.getWorkspace().getRoot().getLocation().toFile(), root.getAbsolutePath(), false,
@@ -199,13 +202,36 @@ public class MavenProjectConfigurator implements ProjectConfigurator {
}
return res;
}
+
+ // TODO Uncomment @Override when this method API is exposed in ProjectConfigurator
+ // @Override
+ public void removeDirtyDirectories(Map<File, List<ProjectConfigurator>> proposals) {
+ Set<File> toRemove = new HashSet<File>();
+ for (File directory : proposals.keySet()) {
+ String path = directory.getAbsolutePath();
+ if (!path.endsWith(File.separator)) {
+ path += File.separator;
+ }
+ int index = path.indexOf(File.separator + "target" + File.separator); //$NON-NLS-1$
+ if (index >= 0) {
+ File potentialPomFile = new File(path.substring(0, index), "pom.xml"); //$NON-NLS-1$
+ if (potentialPomFile.isFile()) {
+ toRemove.add(directory);
+ }
+ }
+ }
+ for (File directory : toRemove) {
+ proposals.remove(directory);
+ }
+ }
@Override
public boolean canConfigure(IProject project, Set<IPath> ignoredPaths, IProgressMonitor monitor) {
return shouldBeAnEclipseProject(project, monitor);
}
- @Override
+ // TODO this method is going to be removed from API.
+ // When done, also remove this method implementation.
public IWizard getConfigurationWizard() {
// no need for a wizard, will just set up the m2e nature
return null;
@@ -259,8 +285,9 @@ public class MavenProjectConfigurator implements ProjectConfigurator {
// }
}
- @Override
- public Set<IFolder> getDirectoriesToIgnore(IProject project, IProgressMonitor monitor) {
+ // Prepare for compatibility with M7
+ // @Override
+ public Set<IFolder> getFoldersToIgnore(IProject project, IProgressMonitor monitor) {
Set<IFolder> res = new HashSet<IFolder>();
// TODO: get these values from pom/project config
res.add(project.getFolder("src"));
@@ -268,4 +295,10 @@ public class MavenProjectConfigurator implements ProjectConfigurator {
return res;
}
+ // Prepare for compatibility with M7
+ // @Override
+ public Set<IFolder> getDirectoriesToIgnore(IProject project, IProgressMonitor monitor) {
+ return getFoldersToIgnore(project, monitor);
+ }
+
}
diff --git a/org.eclipse.m2e.incubation.site/category.xml b/org.eclipse.m2e.incubation.site/category.xml
deleted file mode 100644
index 5aca8141..00000000
--- a/org.eclipse.m2e.incubation.site/category.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
- <description url="http://m2eclipse.sonatype.org/site">
- Maven Integration for Eclipse
- </description>
- <feature id="org.eclipse.m2e.importer.feature" version="0.0.0">
- <category name="m2e.incubation"/>
- </feature>
- <category-def name="m2e.incubation" label="Maven Integration for Eclipse - Incubating features"/>
-</site>
diff --git a/org.eclipse.m2e.incubation.site/org.eclipse.m2e.incubation.site.product b/org.eclipse.m2e.incubation.site/org.eclipse.m2e.incubation.site.product
deleted file mode 100644
index 0f0f7a04..00000000
--- a/org.eclipse.m2e.incubation.site/org.eclipse.m2e.incubation.site.product
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product uid="org.eclipse.m2e.incubation.site" version="1.7.0.qualifier" useFeatures="true" includeLaunchers="false">
-
- <features>
- <feature id="org.eclipse.m2e.importer.feature" />
- </features>
-
-</product>
diff --git a/org.eclipse.m2e.incubation.site/pom.xml b/org.eclipse.m2e.incubation.site/pom.xml
deleted file mode 100644
index 6201da0c..00000000
--- a/org.eclipse.m2e.incubation.site/pom.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2008 Sonatype, Inc.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
--->
-<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>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>m2e-core</artifactId>
- <version>1.7.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>org.eclipse.m2e.incubation.site</artifactId>
- <packaging>eclipse-repository</packaging>
-
- <name>Maven Integration for Eclipse Incubation Update Site</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <includePackedArtifacts>true</includePackedArtifacts>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>publish-site</id>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>maven-upload-plugin</artifactId>
- <version>0.0.1</version>
- <executions>
- <execution>
- <id>publish-site</id>
- <phase>install</phase>
- <goals>
- <goal>upload-file</goal>
- </goals>
- <configuration>
- <file>${project.build.directory}/${project.artifactId}-${project.version}.zip</file>
- <serverId>${m2e.site-serverSettingsId}</serverId>
- <repositoryUrl>${m2e.site-compressed}</repositoryUrl>
- <repositoryPath>m2e/${unqualifiedVersion}/N/${unqualifiedVersion}.${buildQualifier}</repositoryPath>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>publish-site-latest</id>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>maven-upload-plugin</artifactId>
- <version>0.0.1</version>
- <executions>
- <execution>
- <id>publish-site-latest</id>
- <phase>install</phase>
- <goals>
- <goal>upload-file</goal>
- </goals>
- <configuration>
- <file>${project.build.directory}/${project.artifactId}-${project.version}.zip</file>
- <serverId>${m2e.site-serverSettingsId}</serverId>
- <repositoryUrl>${m2e.site-compressed}</repositoryUrl>
- <repositoryPath>m2e/${unqualifiedVersion}/N/LATEST</repositoryPath>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
diff --git a/org.eclipse.m2e.incubation.site/src/main/assembly/assembly.xml b/org.eclipse.m2e.incubation.site/src/main/assembly/assembly.xml
deleted file mode 100644
index 8c7848d4..00000000
--- a/org.eclipse.m2e.incubation.site/src/main/assembly/assembly.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<assembly>
- <id>site</id>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>${project.build.directory}/site</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- </fileSets>
-
-</assembly>
-
diff --git a/pom.xml b/pom.xml
index f16ac908..763eed4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,8 @@
<tycho-extras-version>${tycho-version}</tycho-extras-version>
<!-- eclipse version m2e is built against -->
- <eclipse.stream>mars</eclipse.stream>
+ <eclipse.stream>staging</eclipse.stream>
+ <!-- eclipse.stream>neon</eclipse.stream-->
<eclipse-repo.url>http://download.eclipse.org/releases/${eclipse.stream}</eclipse-repo.url>
</properties>
@@ -63,7 +64,7 @@
<repositories>
<repository>
- <id>eclipse</id>
+ <id>simrel</id>
<layout>p2</layout>
<url>${eclipse-repo.url}</url>
</repository>
@@ -105,9 +106,11 @@
<module>org.eclipse.m2e.scm</module>
<module>org.eclipse.m2e.profiles.core</module>
<module>org.eclipse.m2e.profiles.ui</module>
+ <module>org.eclipse.m2e.importer</module>
<!-- common test helpers -->
<module>org.eclipse.m2e.tests.common</module>
+ <module>org.eclipse.m2e.importer.tests</module>
<!-- Logging -->
<module>org.eclipse.m2e.logback.appender</module>
@@ -315,29 +318,6 @@
<module>m2e-maven-runtime</module>
</modules>
</profile>
- <profile>
- <id>incubation</id>
- <activation>
- <property>
- <name>incubation</name>
- <value>true</value>
- </property>
- </activation>
- <modules>
- <module>org.eclipse.m2e.importer</module>
- <module>org.eclipse.m2e.importer.feature</module>
- <module>org.eclipse.m2e.incubation.site</module>
- <!-- Tests -->
- <module>org.eclipse.m2e.importer.tests</module>
- </modules>
- <repositories>
- <repository>
- <id>e4.ui-incubator</id>
- <layout>p2</layout>
- <url>http://download.eclipse.org/e4/snapshots/org.eclipse.e4.ui</url>
- </repository>
- </repositories>
- </profile>
</profiles>
<developers>

Back to the top