aboutsummaryrefslogtreecommitdiff
path: root/jacoco-maven-plugin
diff options
context:
space:
mode:
authorMirko Friedenhagen <mfriedenhagen@gmail.com>2013-11-10 21:30:06 +0100
committerMirko Friedenhagen <mfriedenhagen@gmail.com>2013-11-10 21:30:06 +0100
commitdb437d1ceef3447f52c8b0710b5dd42daf5d327c (patch)
tree0085c54d0b4971f79dcc3c0514e2d259cbc9cf3f /jacoco-maven-plugin
parent11fe3a45efc2aef618c65e48bb1cc8ad506657bd (diff)
parentf66d173d5e07d4c645db9fdd10d4d048251ffc39 (diff)
downloadjacoco-db437d1ceef3447f52c8b0710b5dd42daf5d327c.tar.gz
Merge remote-tracking branch 'upstream/master' into multiple-maven-reports-new
Diffstat (limited to 'jacoco-maven-plugin')
-rw-r--r--jacoco-maven-plugin/src/org/jacoco/maven/AgentMojo.java17
-rw-r--r--jacoco-maven-plugin/src/org/jacoco/maven/CheckMojo.java1
-rw-r--r--jacoco-maven-plugin/src/org/jacoco/maven/MergeMojo.java1
-rw-r--r--jacoco-maven-plugin/src/org/jacoco/maven/ReportMojo.java1
4 files changed, 20 insertions, 0 deletions
diff --git a/jacoco-maven-plugin/src/org/jacoco/maven/AgentMojo.java b/jacoco-maven-plugin/src/org/jacoco/maven/AgentMojo.java
index 7703b1f3..ac000705 100644
--- a/jacoco-maven-plugin/src/org/jacoco/maven/AgentMojo.java
+++ b/jacoco-maven-plugin/src/org/jacoco/maven/AgentMojo.java
@@ -14,21 +14,38 @@ package org.jacoco.maven;
import java.io.File;
/**
+ * <p>
* Prepares a property pointing to the JaCoCo runtime agent that can be passed
* as a VM argument to the application under test. Depending on the project
* packaging type by default a property with the following name is set:
+ * </p>
+ *
* <ul>
* <li>tycho.testArgLine for packaging type eclipse-test-plugin and</li>
* <li>argLine otherwise.</li>
* </ul>
+ *
+ * <p>
+ * Note that these properties must not be overwritten by the test configuration,
+ * otherwise the JaCoCo agent cannot be attached. If you need custom parameters
+ * please append them. For example:
+ * </p>
+ *
+ * <pre>
+ * &lt;argLine&gt;${argLine} -your -extra -arguments&lt;/argLine&gt;
+ * </pre>
+ *
+ * <p>
* Resulting coverage information is collected during execution and by default
* written to a file when the process terminates.
+ * </p>
*
* @phase initialize
* @goal prepare-agent
* @requiresProject true
* @requiresDependencyResolution runtime
* @threadSafe
+ * @since 0.5.3
*/
public class AgentMojo extends AbstractAgentMojo {
diff --git a/jacoco-maven-plugin/src/org/jacoco/maven/CheckMojo.java b/jacoco-maven-plugin/src/org/jacoco/maven/CheckMojo.java
index b4386588..cc50fc4a 100644
--- a/jacoco-maven-plugin/src/org/jacoco/maven/CheckMojo.java
+++ b/jacoco-maven-plugin/src/org/jacoco/maven/CheckMojo.java
@@ -36,6 +36,7 @@ import org.jacoco.report.check.RulesChecker;
* @phase verify
* @requiresProject true
* @threadSafe
+ * @since 0.6.1
*/
public class CheckMojo extends AbstractJacocoMojo implements IViolationsOutput {
diff --git a/jacoco-maven-plugin/src/org/jacoco/maven/MergeMojo.java b/jacoco-maven-plugin/src/org/jacoco/maven/MergeMojo.java
index 71a95824..93947410 100644
--- a/jacoco-maven-plugin/src/org/jacoco/maven/MergeMojo.java
+++ b/jacoco-maven-plugin/src/org/jacoco/maven/MergeMojo.java
@@ -28,6 +28,7 @@ import org.jacoco.core.data.ExecFileLoader;
* @goal merge
* @requiresProject true
* @threadSafe
+ * @since 0.6.4
*/
public class MergeMojo extends AbstractJacocoMojo {
diff --git a/jacoco-maven-plugin/src/org/jacoco/maven/ReportMojo.java b/jacoco-maven-plugin/src/org/jacoco/maven/ReportMojo.java
index 54a8243f..eeaf5988 100644
--- a/jacoco-maven-plugin/src/org/jacoco/maven/ReportMojo.java
+++ b/jacoco-maven-plugin/src/org/jacoco/maven/ReportMojo.java
@@ -23,6 +23,7 @@ import java.util.Locale;
* @goal report
* @requiresProject true
* @threadSafe
+ * @since 0.5.3
*/
public class ReportMojo extends AbstractReportMojo {