diff options
| author | Chas Honton <chas@honton.org> | 2017-08-10 10:46:17 -0700 |
|---|---|---|
| committer | Evgeny Mandrikov <Godin@users.noreply.github.com> | 2017-08-10 19:46:17 +0200 |
| commit | bb2ecb522ff87effe16536ab6daee86b710dc659 (patch) | |
| tree | 0b1a4cee2e1343e8696f9357e63710fe86ecbe34 | |
| parent | 86856fef9959d90acdddc9d15c7b3c5f587fe086 (diff) | |
| download | jacoco-bb2ecb522ff87effe16536ab6daee86b710dc659.tar.gz | |
Add Artifact.SCOPE_PROVIDED artifacts to aggregate report (#572)
| -rw-r--r-- | jacoco-maven-plugin/src/org/jacoco/maven/ReportAggregateMojo.java | 9 | ||||
| -rw-r--r-- | org.jacoco.doc/docroot/doc/changes.html | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/jacoco-maven-plugin/src/org/jacoco/maven/ReportAggregateMojo.java b/jacoco-maven-plugin/src/org/jacoco/maven/ReportAggregateMojo.java index abd9a048..e0d5c5a6 100644 --- a/jacoco-maven-plugin/src/org/jacoco/maven/ReportAggregateMojo.java +++ b/jacoco-maven-plugin/src/org/jacoco/maven/ReportAggregateMojo.java @@ -42,8 +42,8 @@ import org.jacoco.report.IReportGroupVisitor; * </p> * * <ul> - * <li><code>compile</code>, <code>runtime</code>: Project source and execution - * data is included in the report.</li> + * <li><code>compile</code>, <code>runtime</code>, <code>provided</code>: + * Project source and execution data is included in the report.</li> * <li><code>test</code>: Only execution data is considered for the report.</li> * </ul> * @@ -106,7 +106,7 @@ public class ReportAggregateMojo extends AbstractReportMojo { loadExecutionData(support, filter, getProject().getBasedir()); for (final MavenProject dependency : findDependencies( Artifact.SCOPE_COMPILE, Artifact.SCOPE_RUNTIME, - Artifact.SCOPE_TEST)) { + Artifact.SCOPE_PROVIDED, Artifact.SCOPE_TEST)) { loadExecutionData(support, filter, dependency.getBasedir()); } } @@ -130,7 +130,8 @@ public class ReportAggregateMojo extends AbstractReportMojo { final ReportSupport support) throws IOException { final IReportGroupVisitor group = visitor.visitGroup(title); for (final MavenProject dependency : findDependencies( - Artifact.SCOPE_COMPILE, Artifact.SCOPE_RUNTIME)) { + Artifact.SCOPE_COMPILE, Artifact.SCOPE_RUNTIME, + Artifact.SCOPE_PROVIDED)) { support.processProject(group, dependency.getArtifactId(), dependency, getIncludes(), getExcludes(), sourceEncoding); } diff --git a/org.jacoco.doc/docroot/doc/changes.html b/org.jacoco.doc/docroot/doc/changes.html index 40f57879..dc8d06b2 100644 --- a/org.jacoco.doc/docroot/doc/changes.html +++ b/org.jacoco.doc/docroot/doc/changes.html @@ -39,8 +39,10 @@ (GitHub <a href="https://github.com/jacoco/jacoco/issues/513">#513</a>).</li> <li>Exclude from a report private empty constructors that do not have arguments (GitHub <a href="https://github.com/jacoco/jacoco/issues/529">#529</a>).</li> - <li>Maven aggregated reports will now also include modules of runtime dependencies - (GitHub <a href="https://github.com/jacoco/jacoco/issues/498">#498</a>).</li> + <li>Maven aggregated reports will now also include modules of <code>runtime</code> + and <code>provided</code> dependencies + (GitHub <a href="https://github.com/jacoco/jacoco/issues/498">#498</a>, + <a href="https://github.com/jacoco/jacoco/issues/572">#572</a>).</li> <li>JaCoCo now comes with a simple command line interface (GitHub <a href="https://github.com/jacoco/jacoco/issues/525">#525</a>).</li> <li>Manifests of JAR files now have <code>Automatic-Module-Name</code> for Java 9 |