Permalink
Browse files

Merge branch 'master' of github.com:sonatype/m2eclipse-scala

Conflicts:
	org.maven.ide.eclipse.scala/.settings/org.eclipse.jdt.core.prefs
  • Loading branch information...
2 parents 6917031 + b8eba88 commit ffa4f487b79ef21b6a39a0e5a2786360ae43ac52 @davidB davidB committed May 15, 2012
View
@@ -5,7 +5,7 @@ m2eclipse-scala
* issue tracker : [m2eclipse-scala at github](https://github.com/sonatype/m2eclipse-scala/issues)
* mailing-list : [scala-ide-user](http://groups.google.fr/group/scala-ide-user)
-* update-site : [http://alchim31.net/m2e-scala/update-site](http://alchim31.net/m2e-scala/update-site)
+* update-site : [http://alchim31.free.fr/m2e-scala/update-site](http://alchim31.free.fr/m2e-scala/update-site)
### Working configuration
@@ -110,6 +110,9 @@ public void configure(ProjectConfigurationRequest request, IProgressMonitor moni
if (request != null) {
IProject project = request.getProject();
if(!project.hasNature(scalaNature) && isScalaProject(request.getMavenProjectFacade(), monitor)) {
+ if(!project.hasNature("org.eclipse.jdt.core.javanature")) {
+ addNature(project, "org.eclipse.jdt.core.javanature", monitor);
+ }
addNature(project, scalaNature, monitor);
}
}
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>example</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <artifactId>child</artifactId>
+</project>
@@ -0,0 +1,46 @@
+<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>
+
+ <groupId>example</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>scala-maven-plugin</artifactId>
+ <version>3.0.1</version>
+ <executions>
+ <execution>
+ <id>scala-compile-first</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>add-source</goal>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>scala-test-compile</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>scala-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>

0 comments on commit ffa4f48

Please sign in to comment.