diff --git a/org.maven.ide.eclipse.scala/.settings/org.eclipse.jdt.core.prefs b/org.maven.ide.eclipse.scala/.settings/org.eclipse.jdt.core.prefs
index 7c0afa7..de2c721 100644
--- a/org.maven.ide.eclipse.scala/.settings/org.eclipse.jdt.core.prefs
+++ b/org.maven.ide.eclipse.scala/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,3 @@
-#Wed Nov 24 10:29:41 CET 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
org.eclipse.jdt.core.builder.duplicateResourceTask=warning
@@ -160,9 +159,12 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
org.eclipse.jdt.core.formatter.indentation.size=2
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
diff --git a/org.maven.ide.eclipse.scala/META-INF/MANIFEST.MF b/org.maven.ide.eclipse.scala/META-INF/MANIFEST.MF
index b4512c5..7b0c8e5 100644
--- a/org.maven.ide.eclipse.scala/META-INF/MANIFEST.MF
+++ b/org.maven.ide.eclipse.scala/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Maven Integration for Scala IDE
Bundle-SymbolicName: org.maven.ide.eclipse.scala;singleton:=true
-Bundle-Version: 0.4.0
+Bundle-Version: 0.4.1
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle:
org.eclipse.jdt.core,
diff --git a/org.maven.ide.eclipse.scala/pom.xml b/org.maven.ide.eclipse.scala/pom.xml
index 8deda79..b2d70f8 100644
--- a/org.maven.ide.eclipse.scala/pom.xml
+++ b/org.maven.ide.eclipse.scala/pom.xml
@@ -5,7 +5,7 @@
org.maven.ide.eclipse.scala
m2eclipse-scala
- 0.4.0
+ 0.4.1
org.maven.ide.eclipse.scala
eclipse-plugin
diff --git a/org.maven.ide.eclipse.scala/src/org/maven/ide/eclipse/scala/ScalaProjectConfigurator.java b/org.maven.ide.eclipse.scala/src/org/maven/ide/eclipse/scala/ScalaProjectConfigurator.java
index cee9a9e..64858a2 100644
--- a/org.maven.ide.eclipse.scala/src/org/maven/ide/eclipse/scala/ScalaProjectConfigurator.java
+++ b/org.maven.ide.eclipse.scala/src/org/maven/ide/eclipse/scala/ScalaProjectConfigurator.java
@@ -115,6 +115,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);
}
}
diff --git a/org.maven.ide.eclipse.scala_feature/feature.xml b/org.maven.ide.eclipse.scala_feature/feature.xml
index e7f5483..dcca50f 100644
--- a/org.maven.ide.eclipse.scala_feature/feature.xml
+++ b/org.maven.ide.eclipse.scala_feature/feature.xml
@@ -2,7 +2,7 @@
diff --git a/org.maven.ide.eclipse.scala_feature/pom.xml b/org.maven.ide.eclipse.scala_feature/pom.xml
index 0db8e06..8bbe431 100644
--- a/org.maven.ide.eclipse.scala_feature/pom.xml
+++ b/org.maven.ide.eclipse.scala_feature/pom.xml
@@ -5,7 +5,7 @@
org.maven.ide.eclipse.scala
m2eclipse-scala
- 0.4.0
+ 0.4.1
org.maven.ide.eclipse.scala_feature
diff --git a/org.maven.ide.eclipse.scala_site/pom.xml b/org.maven.ide.eclipse.scala_site/pom.xml
index 80847ad..493d504 100644
--- a/org.maven.ide.eclipse.scala_site/pom.xml
+++ b/org.maven.ide.eclipse.scala_site/pom.xml
@@ -5,7 +5,7 @@
org.maven.ide.eclipse.scala
m2eclipse-scala
- 0.4.0
+ 0.4.1
../pom.xml
diff --git a/pom.xml b/pom.xml
index d0dcc79..c0e03a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
org.maven.ide.eclipse.scala
m2eclipse-scala
- 0.4.0
+ 0.4.1
pom
diff --git a/samples/prj-parent-with-plugin/child/pom.xml b/samples/prj-parent-with-plugin/child/pom.xml
new file mode 100644
index 0000000..c422687
--- /dev/null
+++ b/samples/prj-parent-with-plugin/child/pom.xml
@@ -0,0 +1,14 @@
+
+
+ 4.0.0
+
+
+ example
+ parent
+ 0.0.1-SNAPSHOT
+ ..
+
+
+ child
+
diff --git a/samples/prj-parent-with-plugin/pom.xml b/samples/prj-parent-with-plugin/pom.xml
new file mode 100644
index 0000000..25edcd7
--- /dev/null
+++ b/samples/prj-parent-with-plugin/pom.xml
@@ -0,0 +1,46 @@
+
+ 4.0.0
+
+ example
+ parent
+ 0.0.1-SNAPSHOT
+ pom
+
+
+
+
+
+ net.alchim31.maven
+ scala-maven-plugin
+ 3.0.1
+
+
+ scala-compile-first
+ process-resources
+
+ add-source
+ compile
+
+
+
+ scala-test-compile
+ process-test-resources
+
+ testCompile
+
+
+
+
+
+
+
+
+
+ net.alchim31.maven
+ scala-maven-plugin
+
+
+
+
\ No newline at end of file