From 6578d374b626087b61ba72f7647c0c86560eee56 Mon Sep 17 00:00:00 2001 From: Markus Heberling Date: Tue, 10 Aug 2021 18:31:07 +0200 Subject: [PATCH] update to jacoco 0.8.7 --- pom.xml | 2 +- .../maven/AbstractReportAggregateAllMojo.java | 19 +++++++++---------- .../maven/AbstractReportAggregateMojo.java | 4 ++++ 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 91d389b..a651a35 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ http://maven.apache.org - 0.8.6 + 0.8.7 local diff --git a/src/main/java/org/jacoco/maven/AbstractReportAggregateAllMojo.java b/src/main/java/org/jacoco/maven/AbstractReportAggregateAllMojo.java index ab3a770..0ec726c 100644 --- a/src/main/java/org/jacoco/maven/AbstractReportAggregateAllMojo.java +++ b/src/main/java/org/jacoco/maven/AbstractReportAggregateAllMojo.java @@ -90,13 +90,6 @@ private void loadExecutionData(final ReportSupport support, } } - @Override - void addFormatters(final ReportSupport support, final Locale locale) - throws IOException { - support.addAllFormatters(outputDirectory, outputEncoding, footer, - locale); - } - @Override void createReport(final IReportGroupVisitor visitor, final ReportSupport support) throws IOException { @@ -108,11 +101,14 @@ void createReport(final IReportGroupVisitor visitor, } @Override - protected String getOutputDirectory() { - return outputDirectory.getAbsolutePath(); + File getOutputDirectory() { + return outputDirectory; + } + + public File getReportOutputDirectory() { + return outputDirectory; } - @Override public void setReportOutputDirectory(final File reportOutputDirectory) { if (reportOutputDirectory != null && !reportOutputDirectory .getAbsolutePath().endsWith("jacoco-aggregate-all")) { @@ -135,4 +131,7 @@ private List getProjects() { return session.getProjectDependencyGraph().getSortedProjects(); } + protected MavenProject getProject(){ + return project; + } } \ No newline at end of file diff --git a/src/main/java/org/jacoco/maven/AbstractReportAggregateMojo.java b/src/main/java/org/jacoco/maven/AbstractReportAggregateMojo.java index c9ce5a7..c52291a 100644 --- a/src/main/java/org/jacoco/maven/AbstractReportAggregateMojo.java +++ b/src/main/java/org/jacoco/maven/AbstractReportAggregateMojo.java @@ -104,4 +104,8 @@ void createReport(final IReportGroupVisitor visitor, dependency, getIncludes(), getExcludes(), sourceEncoding); } } + + protected MavenProject getProject(){ + return project; + } }