From aa23aad6f82e7ef5cf7d60973d7890723dcc10cd Mon Sep 17 00:00:00 2001
From: Ismael Juma <ismael@juma.me.uk>
Date: Sun, 8 Apr 2018 23:14:15 -0700
Subject: [PATCH 1/2] MINOR: Upgrade EasyMock to 3.6 for Java 10 support

`./gradlew clients:test` passes with this change.
---
 gradle/dependencies.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index effe763ac451b..d6beba958ddaa 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",

From 6c78f3d6adedf4cceda7f7272cae91126bb14520 Mon Sep 17 00:00:00 2001
From: Ismael Juma <ismael@juma.me.uk>
Date: Mon, 9 Apr 2018 00:57:50 -0700
Subject: [PATCH 2/2] Don't enable jacoco for core project (since it's Scala)

---
 build.gradle | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index f8daf2fdddc3c..f83698050ed5a 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