From db5fefeb4c45b22c67b5a14a7fdf945050a2a6bf Mon Sep 17 00:00:00 2001
From: Sylwester Lachiewicz <slachiewicz@gmail.com>
Date: Thu, 10 Jan 2019 09:44:31 +0100
Subject: Require at least Maven 3.0 for jacoco-maven-plugin (#821)

---
 jacoco-maven-plugin/pom.xml                             |  4 ++--
 jacoco-maven-plugin/src/org/jacoco/maven/CheckMojo.java | 12 +++---------
 jacoco-maven-plugin/src/org/jacoco/maven/MergeMojo.java |  5 +----
 3 files changed, 6 insertions(+), 15 deletions(-)

(limited to 'jacoco-maven-plugin')

diff --git a/jacoco-maven-plugin/pom.xml b/jacoco-maven-plugin/pom.xml
index f3819f0f..f048f402 100644
--- a/jacoco-maven-plugin/pom.xml
+++ b/jacoco-maven-plugin/pom.xml
@@ -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>
@@ -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>
diff --git a/jacoco-maven-plugin/src/org/jacoco/maven/CheckMojo.java b/jacoco-maven-plugin/src/org/jacoco/maven/CheckMojo.java
index 6b37a6b4..ad021b37 100644
--- a/jacoco-maven-plugin/src/org/jacoco/maven/CheckMojo.java
+++ b/jacoco-maven-plugin/src/org/jacoco/maven/CheckMojo.java
@@ -64,12 +64,6 @@ 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>
@@ -77,15 +71,15 @@ public class CheckMojo extends AbstractJacocoMojo implements IViolationsOutput {
 	 * <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>
diff --git a/jacoco-maven-plugin/src/org/jacoco/maven/MergeMojo.java b/jacoco-maven-plugin/src/org/jacoco/maven/MergeMojo.java
index 8b882e08..bbac299d 100644
--- a/jacoco-maven-plugin/src/org/jacoco/maven/MergeMojo.java
+++ b/jacoco-maven-plugin/src/org/jacoco/maven/MergeMojo.java
@@ -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;
-- 
cgit v1.2.3