diff options
28 files changed, 115 insertions, 123 deletions
diff --git a/jacoco-maven-plugin.test/.project b/jacoco-maven-plugin.test/.project index 0d6860da..3726e2a3 100644 --- a/jacoco-maven-plugin.test/.project +++ b/jacoco-maven-plugin.test/.project @@ -6,13 +6,13 @@ </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> <linkedResources> <link> diff --git a/jacoco/.project b/jacoco/.project index e8f23723..d49e7c5c 100644 --- a/jacoco/.project +++ b/jacoco/.project @@ -5,7 +5,13 @@ <projects> </projects> <buildSpec> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> </natures> </projectDescription> diff --git a/org.jacoco.agent.test/.classpath b/org.jacoco.agent.test/.classpath index 64c5e31b..172046fd 100644 --- a/org.jacoco.agent.test/.classpath +++ b/org.jacoco.agent.test/.classpath @@ -1,7 +1,7 @@ <?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.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/org.jacoco.agent.test/.project b/org.jacoco.agent.test/.project index 4f93c878..c3b3c506 100644 --- a/org.jacoco.agent.test/.project +++ b/org.jacoco.agent.test/.project @@ -11,18 +11,13 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <name>org.eclipse.m2e.core.maven2Builder</name> <arguments> </arguments> </buildCommand> </buildSpec> <natures> - <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.jdt.core.javanature</nature> </natures> <linkedResources> diff --git a/org.jacoco.agent/.classpath b/org.jacoco.agent/.classpath index 2d1a4302..d621a6bd 100644 --- a/org.jacoco.agent/.classpath +++ b/org.jacoco.agent/.classpath @@ -1,7 +1,7 @@ <?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.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.jacoco.agent/.project b/org.jacoco.agent/.project index 5cefef4e..e2d31d8e 100644 --- a/org.jacoco.agent/.project +++ b/org.jacoco.agent/.project @@ -11,19 +11,14 @@ </arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
- <nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
<linkedResources>
<link>
diff --git a/org.jacoco.ant.test/.classpath b/org.jacoco.ant.test/.classpath index 9605c13d..172046fd 100644 --- a/org.jacoco.ant.test/.classpath +++ b/org.jacoco.ant.test/.classpath @@ -2,7 +2,6 @@ <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.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/org.jacoco.ant.test/.project b/org.jacoco.ant.test/.project index 43ab69d3..d9979796 100644 --- a/org.jacoco.ant.test/.project +++ b/org.jacoco.ant.test/.project @@ -11,16 +11,6 @@ </arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
@@ -28,7 +18,6 @@ </buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<linkedResources>
diff --git a/org.jacoco.ant/.classpath b/org.jacoco.ant/.classpath index 2d1a4302..d621a6bd 100644 --- a/org.jacoco.ant/.classpath +++ b/org.jacoco.ant/.classpath @@ -1,7 +1,7 @@ <?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.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.jacoco.ant/.project b/org.jacoco.ant/.project index 0509a44f..b55f789d 100644 --- a/org.jacoco.ant/.project +++ b/org.jacoco.ant/.project @@ -11,18 +11,13 @@ </arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
- <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<linkedResources>
diff --git a/org.jacoco.build/.project b/org.jacoco.build/.project index 0f8d0c9d..a44ac4ef 100644 --- a/org.jacoco.build/.project +++ b/org.jacoco.build/.project @@ -5,8 +5,16 @@ <projects>
</projects>
<buildSpec>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+ <natures>
</natures>
<linkedResources>
</linkedResources>
diff --git a/org.jacoco.build/pom.xml b/org.jacoco.build/pom.xml index 7813ba68..6e43e35a 100644 --- a/org.jacoco.build/pom.xml +++ b/org.jacoco.build/pom.xml @@ -922,7 +922,7 @@ <pluginExecutionFilter> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> - <versionRange>[1.6,)</versionRange> + <versionRange>[0,)</versionRange> <goals> <goal>run</goal> </goals> @@ -933,9 +933,36 @@ </pluginExecution> <pluginExecution> <pluginExecutionFilter> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-invoker-plugin</artifactId> + <versionRange>[0,)</versionRange> + <goals> + <goal>install</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore></ignore> + </action> + </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <versionRange>[0,)</versionRange> + <goals> + <goal>unpack</goal> + <goal>copy-dependencies</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore></ignore> + </action> + </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> <groupId>org.codehaus.groovy.maven</groupId> <artifactId>gmaven-plugin</artifactId> - <versionRange>[1.0,)</versionRange> + <versionRange>[0,)</versionRange> <goals> <goal>execute</goal> </goals> @@ -946,9 +973,22 @@ </pluginExecution> <pluginExecution> <pluginExecutionFilter> + <groupId>org.codehaus.mojo</groupId> + <artifactId>xml-maven-plugin</artifactId> + <versionRange>[0,)</versionRange> + <goals> + <goal>transform</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore></ignore> + </action> + </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> - <versionRange>[0.5.3,)</versionRange> + <versionRange>[0,)</versionRange> <goals> <goal>prepare-agent</goal> </goals> @@ -961,7 +1001,7 @@ <pluginExecutionFilter> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <versionRange>[1.0.0,)</versionRange> + <versionRange>[0,)</versionRange> <goals> <goal>enforce</goal> </goals> @@ -974,7 +1014,7 @@ <pluginExecutionFilter> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <versionRange>[1.5,)</versionRange> + <versionRange>[0,)</versionRange> <goals> <goal>parse-version</goal> </goals> diff --git a/org.jacoco.core.test/.classpath b/org.jacoco.core.test/.classpath index 2d1a4302..d621a6bd 100644 --- a/org.jacoco.core.test/.classpath +++ b/org.jacoco.core.test/.classpath @@ -1,7 +1,7 @@ <?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.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.jacoco.core.test/.project b/org.jacoco.core.test/.project index 96c5f7b9..28795590 100644 --- a/org.jacoco.core.test/.project +++ b/org.jacoco.core.test/.project @@ -11,18 +11,13 @@ </arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
- <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/org.jacoco.core/.classpath b/org.jacoco.core/.classpath index 2d1a4302..d621a6bd 100644 --- a/org.jacoco.core/.classpath +++ b/org.jacoco.core/.classpath @@ -1,7 +1,7 @@ <?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.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.jacoco.core/.project b/org.jacoco.core/.project index 70a57806..2c82d561 100644 --- a/org.jacoco.core/.project +++ b/org.jacoco.core/.project @@ -11,18 +11,13 @@ </arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
- <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/org.jacoco.doc/.project b/org.jacoco.doc/.project index b82fd649..2942b99d 100644 --- a/org.jacoco.doc/.project +++ b/org.jacoco.doc/.project @@ -6,17 +6,12 @@ </projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
- <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
diff --git a/org.jacoco.doc/docroot/doc/build.html b/org.jacoco.doc/docroot/doc/build.html index cfc7b28e..8a19e732 100644 --- a/org.jacoco.doc/docroot/doc/build.html +++ b/org.jacoco.doc/docroot/doc/build.html @@ -112,6 +112,17 @@ <jdkHome>/usr/lib/jvm/sun-jdk-1.7</jdkHome> </configuration> </toolchain> + <toolchain> + <type>jdk</type> + <provides> + <id>java18</id> + <version>1.8</version> + <vendor>sun</vendor> + </provides> + <configuration> + <jdkHome>/usr/lib/jvm/sun-jdk-1.8</jdkHome> + </configuration> + </toolchain> </toolchains> </pre> @@ -140,9 +151,10 @@ </p> <ul> - <li>Maven with 1.5 JRE: <code>mvn clean install -Djdk.version=1.5 -Dbytecode.version=1.5</code></li> - <li>Maven with 1.6 JRE: <code>mvn clean install -Djdk.version=1.6 -Dbytecode.version=1.6</code></li> - <li>Maven with 1.7 JRE: <code>mvn clean install -Djdk.version=1.7 -Dbytecode.version=1.7</code></li> + <li>Maven with 1.5 JDK: <code>mvn clean install -Djdk.version=1.5 -Dbytecode.version=1.5</code></li> + <li>Maven with 1.6 JDK: <code>mvn clean install -Djdk.version=1.6 -Dbytecode.version=1.6</code></li> + <li>Maven with 1.7 JDK: <code>mvn clean install -Djdk.version=1.7 -Dbytecode.version=1.7</code></li> + <li>Maven with 1.8 JDK: <code>mvn clean install -Djdk.version=1.8 -Dbytecode.version=1.8</code></li> </ul> diff --git a/org.jacoco.doc/docroot/doc/environment.html b/org.jacoco.doc/docroot/doc/environment.html index 62df7364..f0abe70a 100644 --- a/org.jacoco.doc/docroot/doc/environment.html +++ b/org.jacoco.doc/docroot/doc/environment.html @@ -27,11 +27,10 @@ <h3>IDE</h3> <p> - JaCoCo development is done with the latest Eclipse version 3.7.x. JaCoCo - 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. + JaCoCo development is done with the latest version of + <a href="http://www.eclipse.org/">Eclipse</a>. Please make sure to install + the <a href="http://www.eclipse.org/m2e/">m2e plug-in</a> to get all + dependencies resolved properly. </p> <p> @@ -58,23 +57,6 @@ JaCoCo <a href="build.html">build</a> requires Maven 3. </p> -<h3>Third Party Dependencies</h3> - -<p> - JaCoCo has dependencies to the following third party bundles: -</p> - -<ul> - <li>Apache Ant 1.7.x</li> - <li>JUnit 4</li> - <li>Objectweb ASM 4.0</li> -</ul> - -<p> - These bundles are included with the Eclipse 3.7.x PDE feature and are not - part of the JaCoCo source tree. -</p> - <h3>Source Encoding</h3> <p> diff --git a/org.jacoco.examples.test/.classpath b/org.jacoco.examples.test/.classpath index 64c5e31b..172046fd 100644 --- a/org.jacoco.examples.test/.classpath +++ b/org.jacoco.examples.test/.classpath @@ -1,7 +1,7 @@ <?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.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/org.jacoco.examples.test/.project b/org.jacoco.examples.test/.project index 56dd28db..38d1fb5a 100644 --- a/org.jacoco.examples.test/.project +++ b/org.jacoco.examples.test/.project @@ -11,18 +11,13 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <name>org.eclipse.m2e.core.maven2Builder</name> <arguments> </arguments> </buildCommand> </buildSpec> <natures> - <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.jdt.core.javanature</nature> </natures> <linkedResources> diff --git a/org.jacoco.examples/.classpath b/org.jacoco.examples/.classpath index 64c5e31b..172046fd 100644 --- a/org.jacoco.examples/.classpath +++ b/org.jacoco.examples/.classpath @@ -1,7 +1,7 @@ <?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.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/org.jacoco.examples/.project b/org.jacoco.examples/.project index 9fca0d2d..2375c8fb 100644 --- a/org.jacoco.examples/.project +++ b/org.jacoco.examples/.project @@ -11,18 +11,13 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <name>org.eclipse.m2e.core.maven2Builder</name> <arguments> </arguments> </buildCommand> </buildSpec> <natures> - <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.jdt.core.javanature</nature> </natures> <linkedResources> diff --git a/org.jacoco.report.test/.classpath b/org.jacoco.report.test/.classpath index 2d1a4302..d621a6bd 100644 --- a/org.jacoco.report.test/.classpath +++ b/org.jacoco.report.test/.classpath @@ -1,7 +1,7 @@ <?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.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.jacoco.report.test/.project b/org.jacoco.report.test/.project index bbd4a684..48793df3 100644 --- a/org.jacoco.report.test/.project +++ b/org.jacoco.report.test/.project @@ -11,18 +11,13 @@ </arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
- <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<linkedResources>
diff --git a/org.jacoco.report/.classpath b/org.jacoco.report/.classpath index 2d1a4302..d621a6bd 100644 --- a/org.jacoco.report/.classpath +++ b/org.jacoco.report/.classpath @@ -1,7 +1,7 @@ <?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.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.jacoco.report/.project b/org.jacoco.report/.project index 076a97a3..30e49386 100644 --- a/org.jacoco.report/.project +++ b/org.jacoco.report/.project @@ -11,18 +11,13 @@ </arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
- <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<linkedResources>
diff --git a/org.jacoco.tests/.project b/org.jacoco.tests/.project index a8c92431..f0c49e58 100644 --- a/org.jacoco.tests/.project +++ b/org.jacoco.tests/.project @@ -5,7 +5,13 @@ <projects> </projects> <buildSpec> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> </natures> </projectDescription> |