From daeac3c908fd3bbaba48db4c74049e8df3dc831e Mon Sep 17 00:00:00 2001 From: Enrico Olivelli Date: Fri, 30 Nov 2018 09:22:38 +0100 Subject: [PATCH] Issue 3065: Upgrade tools in order to support JDK 10 (#3066) * Upgrades JaCoCo to 0.8.2 * Upgrades Mockito to 2.23.0 * Upgrades Lombok to 1.18.4 * Sets lombok.anyConstructor.addConstructorProperties=true Signed-off-by: Enrico Olivelli --- gradle.properties | 5 +++-- gradle/jacoco.gradle | 3 +++ lombok.config | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 976e32a9f3e..c359dc29b87 100644 --- a/gradle.properties +++ b/gradle.properties @@ -35,12 +35,13 @@ jaxbVersion=2.3.0 javaxAnnotationVersion=1.3.2 jerseyVersion=2.26 junitVersion=4.12 -lombokVersion=1.16.18 +lombokVersion=1.18.4 marathonClientVersion=0.6.0 metrics3StatsdVersion=4.2.0 metricsVersion=3.2.5 metricsGangliaVersion=1.0.10 -mockitoVersion=2.10.0 +mockitoVersion=2.23.0 +jacocoVersion=0.8.2 #Check issue in https://github.com/pravega/pravega/pull/2146 before when upgrading netty nettyVersion=4.1.16.Final nettyBoringSSLVersion=2.0.8.Final diff --git a/gradle/jacoco.gradle b/gradle/jacoco.gradle index c92da7263a5..79d9d33e60c 100644 --- a/gradle/jacoco.gradle +++ b/gradle/jacoco.gradle @@ -9,6 +9,9 @@ * */ plugins.withId('jacoco') { + jacoco { + toolVersion = jacocoVersion + } jacocoTestReport { reports { xml.enabled true diff --git a/lombok.config b/lombok.config index 326c1e4ed9d..c2730a31513 100644 --- a/lombok.config +++ b/lombok.config @@ -1,2 +1,5 @@ config.stopBubbling = true lombok.extern.findbugs.addSuppressFBWarnings = true +#see https://github.com/rzwitserloot/lombok/issues/1612 +lombok.anyConstructor.addConstructorProperties=true +