polygene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From paulmer...@apache.org
Subject [1/2] zest-java git commit: ZEST-175 Temporarily disable Jacoco when running with Java 9
Date Mon, 12 Sep 2016 02:13:26 GMT
Repository: zest-java
Updated Branches:
  refs/heads/develop e6133864e -> ce9938d45


ZEST-175 Temporarily disable Jacoco when running with Java 9


Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/575e0293
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/575e0293
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/575e0293

Branch: refs/heads/develop
Commit: 575e029362b2e0714e9ac2ce779bcc03f10b19d1
Parents: e613386
Author: Paul Merlin <paulmerlin@apache.org>
Authored: Sun Sep 11 19:08:02 2016 -0700
Committer: Paul Merlin <paulmerlin@apache.org>
Committed: Sun Sep 11 19:08:02 2016 -0700

----------------------------------------------------------------------
 build.gradle | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-java/blob/575e0293/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 56c4c4f..4493880 100644
--- a/build.gradle
+++ b/build.gradle
@@ -294,7 +294,9 @@ allprojects {
   if( ext.javaDir.isDirectory() || ext.scalaDir.isDirectory() || ext.groovyDir.isDirectory()
||
       ext.testJavaDir.isDirectory() || ext.testScalaDir.isDirectory() || ext.testGroovyDir.isDirectory()
)
   {
-    apply plugin: 'jacoco'
+    if( JavaVersion.current() < JavaVersion.VERSION_1_9 ) {
+      apply plugin: 'jacoco'
+    }
     apply plugin: 'osgi'
     apply plugin: VersionClass
     apply plugin: AsciidocBuildInfo
@@ -378,8 +380,10 @@ allprojects {
         }
       }
     }
-    jacoco {
-      toolVersion = '0.7.5.201505241946'
+    if(JavaVersion.current() < JavaVersion.VERSION_1_9 ) {
+      jacoco {
+        toolVersion = '0.7.5.201505241946'
+      }
     }
 
 //    // Create checkstyle report
@@ -480,6 +484,7 @@ dependencies {
 }
 // Generate a global code codeverage report
 task coverageReport {
+  enabled = JavaVersion.current() < JavaVersion.VERSION_1_9
   dependsOn subprojects*.test
   def outputPath = "build/reports/coverage"
   inputs.dir subprojects.collect { p -> "${p.buildDir.path}/jacoco" }


Mime
View raw message