Merge branch 'develop'

Author: sdedwards

com.github.sdedwards.m2e-nar/src/com/github/sdedwards/m2e_nar/internal/CProjectConfigurator.java

@@ -51,13 +51,13 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.m2e.core.internal.IMavenConstants;
+import org.eclipse.m2e.core.internal.lifecyclemapping.LifecycleMappingFactory;
 import org.eclipse.m2e.core.lifecyclemapping.model.IPluginExecutionMetadata;
 import org.eclipse.m2e.core.project.IMavenProjectFacade;
 import org.eclipse.m2e.core.project.configurator.AbstractBuildParticipant;
 import org.eclipse.m2e.core.project.configurator.AbstractProjectConfigurator;
 import org.eclipse.m2e.core.project.configurator.MojoExecutionBuildParticipant;
 import org.eclipse.m2e.core.project.configurator.ProjectConfigurationRequest;
-import org.eclipse.m2e.jdt.internal.JavaProjectConfigurator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -73,6 +73,7 @@ public class CProjectConfigurator extends AbstractProjectConfigurator {
 
 	private static final Logger logger = LoggerFactory.getLogger(CProjectConfigurator.class);
 	public static final String CONFIGURATOR_ID = "com.github.sdedwards.m2e_nar.cConfigurator";
+	public static final String JAVA_CONFIGURATOR_ID = "org.eclipse.m2e.jdt.javaConfigurator";
 
 	@Override
 	public void configure(ProjectConfigurationRequest request, IProgressMonitor monitor) throws CoreException {
@@ -111,7 +112,7 @@ public void configure(ProjectConfigurationRequest request, IProgressMonitor moni
 			}
 		}
 
-		JavaProjectConfigurator jConfig = new JavaProjectConfigurator();
+		AbstractProjectConfigurator jConfig = LifecycleMappingFactory.createProjectConfigurator(JAVA_CONFIGURATOR_ID);
 		jConfig.configure(request, monitor);
 
 		// ensure CDT builder is after the Maven one

pom.xml

@@ -69,7 +69,7 @@ under the License.
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<tycho-version>0.23.0</tycho-version>
-		<eclipse-repo.url>http://download.eclipse.org/releases/luna</eclipse-repo.url>
+		<eclipse-repo.url>http://download.eclipse.org/releases/mars</eclipse-repo.url>
 		<github.repo.id>sdedwards/m2e-nar</github.repo.id>
 	</properties>