Skip to content
This repository has been archived by the owner on Nov 17, 2020. It is now read-only.

Sample to reproduce multi module problem, plus a fix for it #15

Merged
merged 1 commit into from
May 14, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion org.maven.ide.eclipse.scala/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion org.maven.ide.eclipse.scala/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.maven.ide.eclipse.scala</groupId>
<artifactId>m2eclipse-scala</artifactId>
<version>0.4.0</version>
<version>0.4.1</version>
</parent>
<artifactId>org.maven.ide.eclipse.scala</artifactId>
<packaging>eclipse-plugin</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down
2 changes: 1 addition & 1 deletion org.maven.ide.eclipse.scala_feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.maven.ide.eclipse.scala_feature"
label="Maven Integration for Scala IDE"
version="0.4.0"
version="0.4.1"
provider-name="Sonatype, Inc.">

<description url="github.com/sonatype/m2eclipse-scala/">
Expand Down
2 changes: 1 addition & 1 deletion org.maven.ide.eclipse.scala_feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.maven.ide.eclipse.scala</groupId>
<artifactId>m2eclipse-scala</artifactId>
<version>0.4.0</version>
<version>0.4.1</version>
</parent>

<artifactId>org.maven.ide.eclipse.scala_feature</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion org.maven.ide.eclipse.scala_site/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.maven.ide.eclipse.scala</groupId>
<artifactId>m2eclipse-scala</artifactId>
<version>0.4.0</version>
<version>0.4.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.maven.ide.eclipse.scala</groupId>
<artifactId>m2eclipse-scala</artifactId>
<version>0.4.0</version>
<version>0.4.1</version>
<packaging>pom</packaging>

<properties>
Expand Down
14 changes: 14 additions & 0 deletions samples/prj-parent-with-plugin/child/pom.xml
Original file line number Diff line number Diff line change
@@ -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>
46 changes: 46 additions & 0 deletions samples/prj-parent-with-plugin/pom.xml
Original file line number Diff line number Diff line change
@@ -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>