diff --git a/common/build.gradle b/common/build.gradle
index 18c400eb5e..40e5d27998 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -56,7 +56,7 @@ dependencies {
     compile 'org.bouncycastle:bcpg-jdk15on:1.56'
     compile 'commons-io:commons-io:2.4'
     compile 'org.apache.commons:commons-lang3:3.4'
-    compileOnly 'org.projectlombok:lombok:1.16.16'
-    annotationProcessor 'org.projectlombok:lombok:1.16.16'
+    compileOnly 'org.projectlombok:lombok:1.18.2'
+    annotationProcessor 'org.projectlombok:lombok:1.18.2'
     testCompile 'junit:junit:4.12'
 }
diff --git a/core/build.gradle b/core/build.gradle
index 7e93918d62..9ef8ea826f 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -43,8 +43,8 @@ dependencies {
     compile('com.fasterxml.jackson.core:jackson-databind:2.8.10') {
         exclude(module: 'jackson-annotations')
     }
-    compileOnly 'org.projectlombok:lombok:1.16.16'
-    annotationProcessor 'org.projectlombok:lombok:1.16.16'
+    compileOnly 'org.projectlombok:lombok:1.18.2'
+    annotationProcessor 'org.projectlombok:lombok:1.18.2'
     testCompile 'junit:junit:4.12'
     testCompile('org.mockito:mockito-core:2.8.9') {
         exclude(module: 'objenesis')
@@ -55,6 +55,6 @@ dependencies {
     testCompile 'org.springframework:spring-test:4.3.6.RELEASE'
     testCompile 'com.natpryce:make-it-easy:4.0.1'
     testCompile group: 'org.hamcrest', name: 'hamcrest-all', version: '1.3'
-    testCompileOnly 'org.projectlombok:lombok:1.16.16'
-    testAnnotationProcessor 'org.projectlombok:lombok:1.16.16'
+    testCompileOnly 'org.projectlombok:lombok:1.18.2'
+    testAnnotationProcessor 'org.projectlombok:lombok:1.18.2'
 }
diff --git a/desktop/build.gradle b/desktop/build.gradle
index 9385ab687b..866e98788e 100644
--- a/desktop/build.gradle
+++ b/desktop/build.gradle
@@ -55,8 +55,8 @@ dependencies {
     compile 'com.github.sarxos:webcam-capture:0.3.12'
 
 
-    compileOnly 'org.projectlombok:lombok:1.16.16'
-    annotationProcessor 'org.projectlombok:lombok:1.16.16'
+    compileOnly 'org.projectlombok:lombok:1.18.2'
+    annotationProcessor 'org.projectlombok:lombok:1.18.2'
     testCompile('org.mockito:mockito-core:2.8.9') {
         exclude(module: 'objenesis')
     }
@@ -65,8 +65,8 @@ dependencies {
     testCompile 'org.powermock:powermock-api-mockito2:1.7.1'
     testCompile 'org.springframework:spring-test:4.3.6.RELEASE'
     testCompile 'com.natpryce:make-it-easy:4.0.1'
-    testCompileOnly 'org.projectlombok:lombok:1.16.16'
-    testAnnotationProcessor 'org.projectlombok:lombok:1.16.16'
+    testCompileOnly 'org.projectlombok:lombok:1.18.2'
+    testAnnotationProcessor 'org.projectlombok:lombok:1.18.2'
 }
 
 build.dependsOn installDist
diff --git a/p2p/build.gradle b/p2p/build.gradle
index 3ed28d2e47..97459fb034 100644
--- a/p2p/build.gradle
+++ b/p2p/build.gradle
@@ -24,10 +24,10 @@ dependencies {
     }
     compile 'net.sf.jopt-simple:jopt-simple:5.0.3'
     compile 'org.fxmisc.easybind:easybind:1.0.3'
-    compileOnly 'org.projectlombok:lombok:1.16.16'
-    annotationProcessor 'org.projectlombok:lombok:1.16.16'
+    compileOnly 'org.projectlombok:lombok:1.18.2'
+    annotationProcessor 'org.projectlombok:lombok:1.18.2'
     testCompile 'junit:junit:4.12'
     testCompile 'org.jmockit:jmockit:1.30'
-    testCompileOnly 'org.projectlombok:lombok:1.16.16'
-    testAnnotationProcessor 'org.projectlombok:lombok:1.16.16'
+    testCompileOnly 'org.projectlombok:lombok:1.18.2'
+    testAnnotationProcessor 'org.projectlombok:lombok:1.18.2'
 }