Skip to content

Commit ae311b9

Browse files
marchofmarchof
committed
Consistent usage of m2e for all JaCoCo projects.
Avoid dependency on MANIFEST.MF files and PDE.
1 parent 72793f8 commit ae311b9

File tree

28 files changed

+115
-123
lines changed

28 files changed

+115
-123
lines changed

‎jacoco-maven-plugin.test/.project

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
</projects>
77
<buildSpec>
88
<buildCommand>
9-
<name>org.maven.ide.eclipse.maven2Builder</name>
9+
<name>org.eclipse.m2e.core.maven2Builder</name>
1010
<arguments>
1111
</arguments>
1212
</buildCommand>
1313
</buildSpec>
1414
<natures>
15-
<nature>org.maven.ide.eclipse.maven2Nature</nature>
15+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
1616
</natures>
1717
<linkedResources>
1818
<link>

‎jacoco/.project

+6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,13 @@
55
<projects>
66
</projects>
77
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.m2e.core.maven2Builder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
813
</buildSpec>
914
<natures>
15+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
1016
</natures>
1117
</projectDescription>

‎org.jacoco.agent.test/.classpath

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
4-
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
4+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
55
<classpathentry kind="src" path="src"/>
66
<classpathentry kind="output" path="bin"/>
77
</classpath>

‎org.jacoco.agent.test/.project

+2-7
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,13 @@
1111
</arguments>
1212
</buildCommand>
1313
<buildCommand>
14-
<name>org.eclipse.pde.ManifestBuilder</name>
15-
<arguments>
16-
</arguments>
17-
</buildCommand>
18-
<buildCommand>
19-
<name>org.eclipse.pde.SchemaBuilder</name>
14+
<name>org.eclipse.m2e.core.maven2Builder</name>
2015
<arguments>
2116
</arguments>
2217
</buildCommand>
2318
</buildSpec>
2419
<natures>
25-
<nature>org.eclipse.pde.PluginNature</nature>
20+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
2621
<nature>org.eclipse.jdt.core.javanature</nature>
2722
</natures>
2823
<linkedResources>

‎org.jacoco.agent/.classpath

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
4-
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
4+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
55
<classpathentry kind="src" path="src"/>
66
<classpathentry kind="output" path="bin"/>
77
</classpath>

‎org.jacoco.agent/.project

+2-7
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,14 @@
1111
</arguments>
1212
</buildCommand>
1313
<buildCommand>
14-
<name>org.eclipse.pde.ManifestBuilder</name>
15-
<arguments>
16-
</arguments>
17-
</buildCommand>
18-
<buildCommand>
19-
<name>org.eclipse.pde.SchemaBuilder</name>
14+
<name>org.eclipse.m2e.core.maven2Builder</name>
2015
<arguments>
2116
</arguments>
2217
</buildCommand>
2318
</buildSpec>
2419
<natures>
25-
<nature>org.eclipse.pde.PluginNature</nature>
2620
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
2722
</natures>
2823
<linkedResources>
2924
<link>

‎org.jacoco.ant.test/.classpath

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<classpath>
33
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
44
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
5-
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
65
<classpathentry kind="src" path="src"/>
76
<classpathentry kind="output" path="bin"/>
87
</classpath>

‎org.jacoco.ant.test/.project

-11
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,6 @@
1010
<arguments>
1111
</arguments>
1212
</buildCommand>
13-
<buildCommand>
14-
<name>org.eclipse.pde.ManifestBuilder</name>
15-
<arguments>
16-
</arguments>
17-
</buildCommand>
18-
<buildCommand>
19-
<name>org.eclipse.pde.SchemaBuilder</name>
20-
<arguments>
21-
</arguments>
22-
</buildCommand>
2313
<buildCommand>
2414
<name>org.eclipse.m2e.core.maven2Builder</name>
2515
<arguments>
@@ -28,7 +18,6 @@
2818
</buildSpec>
2919
<natures>
3020
<nature>org.eclipse.m2e.core.maven2Nature</nature>
31-
<nature>org.eclipse.pde.PluginNature</nature>
3221
<nature>org.eclipse.jdt.core.javanature</nature>
3322
</natures>
3423
<linkedResources>

‎org.jacoco.ant/.classpath

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
4-
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
4+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
55
<classpathentry kind="src" path="src"/>
66
<classpathentry kind="output" path="bin"/>
77
</classpath>

‎org.jacoco.ant/.project

