[8/8] incubator-edgent git commit: [gradle] simplify jacoco class inclusion/exclusion expression

[dlaboss]

[gradle] simplify jacoco class inclusion/exclusion expression

Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/d10b32f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/d10b32f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/d10b32f2

Branch: refs/heads/master
Commit: d10b32f2f1f5c97b9b2dc8b8812240141dc57c18
Parents: 70e5573
Author: Dale LaBossiere <dlab...@us.ibm.com>
Authored: Wed Sep 7 12:29:13 2016 -0400
Committer: Dale LaBossiere <dlab...@us.ibm.com>
Committed: Wed Sep 7 12:29:13 2016 -0400

----------------------------------------------------------------------
 build.gradle | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/d10b32f2/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 9dbf6c4..3322337 100644
--- a/build.gradle
+++ b/build.gradle
@@ -579,13 +579,12 @@ task jacocoTestReport << {
     jococoClassfilesFromJars = false;
 
     structure(name: project.name) {
-      // N.B. below exclude of **/AgentJar* is to exclude org.jacoco.agent code
       group(name: "Edgent API") {
         classfiles {
           if (jococoClassfilesFromJars) {
             fileset(dir: "${target_java8_dir}/lib", includes: 
"edgent.api.*.jar")
           } else {
-            fileset(dir: "api", includes: "**/build/**/*.class", excludes: 
"**/test/**,**/AgentJar*")
+            fileset(dir: "api", includes: "**/build/classes/main/**/*.class")
           }
         }
         sourcefiles {
@@ -601,7 +600,7 @@ task jacocoTestReport << {
           if (jococoClassfilesFromJars) {
             fileset(dir: "${target_java8_dir}/lib", includes: 
"edgent.spi.*.jar")
           } else {
-            fileset(dir: "spi", includes: "**/build/**/*.class", excludes: 
"**/test/**,**/AgentJar*")
+            fileset(dir: "spi", includes: "**/build/classes/main/**/*.class")
           }
         }
         sourcefiles {
@@ -614,7 +613,7 @@ task jacocoTestReport << {
           if (jococoClassfilesFromJars) {
             fileset(dir: "${target_java8_dir}/lib", includes: 
"edgent.runtime.*.jar")
           } else {
-            fileset(dir: "runtime", includes: "**/build/**/*.class", excludes: 
"**/test/**,**/AgentJar*")
+            fileset(dir: "runtime", includes: 
"**/build/classes/main/**/*.class")
           }
         }
         sourcefiles {
@@ -627,7 +626,7 @@ task jacocoTestReport << {
           if (jococoClassfilesFromJars) {
             fileset(dir: "${target_java8_dir}/utils", includes: 
"**/edgent.utils.*.jar")
           } else { 
-            fileset(dir: "utils", includes: "**/build/**/*.class", excludes: 
"**/test/**,**/AgentJar*")
+            fileset(dir: "utils", includes: "**/build/classes/main/**/*.class")
           }
         }
         sourcefiles {
@@ -640,7 +639,7 @@ task jacocoTestReport << {
           if (jococoClassfilesFromJars) {
             fileset(dir: "${target_java8_dir}/connectors", includes: 
"**/edgent.connectors.*.jar")
           } else { 
-            fileset(dir: "connectors", includes: "**/build/**/*.class", 
excludes: "**/test/**,**/AgentJar*")
+            fileset(dir: "connectors", includes: 
"**/build/classes/main/**/*.class")
           }
         }
         sourcefiles {
@@ -663,7 +662,7 @@ task jacocoTestReport << {
           if (jococoClassfilesFromJars) {
             fileset(dir: "${target_java8_dir}/lib", includes: 
"edgent.providers.*.jar")
           } else {
-            fileset(dir: "providers", includes: "**/build/**/*.class", 
excludes: "**/test/**,**/AgentJar*")
+            fileset(dir: "providers", includes: 
"**/build/classes/main/**/*.class")
           }
         }
         sourcefiles {
@@ -676,7 +675,7 @@ task jacocoTestReport << {
           if (jococoClassfilesFromJars) {
             fileset(dir: "${target_java8_dir}/analytics", includes: 
"**/edgent.analytics.*.jar")
           } else {
-            fileset(dir: "analytics", includes: "**/build/**/*.class", 
excludes: "**/test/**,**/AgentJar*")
+            fileset(dir: "analytics", includes: 
"**/build/classes/main/**/*.class")
           }
         }
         sourcefiles {
@@ -689,7 +688,7 @@ task jacocoTestReport << {
           if (jococoClassfilesFromJars) {
             fileset(dir: "${target_java8_dir}/console", includes: 
"**/edgent.console.*.jar")
           } else {
-            fileset(dir: "console", includes: "**/build/**/*.class", excludes: 
"**/test/**,**/AgentJar*")
+            fileset(dir: "console", includes: 
"**/build/classes/main/**/*.class")
           }
         }
         sourcefiles {