diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 8bdaf60c..f8e1ee31 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3e781fba..49ab6fc3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionSha256Sum=df67a32e86e3276d011735facb1535f64d0d88df84fa87521e90becc2d735444
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index ef07e016..adff685a 100755
--- a/gradlew
+++ b/gradlew
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
diff --git a/gradlew.bat b/gradlew.bat
index 5eed7ee8..e509b2dd 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/src/test/groovy/org/gradlex/jvm/dependency/conflict/test/fixture/GradleBuild.groovy b/src/test/groovy/org/gradlex/jvm/dependency/conflict/test/fixture/GradleBuild.groovy
index 0d2fb3d0..6e524cf9 100644
--- a/src/test/groovy/org/gradlex/jvm/dependency/conflict/test/fixture/GradleBuild.groovy
+++ b/src/test/groovy/org/gradlex/jvm/dependency/conflict/test/fixture/GradleBuild.groovy
@@ -2,6 +2,7 @@ package org.gradlex.jvm.dependency.conflict.test.fixture
 
 import org.gradle.testkit.runner.BuildResult
 import org.gradle.testkit.runner.GradleRunner
+import org.gradle.util.GradleVersion
 
 import java.lang.management.ManagementFactory
 import java.nio.file.Files
@@ -16,6 +17,8 @@ class GradleBuild {
     final static String GRADLE_VERSION_UNDER_TEST = System.getProperty("gradleVersionUnderTest")
     final static boolean GRADLE6_TEST = GRADLE_VERSION_UNDER_TEST?.startsWith("6.")
     final static boolean GRADLE7_TEST = GRADLE_VERSION_UNDER_TEST?.startsWith("7.")
+    final static boolean GRADLE9_1_TEST = !GRADLE_VERSION_UNDER_TEST ||
+            GradleVersion.version(GRADLE_VERSION_UNDER_TEST) >= GradleVersion.version("9.1")
 
     GradleBuild(File projectDir = Files.createTempDirectory("gradle-build").toFile()) {
         this.projectDir = projectDir
diff --git a/src/test/groovy/org/gradlex/jvm/dependency/conflict/test/patch/ModifyCapabilitiesTest.groovy b/src/test/groovy/org/gradlex/jvm/dependency/conflict/test/patch/ModifyCapabilitiesTest.groovy
index 5c708574..482a2a6a 100644
--- a/src/test/groovy/org/gradlex/jvm/dependency/conflict/test/patch/ModifyCapabilitiesTest.groovy
+++ b/src/test/groovy/org/gradlex/jvm/dependency/conflict/test/patch/ModifyCapabilitiesTest.groovy
@@ -47,7 +47,9 @@ compileClasspath - Compile classpath for source set 'main'.
         """
 
         expect:
-        fail().output.contains "Cannot select module with conflict on capability 'commons-lang:commons-lang:2.6' also provided by [org.apache.commons:commons-lang3:3.11(compile)]"
+        GradleBuild.GRADLE9_1_TEST
+                ? fail().output.contains("Cannot select module with conflict on capability 'commons-lang:commons-lang:3.11' also provided by ['commons-lang:commons-lang:2.6' (compile)]")
+                : fail().output.contains("Cannot select module with conflict on capability 'commons-lang:commons-lang:2.6' also provided by [org.apache.commons:commons-lang3:3.11(compile)]")
     }
 
     def "can remove capability by enum"() {