[incubator-netbeans] branch master updated: [NETBEANS-1768] Adding additional check for plugin executions if the JaCoCo outputDirectory is customised within an execution

[lk...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git


The following commit(s) were added to refs/heads/master by this push:
     new 6067b98  [NETBEANS-1768] Adding additional check for plugin executions if the JaCoCo outputDirectory is customised within an execution
6067b98 is described below

commit 6067b9860ed2b2047f4f0c85dcd215bd97e08efb
Author: John McDonnell <mc...@gmail.com>
AuthorDate: Sun Dec 2 19:27:48 2018 +0000

    [NETBEANS-1768] Adding additional check for plugin executions if the JaCoCo outputDirectory is customised within an execution
---
 .../org/netbeans/modules/maven/coverage/MavenCoverageProvider.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/java/maven.coverage/src/org/netbeans/modules/maven/coverage/MavenCoverageProvider.java b/java/maven.coverage/src/org/netbeans/modules/maven/coverage/MavenCoverageProvider.java
index 5663591..6111409 100644
--- a/java/maven.coverage/src/org/netbeans/modules/maven/coverage/MavenCoverageProvider.java
+++ b/java/maven.coverage/src/org/netbeans/modules/maven/coverage/MavenCoverageProvider.java
@@ -135,6 +135,11 @@ public final class MavenCoverageProvider implements CoverageProvider {
                     return null;
                 }
             }
+            File outputFile = FileUtil.normalizeFile(new File(outputDirectory));
+            if (!outputFile.exists()) {
+                // NETBEANS-1768 checking the plugin executions if the outputDirectory is customised
+                outputDirectory = PluginPropertyUtils.getPluginProperty(p, GROUP_JOCOCO, ARTIFACT_JOCOCO, "outputDirectory", "report", null);
+            }
             return FileUtil.normalizeFile(new File(outputDirectory, "jacoco.xml"));
         } else {
         String outputDirectory = PluginPropertyUtils.getReportPluginProperty(p, GROUP_COBERTURA, ARTIFACT_COBERTURA, "outputDirectory", null);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists