diff --git a/.travis.yml b/.travis.yml
index 52e2adcf814..a5cfcc0f3eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ jobs:
 
     - stage: test
       env: [ NAME=core ]
-      jdk: oraclejdk9
+      jdk: openjdk11
       script: ./gradlew testcontainers:check
 
     - env: [ NAME=selenium ]
diff --git a/build.gradle b/build.gradle
index c26914002f0..4a725afb9df 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ subprojects {
     compileJava.options.encoding = 'UTF-8'
 
     lombok {
-	    version = '1.16.20'
+	    version = '1.18.2'
     }
 
     task delombok(type: io.franzbecker.gradle.lombok.task.DelombokTask) {
diff --git a/core/build.gradle b/core/build.gradle
index fec6cd6ee71..bda81410355 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -127,7 +127,8 @@ dependencies {
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
     testCompile files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
-    jarFileTestCompileOnly 'org.projectlombok:lombok:1.16.20'
+
+    jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestCompile 'junit:junit:4.12'
     jarFileTestCompile 'org.assertj:assertj-core:3.8.0'
     jarFileTestCompile 'org.ow2.asm:asm-debug-all:5.2'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 73bb13d5561..019065d1d65 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip