[kafka] branch trunk updated: MINOR: Java 10 fixes so that the build passes (#4839)

[ij...@apache.org]

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

ijuma pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/trunk by this push:
     new e6b4d17  MINOR: Java 10 fixes so that the build passes (#4839)
e6b4d17 is described below

commit e6b4d17c593d764875db6681f20c51828780bf75
Author: Ismael Juma <is...@juma.me.uk>
AuthorDate: Mon Apr 9 03:34:36 2018 -0700

    MINOR: Java 10 fixes so that the build passes (#4839)
    
    * Upgrade EasyMock to 3.6 which adds support for Java 10
    by upgrading to ASM 6.1.1.
    
    * Ensure that Jacoco is truly disabled for the `core` project.
    This was the original intent, since it's in Scala, but it had not
    been achieved. This is important because the Jacoco agent
    fails when it tries to instrument the classes compiled by
    scalac with Java 10.
---
 build.gradle               | 5 ++---
 gradle/dependencies.gradle | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index f8daf2f..f836980 100644
--- a/build.gradle
+++ b/build.gradle
@@ -41,7 +41,6 @@ allprojects {
   }
   
   apply plugin: 'idea'
-  apply plugin: "jacoco"
   apply plugin: 'org.owasp.dependencycheck'
   apply plugin: 'com.github.ben-manes.versions'
 
@@ -384,6 +383,7 @@ subprojects {
 
   // Ignore core since its a scala project
   if (it.path != ':core') {
+    apply plugin: "jacoco"
 
     jacoco {
       toolVersion = "0.8.1"
@@ -591,8 +591,7 @@ project(':core') {
     scoverage libs.scoveragePlugin
     scoverage libs.scoverageRuntime
   }
-
-  jacocoTestReport.enabled = false
+  
   scoverage {
     reportDir = file("${rootProject.buildDir}/scoverage")
     highlighting = false
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index effe763..d6beba9 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -52,7 +52,7 @@ versions += [
   apacheds: "2.0.0-M24",
   argparse4j: "0.7.0",
   bcpkix: "1.59",
-  easymock: "3.5.1",
+  easymock: "3.6",
   jackson: "2.9.5",
   jetty: "9.2.24.v20180105",
   jersey: "2.25.1",

-- 
To stop receiving notification emails like this one, please contact
ijuma@apache.org.