+2-7
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,13 @@
1111
</arguments>
1212
</buildCommand>
1313
<buildCommand>
14-
<name>org.eclipse.pde.ManifestBuilder</name>
15-
<arguments>
16-
</arguments>
17-
</buildCommand>
18-
<buildCommand>
19-
<name>org.eclipse.pde.SchemaBuilder</name>
14+
<name>org.eclipse.m2e.core.maven2Builder</name>
2015
<arguments>
2116
</arguments>
2217
</buildCommand>
2318
</buildSpec>
2419
<natures>
25-
<nature>org.eclipse.pde.PluginNature</nature>
20+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
2621
<nature>org.eclipse.jdt.core.javanature</nature>
2722
</natures>
2823
<linkedResources>

‎org.jacoco.build/.project

+8
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,15 @@
55
<projects>
66
</projects>
77
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.m2e.core.maven2Builder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
813
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
16+
</natures>
917
<natures>
1018
</natures>
1119
<linkedResources>

‎org.jacoco.build/pom.xml

+45-5
Original file line numberDiff line numberDiff line change
@@ -922,7 +922,7 @@
922922
<pluginExecutionFilter>
923923
<groupId>org.apache.maven.plugins</groupId>
924924
<artifactId>maven-antrun-plugin</artifactId>
925-
<versionRange>[1.6,)</versionRange>
925+
<versionRange>[0,)</versionRange>
926926
<goals>
927927
<goal>run</goal>
928928
</goals>
@@ -931,11 +931,38 @@
931931
<ignore></ignore>
932932
</action>
933933
</pluginExecution>
934+
<pluginExecution>
935+
<pluginExecutionFilter>
936+
<groupId>org.apache.maven.plugins</groupId>
937+
<artifactId>maven-invoker-plugin</artifactId>
938+
<versionRange>[0,)</versionRange>
939+
<goals>
940+
<goal>install</goal>
941+
</goals>
942+
</pluginExecutionFilter>
943+
<action>
944+
<ignore></ignore>
945+
</action>
946+
</pluginExecution>
947+
<pluginExecution>
948+
<pluginExecutionFilter>
949+
<groupId>org.apache.maven.plugins</groupId>
950+
<artifactId>maven-dependency-plugin</artifactId>
951+
<versionRange>[0,)</versionRange>
952+
<goals>
953+
<goal>unpack</goal>
954+
<goal>copy-dependencies</goal>
955+
</goals>
956+
</pluginExecutionFilter>
957+
<action>
958+
<ignore></ignore>
959+
</action>
960+
</pluginExecution>
934961
<pluginExecution>
935962
<pluginExecutionFilter>
936963
<groupId>org.codehaus.groovy.maven</groupId>
937964
<artifactId>gmaven-plugin</artifactId>
938-
<versionRange>[1.0,)</versionRange>
965+
<versionRange>[0,)</versionRange>
939966
<goals>
940967
<goal>execute</goal>
941968
</goals>
@@ -944,11 +971,24 @@
944971
<ignore></ignore>
945972
</action>
946973
</pluginExecution>
974+
<pluginExecution>
975+
<pluginExecutionFilter>
976+
<groupId>org.codehaus.mojo</groupId>
977+
<artifactId>xml-maven-plugin</artifactId>
978+
<versionRange>[0,)</versionRange>
979+
<goals>
980+
<goal>transform</goal>
981+
</goals>
982+
</pluginExecutionFilter>
983+
<action>
984+
<ignore></ignore>
985+
</action>
986+
</pluginExecution>
947987
<pluginExecution>
948988
<pluginExecutionFilter>
949989
<groupId>org.jacoco</groupId>
950990
<artifactId>jacoco-maven-plugin</artifactId>
951-
<versionRange>[0.5.3,)</versionRange>
991+
<versionRange>[0,)</versionRange>
952992
<goals>
953993
<goal>prepare-agent</goal>
954994
</goals>
@@ -961,7 +1001,7 @@
9611001
<pluginExecutionFilter>
9621002
<groupId>org.apache.maven.plugins</groupId>
9631003
<artifactId>maven-enforcer-plugin</artifactId>
964-
<versionRange>[1.0.0,)</versionRange>
1004+
<versionRange>[0,)</versionRange>
9651005
<goals>
9661006
<goal>enforce</goal>
9671007
</goals>
@@ -974,7 +1014,7 @@
9741014
<pluginExecutionFilter>
9751015
<groupId>org.codehaus.mojo</groupId>
9761016
<artifactId>build-helper-maven-plugin</artifactId>
977-
<versionRange>[1.5,)</versionRange>
1017+
<versionRange>[0,)</versionRange>
9781018
<goals>
9791019
<goal>parse-version</goal>
9801020
</goals>

‎org.jacoco.core.test/.classpath

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
4-
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
4+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
55
<classpathentry kind="src" path="src"/>
66
<classpathentry kind="output" path="bin"/>
77
</classpath>

‎org.jacoco.core.test/.project

