diff --git a/pom.xml b/pom.xml
index 8590fb9bf4..838de708a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 				</property>
 			</activation>
 			<properties>
-				<spring-javaformat.version>0.0.3</spring-javaformat.version>
+				<spring-javaformat.version>0.0.6</spring-javaformat.version>
 			</properties>
 			<build>
 				<plugins>
@@ -36,7 +36,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>8.8</version>
+								<version>8.11</version>
 							</dependency>
 							<dependency>
 								<groupId>io.spring.javaformat</groupId>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
index 939c79c4aa..10341c0d21 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
@@ -1,8 +1,20 @@
+buildscript {
+	repositories {
+		mavenLocal()
+		mavenCentral()
+	}
+	dependencies {
+		classpath("io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.6")
+	}
+}
+
 plugins {
 	id 'java'
 	id 'eclipse'
 }
 
+apply plugin: 'io.spring.javaformat'
+
 repositories {
 	mavenLocal()
 	mavenCentral()
@@ -29,15 +41,6 @@ test {
 	}
 }
 
-eclipseJdt {
-	inputFile = rootProject.file('../../../eclipse/org.eclipse.jdt.core.prefs')
-	doLast {
-		project.file('.settings/org.eclipse.jdt.ui.prefs').withWriter { writer ->
-			writer << file('../../../eclipse/org.eclipse.jdt.ui.prefs').text
-		}
-	}
-}
-
 javadoc {
 	options {
 		author()