Fix Gradle daemon cleanup on Windows (#489)

jenkinsci · Sep 20, 2024 · ce3f778 · ce3f778
1 parent 60d5478
commit ce3f778
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/test/groovy/hudson/plugins/gradle/BaseGradleIntegrationTest.groovy b/src/test/groovy/hudson/plugins/gradle/BaseGradleIntegrationTest.groovy
@@ -72,7 +72,7 @@ abstract class BaseGradleIntegrationTest extends AbstractIntegrationTest {
         if(Functions.isWindows()) {
             try {
                 println 'Killing Gradle processes'
-                def proc = '''WMIC PROCESS where "Name like 'java%%' AND CommandLine like '%%GradleDaemon%%'" Call Terminate"'''.execute()
+                def proc = '''WMIC PROCESS where "Name like 'java%' AND CommandLine like '%hudson.plugins.gradle.GradleInstallation%'" Call Terminate"'''.execute()
                 proc.waitFor(30, TimeUnit.SECONDS)
                 println "output: ${proc.text}"
                 println "code: ${proc.exitValue()}"

diff --git a/...est/groovy/hudson/plugins/gradle/injection/BuildScanInjectionGradleIntegrationTest.groovy b/...est/groovy/hudson/plugins/gradle/injection/BuildScanInjectionGradleIntegrationTest.groovy
@@ -30,7 +30,7 @@ class BuildScanInjectionGradleIntegrationTest extends BaseGradleIntegrationTest
 
     private static final String MSG_INIT_SCRIPT_APPLIED = "Connection to Develocity: http://foo.com"
 
-    private static final List<String> GRADLE_VERSIONS = ['4.10.3', '5.6.4', '6.9.4', '7.6.4', '8.6']
+    private static final List<String> GRADLE_VERSIONS = ['4.10.3', '5.6.4', '6.9.4', '7.6.4', '8.9']
 
     private static final EnvVars EMPTY_ENV = new EnvVars()