Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Require at least Maven 3.0 for jacoco-maven-plugin #821

Merged
merged 1 commit into from Jan 10, 2019
Merged

Require at least Maven 3.0 for jacoco-maven-plugin #821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 2 additions & 4 deletions jacoco-maven-plugin.test/it/it-check-fails-halt/pom.xml
View file
Open in desktop
Expand Up @@ -40,15 +40,13 @@
</goals>
<configuration>
<rules>
<!-- implementation is needed only for Maven 2 -->
<rule implementation="org.jacoco.maven.RuleConfiguration">
<rule>
<element>CLASS</element>
<includes>
<include>Example</include>
</includes>
<limits>
<!-- implementation is needed only for Maven 2 -->
<limit implementation="org.jacoco.report.check.Limit">
<limit>
<counter>METHOD</counter>
<value>MISSEDCOUNT</value>
<maximum>0</maximum>
Expand Down
6 changes: 2 additions & 4 deletions jacoco-maven-plugin.test/it/it-check-fails-no-halt/pom.xml
View file
Open in desktop
Expand Up @@ -41,12 +41,10 @@
<configuration>
<haltOnFailure>false</haltOnFailure>
<rules>
<!-- implementation is needed only for Maven 2 -->
<rule implementation="org.jacoco.maven.RuleConfiguration">
<rule>
<element>BUNDLE</element>
<limits>
<!-- implementation is needed only for Maven 2 -->
<limit implementation="org.jacoco.report.check.Limit">
<limit>
<counter>METHOD</counter>
<value>MISSEDCOUNT</value>
<maximum>0</maximum>
Expand Down
9 changes: 3 additions & 6 deletions jacoco-maven-plugin.test/it/it-check-passes/pom.xml
View file
Open in desktop
Expand Up @@ -40,18 +40,15 @@
</goals>
<configuration>
<rules>
<!-- implementation is needed only for Maven 2 -->
<rule implementation="org.jacoco.maven.RuleConfiguration">
<rule>
<element>BUNDLE</element>
<limits>
<!-- implementation is needed only for Maven 2 -->
<limit implementation="org.jacoco.report.check.Limit">
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.90</minimum>
</limit>
<!-- implmentation is needed only for Maven 2 -->
<limit implementation="org.jacoco.report.check.Limit">
<limit>
<counter>CLASS</counter>
<value>MISSEDCOUNT</value>
<maximum>0</maximum>
Expand Down
6 changes: 2 additions & 4 deletions jacoco-maven-plugin.test/it/it-dump/pom.xml
View file
Open in desktop
Expand Up @@ -50,12 +50,10 @@
</goals>
<configuration>
<rules>
<!-- implementation is needed only for Maven 2 -->
<rule implementation="org.jacoco.maven.RuleConfiguration">
<rule>
<element>BUNDLE</element>
<limits>
<!-- implementation is needed only for Maven 2 -->
<limit implementation="org.jacoco.report.check.Limit">
<limit>
<counter>CLASS</counter>
<value>COVEREDCOUNT</value>
<minimum>1</minimum>
Expand Down
6 changes: 2 additions & 4 deletions jacoco-maven-plugin.test/it/it-java9/pom.xml
View file
Open in desktop
Expand Up @@ -49,11 +49,9 @@
</goals>
<configuration>
<rules>
<!-- implementation is needed only for Maven 2 -->
<rule implementation="org.jacoco.maven.RuleConfiguration">
<rule>
<limits>
<!-- implementation is needed only for Maven 2 -->
<limit implementation="org.jacoco.report.check.Limit">
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDCOUNT</value>
<minimum>8</minimum>
Expand Down
4 changes: 2 additions & 2 deletions jacoco-maven-plugin/pom.xml
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@
<description>The JaCoCo Maven Plugin provides the JaCoCo runtime agent to your tests and allows basic report creation.</description>

<prerequisites>
<maven>2.2.1</maven>
<maven>3.0</maven>
</prerequisites>

