diff --git a/tools/gradle-plugin/build.gradle b/tools/gradle-plugin/build.gradle
index 467a2f6d8..b4385e2a9 100644
--- a/tools/gradle-plugin/build.gradle
+++ b/tools/gradle-plugin/build.gradle
@@ -74,3 +74,4 @@ wrapper {
 }
 
 tasks.pluginUnderTestMetadata.dependsOn(processJandexIndex)
+tasks.validatePlugins.dependsOn(processJandexIndex)
diff --git a/tools/gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/tools/gradle-plugin/gradle/wrapper/gradle-wrapper.properties
index 81ba9e881..30150056d 100644
--- a/tools/gradle-plugin/gradle/wrapper/gradle-wrapper.properties
+++ b/tools/gradle-plugin/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=c72fb9991f6025cbe337d52ba77e531b3faf62bdd3e348fe1ccee9f51c71adb0
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-all.zip
+distributionSha256Sum=61ba77b3ff7167e60962763eb4bae79db7120c189b9544358d0ade3c1e712a83
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-all.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500
diff --git a/tools/gradle-plugin/gradlew b/tools/gradle-plugin/gradlew
index b9bb139f7..249efbb03 100755
--- a/tools/gradle-plugin/gradlew
+++ b/tools/gradle-plugin/gradlew
@@ -20,7 +20,7 @@
 
 ##############################################################################
 #
-#   Gradle start up script for POSIX generated by Gradle.
+#   gradlew start up script for POSIX generated by Gradle.
 #
 #   Important for running:
 #
@@ -29,7 +29,7 @@
 #       bash, then to run this script, type that shell name before the whole
 #       command line, like:
 #
-#           ksh Gradle
+#           ksh gradlew
 #
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
diff --git a/tools/gradle-plugin/gradlew.bat b/tools/gradle-plugin/gradlew.bat
index 24c62d56f..a51ec4f58 100644
--- a/tools/gradle-plugin/gradlew.bat
+++ b/tools/gradle-plugin/gradlew.bat
@@ -19,7 +19,7 @@
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
-@rem  Gradle startup script for Windows
+@rem  gradlew startup script for Windows
 @rem
 @rem ##########################################################################
 
@@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2
 
 
 
-@rem Execute Gradle
+@rem Execute gradlew
 @rem endlocal doesn't take effect until after the line is parsed and variables are expanded
 @rem which allows us to clear the local environment before executing the java command
 endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel