diff --git a/org.eclipse.jdt.ls.tests/pom.xml b/org.eclipse.jdt.ls.tests/pom.xml
index c7e25d7eec..b7565f3948 100644
--- a/org.eclipse.jdt.ls.tests/pom.xml
+++ b/org.eclipse.jdt.ls.tests/pom.xml
@@ -96,7 +96,7 @@
 				</property>
 			</activation>
 			<properties>
-				<lombokArgs>-javaagent:${basedir}/lib/lombok-1.18.32.jar</lombokArgs>
+				<lombokArgs>-javaagent:${basedir}/lib/lombok-1.18.36.jar</lombokArgs>
 			</properties>
 			<build>
 				<plugins>
@@ -108,7 +108,7 @@
 								<artifactItem>
 									<groupId>org.projectlombok</groupId>
 									<artifactId>lombok</artifactId>
-									<version>1.18.32</version>
+									<version>1.18.36</version>
 								</artifactItem>
 							</artifactItems>
 						</configuration>
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/android/build.gradle b/org.eclipse.jdt.ls.tests/projects/gradle/android/build.gradle
index a550ce3b96..ddefa15175 100644
--- a/org.eclipse.jdt.ls.tests/projects/gradle/android/build.gradle
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/android/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.2.1' apply false
-    id 'com.android.library' version '7.2.1' apply false
+    id 'com.android.application' version '7.4.0' apply false
+    id 'com.android.library' version '7.4.0' apply false
 }
 
 task clean(type: Delete) {
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/android/gradle/wrapper/gradle-wrapper.jar b/org.eclipse.jdt.ls.tests/projects/gradle/android/gradle/wrapper/gradle-wrapper.jar
index e708b1c023..d64cd49177 100644
Binary files a/org.eclipse.jdt.ls.tests/projects/gradle/android/gradle/wrapper/gradle-wrapper.jar and b/org.eclipse.jdt.ls.tests/projects/gradle/android/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/android/gradle/wrapper/gradle-wrapper.properties b/org.eclipse.jdt.ls.tests/projects/gradle/android/gradle/wrapper/gradle-wrapper.properties
index baca0af76a..1af9e0930b 100644
--- a/org.eclipse.jdt.ls.tests/projects/gradle/android/gradle/wrapper/gradle-wrapper.properties
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Wed Aug 10 11:28:36 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/apt/gradle/wrapper/gradle-wrapper.jar b/org.eclipse.jdt.ls.tests/projects/gradle/apt/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf016..d64cd49177 100644
Binary files a/org.eclipse.jdt.ls.tests/projects/gradle/apt/gradle/wrapper/gradle-wrapper.jar and b/org.eclipse.jdt.ls.tests/projects/gradle/apt/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/apt/gradle/wrapper/gradle-wrapper.properties b/org.eclipse.jdt.ls.tests/projects/gradle/apt/gradle/wrapper/gradle-wrapper.properties
index 2e6e5897b5..1af9e0930b 100644
--- a/org.eclipse.jdt.ls.tests/projects/gradle/apt/gradle/wrapper/gradle-wrapper.properties
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/apt/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/gradle-11/gradle/wrapper/gradle-wrapper.jar b/org.eclipse.jdt.ls.tests/projects/gradle/gradle-11/gradle/wrapper/gradle-wrapper.jar
index e708b1c023..d64cd49177 100644
Binary files a/org.eclipse.jdt.ls.tests/projects/gradle/gradle-11/gradle/wrapper/gradle-wrapper.jar and b/org.eclipse.jdt.ls.tests/projects/gradle/gradle-11/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/gradle-11/gradle/wrapper/gradle-wrapper.properties b/org.eclipse.jdt.ls.tests/projects/gradle/gradle-11/gradle/wrapper/gradle-wrapper.properties
index baca0af76a..1af9e0930b 100644
--- a/org.eclipse.jdt.ls.tests/projects/gradle/gradle-11/gradle/wrapper/gradle-wrapper.properties
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/gradle-11/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Wed Aug 10 11:28:36 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/gradle-12/gradle/wrapper/gradle-wrapper.jar b/org.eclipse.jdt.ls.tests/projects/gradle/gradle-12/gradle/wrapper/gradle-wrapper.jar
index e708b1c023..d64cd49177 100644
Binary files a/org.eclipse.jdt.ls.tests/projects/gradle/gradle-12/gradle/wrapper/gradle-wrapper.jar and b/org.eclipse.jdt.ls.tests/projects/gradle/gradle-12/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/gradle-12/gradle/wrapper/gradle-wrapper.properties b/org.eclipse.jdt.ls.tests/projects/gradle/gradle-12/gradle/wrapper/gradle-wrapper.properties
index baca0af76a..1af9e0930b 100644
--- a/org.eclipse.jdt.ls.tests/projects/gradle/gradle-12/gradle/wrapper/gradle-wrapper.properties
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/gradle-12/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Wed Aug 10 11:28:36 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/gradle-13/gradle/wrapper/gradle-wrapper.jar b/org.eclipse.jdt.ls.tests/projects/gradle/gradle-13/gradle/wrapper/gradle-wrapper.jar
index e708b1c023..d64cd49177 100644
Binary files a/org.eclipse.jdt.ls.tests/projects/gradle/gradle-13/gradle/wrapper/gradle-wrapper.jar and b/org.eclipse.jdt.ls.tests/projects/gradle/gradle-13/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/gradle-13/gradle/wrapper/gradle-wrapper.properties b/org.eclipse.jdt.ls.tests/projects/gradle/gradle-13/gradle/wrapper/gradle-wrapper.properties
index baca0af76a..1af9e0930b 100644
--- a/org.eclipse.jdt.ls.tests/projects/gradle/gradle-13/gradle/wrapper/gradle-wrapper.properties
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/gradle-13/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Wed Aug 10 11:28:36 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/gradle-14/gradle/wrapper/gradle-wrapper.jar b/org.eclipse.jdt.ls.tests/projects/gradle/gradle-14/gradle/wrapper/gradle-wrapper.jar
index e708b1c023..d64cd49177 100644
Binary files a/org.eclipse.jdt.ls.tests/projects/gradle/gradle-14/gradle/wrapper/gradle-wrapper.jar and b/org.eclipse.jdt.ls.tests/projects/gradle/gradle-14/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/gradle-14/gradle/wrapper/gradle-wrapper.properties b/org.eclipse.jdt.ls.tests/projects/gradle/gradle-14/gradle/wrapper/gradle-wrapper.properties
index baca0af76a..1af9e0930b 100644
--- a/org.eclipse.jdt.ls.tests/projects/gradle/gradle-14/gradle/wrapper/gradle-wrapper.properties
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/gradle-14/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Wed Aug 10 11:28:36 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/gradle-build-server/gradle/wrapper/gradle-wrapper.properties b/org.eclipse.jdt.ls.tests/projects/gradle/gradle-build-server/gradle/wrapper/gradle-wrapper.properties
index baca0af76a..1af9e0930b 100644
--- a/org.eclipse.jdt.ls.tests/projects/gradle/gradle-build-server/gradle/wrapper/gradle-wrapper.properties
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/gradle-build-server/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Wed Aug 10 11:28:36 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/gradle-withoutjava/gradle/wrapper/gradle-wrapper.jar b/org.eclipse.jdt.ls.tests/projects/gradle/gradle-withoutjava/gradle/wrapper/gradle-wrapper.jar
index e708b1c023..d64cd49177 100644
Binary files a/org.eclipse.jdt.ls.tests/projects/gradle/gradle-withoutjava/gradle/wrapper/gradle-wrapper.jar and b/org.eclipse.jdt.ls.tests/projects/gradle/gradle-withoutjava/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/gradle-withoutjava/gradle/wrapper/gradle-wrapper.properties b/org.eclipse.jdt.ls.tests/projects/gradle/gradle-withoutjava/gradle/wrapper/gradle-wrapper.properties
index baca0af76a..1af9e0930b 100644
--- a/org.eclipse.jdt.ls.tests/projects/gradle/gradle-withoutjava/gradle/wrapper/gradle-wrapper.properties
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/gradle-withoutjava/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Wed Aug 10 11:28:36 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/kradle/build.gradle.kts b/org.eclipse.jdt.ls.tests/projects/gradle/kradle/build.gradle.kts
index 45c4e43798..78243ebb1c 100644
--- a/org.eclipse.jdt.ls.tests/projects/gradle/kradle/build.gradle.kts
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/kradle/build.gradle.kts
@@ -31,7 +31,7 @@ dependencies {
 
 application {
     // Define the main class for the application.
-    mainClassName = "org.sample.App"
+    mainClass.set("org.sample.App")
 }
 
 val test by tasks.getting(Test::class) {
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/kradle/gradle/wrapper/gradle-wrapper.jar b/org.eclipse.jdt.ls.tests/projects/gradle/kradle/gradle/wrapper/gradle-wrapper.jar
index e708b1c023..d64cd49177 100644
Binary files a/org.eclipse.jdt.ls.tests/projects/gradle/kradle/gradle/wrapper/gradle-wrapper.jar and b/org.eclipse.jdt.ls.tests/projects/gradle/kradle/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/kradle/gradle/wrapper/gradle-wrapper.properties b/org.eclipse.jdt.ls.tests/projects/gradle/kradle/gradle/wrapper/gradle-wrapper.properties
index baca0af76a..1af9e0930b 100644
--- a/org.eclipse.jdt.ls.tests/projects/gradle/kradle/gradle/wrapper/gradle-wrapper.properties
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/kradle/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Wed Aug 10 11:28:36 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/metadata/gradle/wrapper/gradle-wrapper.jar b/org.eclipse.jdt.ls.tests/projects/gradle/metadata/gradle/wrapper/gradle-wrapper.jar
index e708b1c023..d64cd49177 100644
Binary files a/org.eclipse.jdt.ls.tests/projects/gradle/metadata/gradle/wrapper/gradle-wrapper.jar and b/org.eclipse.jdt.ls.tests/projects/gradle/metadata/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/metadata/gradle/wrapper/gradle-wrapper.properties b/org.eclipse.jdt.ls.tests/projects/gradle/metadata/gradle/wrapper/gradle-wrapper.properties
index baca0af76a..1af9e0930b 100644
--- a/org.eclipse.jdt.ls.tests/projects/gradle/metadata/gradle/wrapper/gradle-wrapper.properties
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/metadata/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Wed Aug 10 11:28:36 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle1/gradle/wrapper/gradle-wrapper.jar b/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle1/gradle/wrapper/gradle-wrapper.jar
index e708b1c023..d64cd49177 100644
Binary files a/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle1/gradle/wrapper/gradle-wrapper.jar and b/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle1/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle1/gradle/wrapper/gradle-wrapper.properties b/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle1/gradle/wrapper/gradle-wrapper.properties
index baca0af76a..1af9e0930b 100644
--- a/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle1/gradle/wrapper/gradle-wrapper.properties
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle1/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Wed Aug 10 11:28:36 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle2/gradle/wrapper/gradle-wrapper.jar b/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle2/gradle/wrapper/gradle-wrapper.jar
index e708b1c023..d64cd49177 100644
Binary files a/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle2/gradle/wrapper/gradle-wrapper.jar and b/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle2/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle2/gradle/wrapper/gradle-wrapper.properties b/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle2/gradle/wrapper/gradle-wrapper.properties
index baca0af76a..1af9e0930b 100644
--- a/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle2/gradle/wrapper/gradle-wrapper.properties
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle2/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Wed Aug 10 11:28:36 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle3/gradle/wrapper/gradle-wrapper.jar b/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle3/gradle/wrapper/gradle-wrapper.jar
index e708b1c023..d64cd49177 100644
Binary files a/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle3/gradle/wrapper/gradle-wrapper.jar and b/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle3/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle3/gradle/wrapper/gradle-wrapper.properties b/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle3/gradle/wrapper/gradle-wrapper.properties
index baca0af76a..1af9e0930b 100644
--- a/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle3/gradle/wrapper/gradle-wrapper.properties
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle3/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Wed Aug 10 11:28:36 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/no-gradlew/gradle/wrapper/gradle-wrapper.properties b/org.eclipse.jdt.ls.tests/projects/gradle/no-gradlew/gradle/wrapper/gradle-wrapper.properties
index baca0af76a..1af9e0930b 100644
--- a/org.eclipse.jdt.ls.tests/projects/gradle/no-gradlew/gradle/wrapper/gradle-wrapper.properties
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/no-gradlew/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Wed Aug 10 11:28:36 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/null-analysis/gradle/wrapper/gradle-wrapper.jar b/org.eclipse.jdt.ls.tests/projects/gradle/null-analysis/gradle/wrapper/gradle-wrapper.jar
index e708b1c023..d64cd49177 100644
Binary files a/org.eclipse.jdt.ls.tests/projects/gradle/null-analysis/gradle/wrapper/gradle-wrapper.jar and b/org.eclipse.jdt.ls.tests/projects/gradle/null-analysis/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/null-analysis/gradle/wrapper/gradle-wrapper.properties b/org.eclipse.jdt.ls.tests/projects/gradle/null-analysis/gradle/wrapper/gradle-wrapper.properties
index baca0af76a..1af9e0930b 100644
--- a/org.eclipse.jdt.ls.tests/projects/gradle/null-analysis/gradle/wrapper/gradle-wrapper.properties
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/null-analysis/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Wed Aug 10 11:28:36 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/sample/gradle/wrapper/gradle-wrapper.jar b/org.eclipse.jdt.ls.tests/projects/gradle/sample/gradle/wrapper/gradle-wrapper.jar
index e708b1c023..d64cd49177 100644
Binary files a/org.eclipse.jdt.ls.tests/projects/gradle/sample/gradle/wrapper/gradle-wrapper.jar and b/org.eclipse.jdt.ls.tests/projects/gradle/sample/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/sample/gradle/wrapper/gradle-wrapper.properties b/org.eclipse.jdt.ls.tests/projects/gradle/sample/gradle/wrapper/gradle-wrapper.properties
index baca0af76a..1af9e0930b 100644
--- a/org.eclipse.jdt.ls.tests/projects/gradle/sample/gradle/wrapper/gradle-wrapper.properties
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/sample/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Wed Aug 10 11:28:36 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/org.eclipse.jdt.ls.tests/projects/mixed/simple-gradle/gradle/wrapper/gradle-wrapper.jar b/org.eclipse.jdt.ls.tests/projects/mixed/simple-gradle/gradle/wrapper/gradle-wrapper.jar
index e708b1c023..d64cd49177 100644
Binary files a/org.eclipse.jdt.ls.tests/projects/mixed/simple-gradle/gradle/wrapper/gradle-wrapper.jar and b/org.eclipse.jdt.ls.tests/projects/mixed/simple-gradle/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/org.eclipse.jdt.ls.tests/projects/mixed/simple-gradle/gradle/wrapper/gradle-wrapper.properties b/org.eclipse.jdt.ls.tests/projects/mixed/simple-gradle/gradle/wrapper/gradle-wrapper.properties
index baca0af76a..1af9e0930b 100644
--- a/org.eclipse.jdt.ls.tests/projects/mixed/simple-gradle/gradle/wrapper/gradle-wrapper.properties
+++ b/org.eclipse.jdt.ls.tests/projects/mixed/simple-gradle/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Wed Aug 10 11:28:36 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/org.eclipse.jdt.ls.tests/projects/multi-buildtools/gradle/wrapper/gradle-wrapper.jar b/org.eclipse.jdt.ls.tests/projects/multi-buildtools/gradle/wrapper/gradle-wrapper.jar
index e708b1c023..d64cd49177 100644
Binary files a/org.eclipse.jdt.ls.tests/projects/multi-buildtools/gradle/wrapper/gradle-wrapper.jar and b/org.eclipse.jdt.ls.tests/projects/multi-buildtools/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/org.eclipse.jdt.ls.tests/projects/multi-buildtools/gradle/wrapper/gradle-wrapper.properties b/org.eclipse.jdt.ls.tests/projects/multi-buildtools/gradle/wrapper/gradle-wrapper.properties
index baca0af76a..1af9e0930b 100644
--- a/org.eclipse.jdt.ls.tests/projects/multi-buildtools/gradle/wrapper/gradle-wrapper.properties
+++ b/org.eclipse.jdt.ls.tests/projects/multi-buildtools/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Wed Aug 10 11:28:36 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists