diff --git a/headless-services/commons/commons-gradle/pom.xml b/headless-services/commons/commons-gradle/pom.xml
index 0f4bb7c3c..6fb32baa7 100644
--- a/headless-services/commons/commons-gradle/pom.xml
+++ b/headless-services/commons/commons-gradle/pom.xml
@@ -14,7 +14,7 @@
 	</parent>
 
 	<properties>
-		<gradle-tooling.version>4.3</gradle-tooling.version>
+		<gradle-tooling.version>6.7</gradle-tooling.version>
 	</properties>
 
 	<repositories>
diff --git a/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleCore.java b/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleCore.java
index 7310a1bb3..43240cf12 100644
--- a/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleCore.java
+++ b/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleCore.java
@@ -77,7 +77,7 @@ public class GradleCore {
 			((DefaultGradleConnector) gradleConnector).daemonMaxIdleTime(1, TimeUnit.SECONDS);
 			configuration.configure(gradleConnector);
 			// Use patched Gradle 4.4 distribution or higher as a workaround for https://github.com/gradle/gradle/issues/2483
-			gradleConnector.useGradleVersion("4.6");
+			gradleConnector.useGradleVersion("6.7");
 			connection = gradleConnector.connect();
 			return connection.getModel(modelType);
 		} catch (GradleConnectionException e) {
diff --git a/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleProjectClasspath.java b/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleProjectClasspath.java
index 14a0b8454..594fd7ebc 100644
--- a/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleProjectClasspath.java
+++ b/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleProjectClasspath.java
@@ -87,14 +87,14 @@ public class GradleProjectClasspath implements IClasspath {
 			for (EclipseExternalDependency dep : project.getClasspath()) {
 				entries.add(new CPE(Classpath.ENTRY_KIND_BINARY, dep.getFile().getAbsolutePath()));
 			}
-			for (EclipseProjectDependency dep : project.getProjectDependencies()) {
+/**			for (EclipseProjectDependency dep : project.getProjectDependencies()) {
 				EclipseProject peer = findPeer(root, dep.getTargetProject().getName());
 				if (peer!=null) {
 					for (EclipseSourceDirectory sf : peer.getSourceDirectories()) {
 						entries.add(createSourceCPE(peer, sf));
 					}
 				}
-			}
+			} */
 			for (EclipseSourceDirectory sf : project.getSourceDirectories()) {
 				CPE cpe = createSourceCPE(project, sf);
 				cpe.setOwn(true);
diff --git a/headless-services/commons/commons-gradle/src/test/resources/empty-gradle-project/gradle/wrapper/gradle-wrapper.properties b/headless-services/commons/commons-gradle/src/test/resources/empty-gradle-project/gradle/wrapper/gradle-wrapper.properties
index b66f3c112..19869d665 100644
--- a/headless-services/commons/commons-gradle/src/test/resources/empty-gradle-project/gradle/wrapper/gradle-wrapper.properties
+++ b/headless-services/commons/commons-gradle/src/test/resources/empty-gradle-project/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-2.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
diff --git a/headless-services/commons/commons-gradle/src/test/resources/test-app-1/gradle/wrapper/gradle-wrapper.properties b/headless-services/commons/commons-gradle/src/test/resources/test-app-1/gradle/wrapper/gradle-wrapper.properties
index 49bf4f6c9..fc932ec12 100644
--- a/headless-services/commons/commons-gradle/src/test/resources/test-app-1/gradle/wrapper/gradle-wrapper.properties
+++ b/headless-services/commons/commons-gradle/src/test/resources/test-app-1/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
diff --git a/headless-services/commons/commons-gradle/src/test/resources/test-app-2/gradle/wrapper/gradle-wrapper.properties b/headless-services/commons/commons-gradle/src/test/resources/test-app-2/gradle/wrapper/gradle-wrapper.properties
index 49bf4f6c9..fc932ec12 100644
--- a/headless-services/commons/commons-gradle/src/test/resources/test-app-2/gradle/wrapper/gradle-wrapper.properties
+++ b/headless-services/commons/commons-gradle/src/test/resources/test-app-2/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip