Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

update to m2e 0.13 from eclipse.org

  • Loading branch information...
commit 6e9466d3086feee804e63f4bf411fed4ad0fef82 1 parent 40138dd
Milos Kleint authored
View
4 .project
@@ -6,12 +6,12 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
View
6 org.maven.ide.eclipse.scala/.project
@@ -20,8 +20,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
View
6 org.maven.ide.eclipse.scala/META-INF/MANIFEST.MF
@@ -8,9 +8,9 @@ Require-Bundle:
org.eclipse.jdt.core,
org.eclipse.core.runtime,
org.eclipse.core.resources,
- org.maven.ide.eclipse,
- org.maven.ide.eclipse.maven_embedder,
- org.maven.ide.eclipse.jdt,
+ org.eclipse.m2e.core,
+ org.eclipse.m2e.maven.runtime,
+ org.eclipse.m2e.jdt,
org.eclipse.jdt.launching
Bundle-Vendor: Sonatype, Inc.
Export-Package: org.maven.ide.eclipse.scala
View
4 org.maven.ide.eclipse.scala/plugin.xml
@@ -2,7 +2,7 @@
<?eclipse version="3.2"?>
<plugin>
<extension
- point="org.maven.ide.eclipse.projectConfigurators">
+ point="org.eclipse.m2e.core.projectConfigurators">
<!-- priority="98" generic="false" -->
<configurator
class="org.maven.ide.eclipse.scala.ScalaProjectConfigurator"
@@ -11,7 +11,7 @@
>
</configurator>
</extension>
- <extension point="org.maven.ide.eclipse.archetypeCatalogs">
+ <extension point="org.eclipse.m2e.core.archetypeCatalogs">
<remote description="Scala-tools.org/releases Catalog" url="http://nexus.scala-tools.org/content/repositories/releases/"/>
<remote description="Scala-tools.org/snapshots Catalog" url="http://nexus.scala-tools.org/content/repositories/snapshots/"/>
</extension>
View
12 org.maven.ide.eclipse.scala/src/org/maven/ide/eclipse/scala/ScalaProjectConfigurator.java
@@ -22,12 +22,12 @@
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.launching.JavaRuntime;
-import org.maven.ide.eclipse.jdt.IClasspathDescriptor;
-import org.maven.ide.eclipse.jdt.IClasspathEntryDescriptor;
-import org.maven.ide.eclipse.jdt.IJavaProjectConfigurator;
-import org.maven.ide.eclipse.project.IMavenProjectFacade;
-import org.maven.ide.eclipse.project.configurator.AbstractProjectConfigurator;
-import org.maven.ide.eclipse.project.configurator.ProjectConfigurationRequest;
+import org.eclipse.m2e.jdt.IClasspathDescriptor;
+import org.eclipse.m2e.jdt.IClasspathEntryDescriptor;
+import org.eclipse.m2e.jdt.IJavaProjectConfigurator;
+import org.eclipse.m2e.core.project.IMavenProjectFacade;
+import org.eclipse.m2e.core.project.configurator.AbstractProjectConfigurator;
+import org.eclipse.m2e.core.project.configurator.ProjectConfigurationRequest;
//TODO check the jre/java version compliance (>= 1.5)
//TODO check JDT Weaving is enabled (if not enabled, icon of scala file is [J] same as java (and property of the file display "Type :... Java Source File" )
View
4 org.maven.ide.eclipse.scala_feature/.project
@@ -16,14 +16,14 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
View
4 org.maven.ide.eclipse.scala_site/.project
@@ -16,14 +16,14 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.UpdateSiteNature</nature>
</natures>
</projectDescription>
View
2  pom.xml
@@ -53,7 +53,7 @@
<repository>
<id>m2eclipse</id>
<layout>p2</layout>
- <url>http://m2eclipse.sonatype.org/sites/m2e/</url>
+ <url>https://repository.sonatype.org/content/sites/forge-sites/m2e/0.13.0/N/0.13.0.201101251704/</url>
</repository>
<repository>
<id>scala-ide</id>
Please sign in to comment.
Something went wrong with that request. Please try again.