diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index ed88a042..758de960 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2d80b69a..f4d7b2bf 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/spring-geode-autoconfigure/lombok.config b/spring-geode-autoconfigure/lombok.config
new file mode 100644
index 00000000..189c0bef
--- /dev/null
+++ b/spring-geode-autoconfigure/lombok.config
@@ -0,0 +1,3 @@
+# This file is generated by the 'io.freefair.lombok' Gradle plugin
+config.stopBubbling = true
+lombok.addLombokGeneratedAnnotation = true
diff --git a/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle b/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle
index 959b4533..747f1f03 100644
--- a/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle
+++ b/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle
@@ -1,3 +1,7 @@
+plugins {
+	id "io.freefair.lombok" version "3.2.1"
+}
+
 apply plugin: 'io.spring.convention.spring-module'
 
 description = "Spring Boot for Apache Geode Auto-Configuration"
diff --git a/spring-geode-samples/boot/configuration/lombok.config b/spring-geode-samples/boot/configuration/lombok.config
new file mode 100644
index 00000000..6aa51d71
--- /dev/null
+++ b/spring-geode-samples/boot/configuration/lombok.config
@@ -0,0 +1,2 @@
+# This file is generated by the 'io.freefair.lombok' Gradle plugin
+config.stopBubbling = true
diff --git a/spring-geode-samples/boot/configuration/spring-geode-samples-boot-configuration.gradle b/spring-geode-samples/boot/configuration/spring-geode-samples-boot-configuration.gradle
index 86d5528d..452f4e77 100644
--- a/spring-geode-samples/boot/configuration/spring-geode-samples-boot-configuration.gradle
+++ b/spring-geode-samples/boot/configuration/spring-geode-samples-boot-configuration.gradle
@@ -1,5 +1,9 @@
 import org.apache.tools.ant.filters.ReplaceTokens
 
+plugins {
+	id "io.freefair.lombok" version "3.2.1"
+}
+
 apply plugin: 'io.spring.convention.spring-sample-boot'
 
 description = "Spring Geode Samples demonstrating the use of Spring Boot Auto-configuration for Apache Geode."