diff --git a/build.gradle b/build.gradle
index e376e4fa17..d796d64ac6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -217,6 +217,10 @@ configure(javaProjects) { subproject ->
 		}
 	}
 
+	tasks.withType(JavaCompile).configureEach {
+		options.fork = true
+	}
+
 	eclipse {
 		project {
 			natures += 'org.springframework.ide.eclipse.core.springnature'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1da2bb5806..d6e7a3a892 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionSha256Sum=8de6efc274ab52332a9c820366dd5cf5fc9d35ec7078fd70c8ec6913431ee610
\ No newline at end of file
+distributionSha256Sum=8c12154228a502b784f451179846e518733cf856efc7d45b2e6691012977b2fe
\ No newline at end of file