aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Mandrikov <mandrikov@gmail.com>2013-01-21 20:41:30 +0100
committerEvgeny Mandrikov <mandrikov@gmail.com>2013-01-21 20:41:31 +0100
commit741c894ad22ec9c11fd1815c9f17a003fac864a5 (patch)
treeb21a7b67f725acf9dedef9790dcf99087b31076d
parentb61ed960ea01616297aea59d112ee4cd60ae6a76 (diff)
downloadjacoco-741c894ad22ec9c11fd1815c9f17a003fac864a5.tar.gz
GitHub #72: Default phase for goal "report" should be "prepare-package"
-rw-r--r--jacoco-maven-plugin.test/it/it-includes-excludes/pom.xml2
-rw-r--r--jacoco-maven-plugin.test/it/it-multi-module/pom.xml2
-rw-r--r--jacoco-maven-plugin.test/it/it-offline-instrumentation/pom.xml1
-rw-r--r--jacoco-maven-plugin.test/it/it-report-unreadable-dump/pom.xml1
-rw-r--r--jacoco-maven-plugin.test/it/it-report-without-debug/pom.xml2
-rw-r--r--jacoco-maven-plugin.test/it/it-report-without-dump/pom.xml1
-rw-r--r--jacoco-maven-plugin/src/org/jacoco/maven/ReportMojo.java1
-rw-r--r--org.jacoco.doc/docroot/doc/changes.html2
-rw-r--r--org.jacoco.examples/build/pom.xml2
9 files changed, 7 insertions, 7 deletions
diff --git a/jacoco-maven-plugin.test/it/it-includes-excludes/pom.xml b/jacoco-maven-plugin.test/it/it-includes-excludes/pom.xml
index 23183ca5..d7411ffb 100644
--- a/jacoco-maven-plugin.test/it/it-includes-excludes/pom.xml
+++ b/jacoco-maven-plugin.test/it/it-includes-excludes/pom.xml
@@ -34,13 +34,13 @@
</configuration>
<executions>
<execution>
+ <id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
- <phase>prepare-package</phase>
<goals>
<goal>report</goal>
</goals>
diff --git a/jacoco-maven-plugin.test/it/it-multi-module/pom.xml b/jacoco-maven-plugin.test/it/it-multi-module/pom.xml
index ae26b3a6..3fe4eed0 100644
--- a/jacoco-maven-plugin.test/it/it-multi-module/pom.xml
+++ b/jacoco-maven-plugin.test/it/it-multi-module/pom.xml
@@ -34,13 +34,13 @@
<artifactId>jacoco-maven-plugin</artifactId>
<executions>
<execution>
+ <id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
- <phase>prepare-package</phase>
<goals>
<goal>report</goal>
</goals>
diff --git a/jacoco-maven-plugin.test/it/it-offline-instrumentation/pom.xml b/jacoco-maven-plugin.test/it/it-offline-instrumentation/pom.xml
index fb9ee3da..8d4d3238 100644
--- a/jacoco-maven-plugin.test/it/it-offline-instrumentation/pom.xml
+++ b/jacoco-maven-plugin.test/it/it-offline-instrumentation/pom.xml
@@ -62,7 +62,6 @@
</execution>
<execution>
<id>report</id>
- <phase>prepare-package</phase>
<goals>
<goal>report</goal>
</goals>
diff --git a/jacoco-maven-plugin.test/it/it-report-unreadable-dump/pom.xml b/jacoco-maven-plugin.test/it/it-report-unreadable-dump/pom.xml
index 4b490fe3..289250d8 100644
--- a/jacoco-maven-plugin.test/it/it-report-unreadable-dump/pom.xml
+++ b/jacoco-maven-plugin.test/it/it-report-unreadable-dump/pom.xml
@@ -29,7 +29,6 @@
<executions>
<execution>
<id>report</id>
- <phase>prepare-package</phase>
<goals>
<goal>report</goal>
</goals>
diff --git a/jacoco-maven-plugin.test/it/it-report-without-debug/pom.xml b/jacoco-maven-plugin.test/it/it-report-without-debug/pom.xml
index bd650405..bd924276 100644
--- a/jacoco-maven-plugin.test/it/it-report-without-debug/pom.xml
+++ b/jacoco-maven-plugin.test/it/it-report-without-debug/pom.xml
@@ -28,13 +28,13 @@
<artifactId>jacoco-maven-plugin</artifactId>
<executions>
<execution>
+ <id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
- <phase>prepare-package</phase>
<goals>
<goal>report</goal>
</goals>
diff --git a/jacoco-maven-plugin.test/it/it-report-without-dump/pom.xml b/jacoco-maven-plugin.test/it/it-report-without-dump/pom.xml
index 72ea14ea..74abf8b9 100644
--- a/jacoco-maven-plugin.test/it/it-report-without-dump/pom.xml
+++ b/jacoco-maven-plugin.test/it/it-report-without-dump/pom.xml
@@ -29,7 +29,6 @@
<executions>
<execution>
<id>report</id>
- <phase>prepare-package</phase>
<goals>
<goal>report</goal>
</goals>
diff --git a/jacoco-maven-plugin/src/org/jacoco/maven/ReportMojo.java b/jacoco-maven-plugin/src/org/jacoco/maven/ReportMojo.java
index 06ef04e1..9475e347 100644
--- a/jacoco-maven-plugin/src/org/jacoco/maven/ReportMojo.java
+++ b/jacoco-maven-plugin/src/org/jacoco/maven/ReportMojo.java
@@ -45,6 +45,7 @@ import org.jacoco.report.xml.XMLFormatter;
* Creates a code coverage report for a single project in multiple formats
* (HTML, XML, and CSV).
*
+ * @phase prepare-package
* @goal report
* @requiresProject true
* @threadSafe
diff --git a/org.jacoco.doc/docroot/doc/changes.html b/org.jacoco.doc/docroot/doc/changes.html
index cdcb4583..0fc3fbd1 100644
--- a/org.jacoco.doc/docroot/doc/changes.html
+++ b/org.jacoco.doc/docroot/doc/changes.html
@@ -30,6 +30,8 @@
<li>New output mode 'none' can be used when agent is only controlled via JMX
or its new runtime API (GitHub #63).</li>
<li>Better error message in case of invalid stackmap frames (GitHub #73).</li>
+ <li>jacoco-maven-plugin: default phase for goal "report" - "prepare-package"
+ (GitHub #72).</li>
</ul>
<h3>Fixed Bugs</h3>
diff --git a/org.jacoco.examples/build/pom.xml b/org.jacoco.examples/build/pom.xml
index 1ea6cb22..a53d3054 100644
--- a/org.jacoco.examples/build/pom.xml
+++ b/org.jacoco.examples/build/pom.xml
@@ -39,13 +39,13 @@
<version>@project.version@</version>
<executions>
<execution>
+ <id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
- <phase>prepare-package</phase>
<goals>
<goal>report</goal>
</goals>