+2-7
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,13 @@
1111
</arguments>
1212
</buildCommand>
1313
<buildCommand>
14-
<name>org.eclipse.pde.ManifestBuilder</name>
15-
<arguments>
16-
</arguments>
17-
</buildCommand>
18-
<buildCommand>
19-
<name>org.eclipse.pde.SchemaBuilder</name>
14+
<name>org.eclipse.m2e.core.maven2Builder</name>
2015
<arguments>
2116
</arguments>
2217
</buildCommand>
2318
</buildSpec>
2419
<natures>
25-
<nature>org.eclipse.pde.PluginNature</nature>
20+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
2621
<nature>org.eclipse.jdt.core.javanature</nature>
2722
</natures>
2823
</projectDescription>

‎org.jacoco.core/.classpath

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
4-
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
4+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
55
<classpathentry kind="src" path="src"/>
66
<classpathentry kind="output" path="bin"/>
77
</classpath>

‎org.jacoco.core/.project

+2-7
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,13 @@
1111
</arguments>
1212
</buildCommand>
1313
<buildCommand>
14-
<name>org.eclipse.pde.ManifestBuilder</name>
15-
<arguments>
16-
</arguments>
17-
</buildCommand>
18-
<buildCommand>
19-
<name>org.eclipse.pde.SchemaBuilder</name>
14+
<name>org.eclipse.m2e.core.maven2Builder</name>
2015
<arguments>
2116
</arguments>
2217
</buildCommand>
2318
</buildSpec>
2419
<natures>
25-
<nature>org.eclipse.pde.PluginNature</nature>
20+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
2621
<nature>org.eclipse.jdt.core.javanature</nature>
2722
</natures>
2823
</projectDescription>

‎org.jacoco.doc/.project

+2-7
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,12 @@
66
</projects>
77
<buildSpec>
88
<buildCommand>
9-
<name>org.eclipse.pde.ManifestBuilder</name>
10-
<arguments>
11-
</arguments>
12-
</buildCommand>
13-
<buildCommand>
14-
<name>org.eclipse.pde.SchemaBuilder</name>
9+
<name>org.eclipse.m2e.core.maven2Builder</name>
1510
<arguments>
1611
</arguments>
1712
</buildCommand>
1813
</buildSpec>
1914
<natures>
20-
<nature>org.eclipse.pde.PluginNature</nature>
15+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
2116
</natures>
2217
</projectDescription>

‎org.jacoco.doc/docroot/doc/build.html

+15-3
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,17 @@ <h2>Testing with different JDKs</h2>
112112
&lt;jdkHome&gt;/usr/lib/jvm/sun-jdk-1.7&lt;/jdkHome&gt;
113113
&lt;/configuration&gt;
114114
&lt;/toolchain&gt;
115+
&lt;toolchain&gt;
116+
&lt;type&gt;jdk&lt;/type&gt;
117+
&lt;provides&gt;
118+
&lt;id&gt;java18&lt;/id&gt;
119+
&lt;version&gt;1.8&lt;/version&gt;
120+
&lt;vendor&gt;sun&lt;/vendor&gt;
121+
&lt;/provides&gt;
122+
&lt;configuration&gt;
123+
&lt;jdkHome&gt;/usr/lib/jvm/sun-jdk-1.8&lt;/jdkHome&gt;
124+
&lt;/configuration&gt;
125+
&lt;/toolchain&gt;
115126
&lt;/toolchains&gt;
116127
</pre>
117128

@@ -140,9 +151,10 @@ <h2>Testing with different JDKs</h2>
140151
</p>
141152

142153
<ul>
143-
<li>Maven with 1.5 JRE: <code>mvn clean install -Djdk.version=1.5 -Dbytecode.version=1.5</code></li>
144-
<li>Maven with 1.6 JRE: <code>mvn clean install -Djdk.version=1.6 -Dbytecode.version=1.6</code></li>
145-
<li>Maven with 1.7 JRE: <code>mvn clean install -Djdk.version=1.7 -Dbytecode.version=1.7</code></li>
154+
<li>Maven with 1.5 JDK: <code>mvn clean install -Djdk.version=1.5 -Dbytecode.version=1.5</code></li>
155+
<li>Maven with 1.6 JDK: <code>mvn clean install -Djdk.version=1.6 -Dbytecode.version=1.6</code></li>
156+
<li>Maven with 1.7 JDK: <code>mvn clean install -Djdk.version=1.7 -Dbytecode.version=1.7</code></li>
157+
<li>Maven with 1.8 JDK: <code>mvn clean install -Djdk.version=1.8 -Dbytecode.version=1.8</code></li>
146158
</ul>
147159

148160

0 commit comments

Comments
 (0)