Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 38525200BA1 for ; Mon, 12 Sep 2016 04:13:28 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 36E33160AD4; Mon, 12 Sep 2016 02:13:28 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 86213160AC7 for ; Mon, 12 Sep 2016 04:13:27 +0200 (CEST) Received: (qmail 27786 invoked by uid 500); 12 Sep 2016 02:13:26 -0000 Mailing-List: contact commits-help@zest.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zest.apache.org Delivered-To: mailing list commits@zest.apache.org Received: (qmail 27777 invoked by uid 99); 12 Sep 2016 02:13:26 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Sep 2016 02:13:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8DCB1E04BA; Mon, 12 Sep 2016 02:13:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: paulmerlin@apache.org To: commits@zest.apache.org Date: Mon, 12 Sep 2016 02:13:26 -0000 Message-Id: <5b867959f4c249ce8f69c74b747b09a1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] zest-java git commit: ZEST-175 Temporarily disable Jacoco when running with Java 9 archived-at: Mon, 12 Sep 2016 02:13:28 -0000 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 Authored: Sun Sep 11 19:08:02 2016 -0700 Committer: Paul Merlin 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" }