Trac #198: Update project settings for M2E Eclipse tooling.
diff --git a/jacoco-maven-plugin.test/.classpath b/jacoco-maven-plugin.test/.classpath
deleted file mode 100644
index d0bec0f..0000000
--- a/jacoco-maven-plugin.test/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/jacoco-maven-plugin.test/.project b/jacoco-maven-plugin.test/.project
index 7f11960..abca611 100644
--- a/jacoco-maven-plugin.test/.project
+++ b/jacoco-maven-plugin.test/.project
@@ -6,11 +6,6 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
@@ -18,7 +13,6 @@
</buildSpec>
<natures>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<linkedResources>
<link>
diff --git a/jacoco-maven-plugin/.classpath b/jacoco-maven-plugin/.classpath
index 753a934..94fc1fc 100644
--- a/jacoco-maven-plugin/.classpath
+++ b/jacoco-maven-plugin/.classpath
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" output="target/classes" path="src"/>
- <classpathentry kind="src" output="target/classes" path="target/generated-sources/plugin"/>
+ <classpathentry including="**/*.java" kind="src" output="target/classes" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/jacoco-maven-plugin/.project b/jacoco-maven-plugin/.project
index ee2841d..6049ef4 100644
--- a/jacoco-maven-plugin/.project
+++ b/jacoco-maven-plugin/.project
@@ -11,13 +11,13 @@
</arguments>
</buildCommand>
<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>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<linkedResources>
diff --git a/org.jacoco.ant.test/.classpath b/org.jacoco.ant.test/.classpath
index 2d1a430..520b50e 100644
--- a/org.jacoco.ant.test/.classpath
+++ b/org.jacoco.ant.test/.classpath
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry including="**/*.java" kind="src" output="target/classes" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.jacoco.ant.test/.project b/org.jacoco.ant.test/.project
index 0b528a7..448114d 100644
--- a/org.jacoco.ant.test/.project
+++ b/org.jacoco.ant.test/.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>
diff --git a/org.jacoco.doc/docroot/doc/environment.html b/org.jacoco.doc/docroot/doc/environment.html
index 731b540..8eefa2a 100644
--- a/org.jacoco.doc/docroot/doc/environment.html
+++ b/org.jacoco.doc/docroot/doc/environment.html
@@ -30,8 +30,15 @@
<p>
JaCoCo development is done with the latest Eclipse version 3.7.x. JaCoCo
- projects are OSGi bundles, therefore the PDE feature is required. Project
- specific Eclipse settings exist for the projects
+ projects are OSGi bundles, therefore the
+ <a href="http://www.eclipse.org/pde/">PDE</a> feature is required. The JaCoCo
+ Maven plug-in projects require the
+ <a href="http://www.eclipse.org/m2e/">M2E</a> for proper dependency resolution.
+</p>
+
+<p>
+ Project specific Eclipse settings only exist for the following projects. All
+ other projects and test projects link to these settings:
</p>
<ul>
@@ -39,10 +46,6 @@
<li><code>org.jacoco.core.test</code></li>
</ul>
-<p>
- All other projects and test projects link to these settings.
-</p>
-
<h3>JRE/JDK</h3>
<p>
@@ -74,6 +77,14 @@
part of the JaCoCo source tree.
</p>
+<h3>Source Encoding</h3>
+
+<p>
+ All source files and HTML documents are encoded in UTF-8 unless an alternative
+ encoding is required by the file format specification. For example Java
+ property files are always encoded in ISO-8859-1.
+</p>
+
<h3>Source Control</h3>
<p>