aboutsummaryrefslogtreecommitdiff
path: root/jacoco-maven-plugin/src/org/jacoco/maven/ReportAggregateMojo.java
diff options
context:
space:
mode:
authorMarc R. Hoffmann <hoffmann@mountainminds.com>2020-12-25 09:36:09 +0100
committerGitHub <noreply@github.com>2020-12-25 09:36:09 +0100
commit07e6c6258366413d76632ba7a93e6ee052d5c5e7 (patch)
tree05a75b1ccba1f5a258b38629775009c11d140ec0 /jacoco-maven-plugin/src/org/jacoco/maven/ReportAggregateMojo.java
parent29f6b48c5ae464ee47a1f4516957edc793ff24bc (diff)
downloadjacoco-07e6c6258366413d76632ba7a93e6ee052d5c5e7.tar.gz
Remove dependency on maven-reporting-impl (#1121)
This dependency is not really useful for JaCoCo reports and has several transitive dependencies where security vulnerabilities have been reported.
Diffstat (limited to 'jacoco-maven-plugin/src/org/jacoco/maven/ReportAggregateMojo.java')
-rw-r--r--jacoco-maven-plugin/src/org/jacoco/maven/ReportAggregateMojo.java12
1 files changed, 5 insertions, 7 deletions
diff --git a/jacoco-maven-plugin/src/org/jacoco/maven/ReportAggregateMojo.java b/jacoco-maven-plugin/src/org/jacoco/maven/ReportAggregateMojo.java
index 74c4b1ac..a1fb501e 100644
--- a/jacoco-maven-plugin/src/org/jacoco/maven/ReportAggregateMojo.java
+++ b/jacoco-maven-plugin/src/org/jacoco/maven/ReportAggregateMojo.java
@@ -107,7 +107,7 @@ public class ReportAggregateMojo extends AbstractReportMojo {
final FileFilter filter = new FileFilter(dataFileIncludes,
dataFileExcludes);
- loadExecutionData(support, filter, getProject().getBasedir());
+ loadExecutionData(support, filter, project.getBasedir());
for (final MavenProject dependency : findDependencies(
Artifact.SCOPE_COMPILE, Artifact.SCOPE_RUNTIME,
Artifact.SCOPE_PROVIDED, Artifact.SCOPE_TEST)) {
@@ -141,12 +141,10 @@ public class ReportAggregateMojo extends AbstractReportMojo {
}
}
- @Override
- protected String getOutputDirectory() {
- return outputDirectory.getAbsolutePath();
+ public File getReportOutputDirectory() {
+ return outputDirectory;
}
- @Override
public void setReportOutputDirectory(final File reportOutputDirectory) {
if (reportOutputDirectory != null && !reportOutputDirectory
.getAbsolutePath().endsWith("jacoco-aggregate")) {
@@ -168,7 +166,7 @@ public class ReportAggregateMojo extends AbstractReportMojo {
private List<MavenProject> findDependencies(final String... scopes) {
final List<MavenProject> result = new ArrayList<MavenProject>();
final List<String> scopeList = Arrays.asList(scopes);
- for (final Object dependencyObject : getProject().getDependencies()) {
+ for (final Object dependencyObject : project.getDependencies()) {
final Dependency dependency = (Dependency) dependencyObject;
if (scopeList.contains(dependency.getScope())) {
final MavenProject project = findProjectFromReactor(dependency);
@@ -192,7 +190,7 @@ public class ReportAggregateMojo extends AbstractReportMojo {
try {
depVersionAsRange = VersionRange
.createFromVersionSpec(d.getVersion());
- } catch (InvalidVersionSpecificationException e) {
+ } catch (final InvalidVersionSpecificationException e) {
throw new AssertionError(e);
}