<dependencyManagement>
Expand All @@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
<artifactId>maven-core</artifactId>
<version>${project.prerequisites.maven}</version>
</dependency>
<dependency>
Expand Down
12 changes: 3 additions & 9 deletions jacoco-maven-plugin/src/org/jacoco/maven/CheckMojo.java
View file
Open in desktop
Expand Up @@ -64,28 +64,22 @@ public class CheckMojo extends AbstractJacocoMojo implements IViolationsOutput {
* </ul>
*
* <p>
* Note that you <b>must</b> use <tt>implementation</tt> hints for
* <tt>rule</tt> and <tt>limit</tt> when using Maven 2, with Maven 3 you do
* not need to specify the attributes.
* </p>
*
* <p>
* This example requires an overall instruction coverage of 80% and no class
* must be missed:
* </p>
*
* <pre>
* {@code
* <rules>
* <rule implementation="org.jacoco.maven.RuleConfiguration">
* <rule>
* <element>BUNDLE</element>
* <limits>
* <limit implementation="org.jacoco.report.check.Limit">
* <limit>
* <counter>INSTRUCTION</counter>
* <value>COVEREDRATIO</value>
* <minimum>0.80</minimum>
* </limit>
* <limit implementation="org.jacoco.report.check.Limit">
* <limit>
* <counter>CLASS</counter>
* <value>MISSEDCOUNT</value>
* <maximum>0</maximum>
Expand Down
5 changes: 1 addition & 4 deletions jacoco-maven-plugin/src/org/jacoco/maven/MergeMojo.java
View file
Open in desktop
Expand Up @@ -43,13 +43,10 @@ public class MergeMojo extends AbstractJacocoMojo {
/**
* This mojo accepts any number of execution data file sets.
*
* Note that you need an <tt>implementation</tt> hint on <tt>fileset</tt>
* with Maven 2 (not needed with Maven 3):
*
* <pre>
* <code>
* &lt;fileSets&gt;
* &lt;fileSet implementation="org.apache.maven.shared.model.fileset.FileSet"&gt;
* &lt;fileSet&gt;
* &lt;directory&gt;${project.build.directory}&lt;/directory&gt;
* &lt;includes&gt;
* &lt;include&gt;*.exec&lt;/include&gt;
Expand Down
2 changes: 2 additions & 0 deletions org.jacoco.doc/docroot/doc/changes.html
View file
Open in desktop
Expand Up @@ -22,6 +22,8 @@ <h2>Snapshot Build @qualified.bundle.version@ (@build.date@)</h2>

<h3>New Features</h3>
<ul>
<li>jacoco-maven-plugin now requires at least Maven 3.0
(GitHub <a href="https://github.com/jacoco/jacoco/issues/821">#821</a>).</li>
<li>JaCoCo now officially supports Java 11
(GitHub <a href="https://github.com/jacoco/jacoco/issues/760">#760</a>).</li>
<li>Branch added by the Kotlin compiler for "unsafe" cast operator is filtered
Expand Down
2 changes: 1 addition & 1 deletion org.jacoco.doc/docroot/doc/maven.html
View file
Open in desktop
Expand Up @@ -73,7 +73,7 @@ <h2>Prerequisites</h2>
</p>

<ul>
<li>Maven 2.1.0 or higher and</li>
<li>Maven 3.0 or higher and</li>
<li>Java 1.5 or higher (for both, the Maven runtime and the test executor).</li>
</ul>

Expand Down
6 changes: 2 additions & 4 deletions org.jacoco.examples/build/pom-it.xml
View file
Open in desktop
Expand Up @@ -74,12 +74,10 @@
</goals>
<configuration>
<rules>
<!-- implementation is needed only for Maven 2 -->
<rule implementation="org.jacoco.maven.RuleConfiguration">
<rule>
<element>BUNDLE</element>
<limits>
<!-- implementation is needed only for Maven 2 -->
<limit implementation="org.jacoco.report.check.Limit">
<limit>
<counter>COMPLEXITY</counter>
<value>COVEREDRATIO</value>
<minimum>0.60</minimum>
Expand Down
6 changes: 2 additions & 4 deletions org.jacoco.examples/build/pom-offline.xml
View file
Open in desktop
Expand Up @@ -75,12 +75,10 @@
</goals>
<configuration>
<rules>
<!-- implementation is needed only for Maven 2 -->
<rule implementation="org.jacoco.maven.RuleConfiguration">
<rule>
<element>BUNDLE</element>
<limits>
<!-- implementation is needed only for Maven 2 -->
<limit implementation="org.jacoco.report.check.Limit">
<limit>
<counter>COMPLEXITY</counter>
<value>COVEREDRATIO</value>
<minimum>0.60</minimum>
Expand Down
6 changes: 2 additions & 4 deletions org.jacoco.examples/build/pom.xml
View file
Open in desktop
Expand Up @@ -62,12 +62,10 @@
</goals>
<configuration>
<rules>
<!-- implementation is needed only for Maven 2 -->
<rule implementation="org.jacoco.maven.RuleConfiguration">
<rule>
<element>BUNDLE</element>
<limits>
<!-- implementation is needed only for Maven 2 -->
<limit implementation="org.jacoco.report.check.Limit">
<limit>
<counter>COMPLEXITY</counter>
<value>COVEREDRATIO</value>
<minimum>0.60</minimum>
Expand Down