(groovy) branch GROOVY_4_0_X updated: Windows: add `.exe` to java executable

[emilles]

This is an automated email from the ASF dual-hosted git repository.

emilles pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/GROOVY_4_0_X by this push:
     new 3f5725836a Windows: add `.exe` to java executable
3f5725836a is described below

commit 3f5725836a5f0b722ad616579112acbdf0cc600b
Author: Eric Milles <eric.mil...@thomsonreuters.com>
AuthorDate: Fri Oct 3 15:33:09 2025 -0500

    Windows: add `.exe` to java executable
---
 .../src/main/groovy/org.apache.groovy-tested.gradle    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/build-logic/src/main/groovy/org.apache.groovy-tested.gradle 
b/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
index f27a67af4a..c619573512 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
@@ -17,7 +17,7 @@
  *  under the License.
  */
 import org.apache.groovy.gradle.ConcurrentExecutionControlBuildService
-import javax.inject.Inject
+import org.apache.tools.ant.taskdefs.condition.Os
 
 // Instead of adding to the test sources, this should
 // be a separate source set so that we can run spec tests in isolation
@@ -34,14 +34,13 @@ sourceSets {
 
 tasks.withType(Test).configureEach {
     def fs = objects.newInstance(TestServices).fileSystemOperations
-    def grapeDirectory = new File(temporaryDir, "grape")
+    def grapeDirectory = new File(temporaryDir, 'grape')
     def jdk8 = ['-XX:+UseConcMarkSweepGC']
-    def jdk9 = ['-Djava.locale.providers=COMPAT,SPI']
-//        def jdk9 = ['-Djava.locale.providers=COMPAT,SPI', 
'--illegal-access=debug']
-    def common = ['-ea', "-Xms${groovyJUnit_ms}", "-Xmx${groovyJUnit_mx}", 
"-Duser.language=en"]
+    def jdk9 = ['-Djava.locale.providers=COMPAT,SPI'/*, 
'--illegal-access=debug*/]
+    def common = ['-ea', "-Xms${groovyJUnit_ms}", "-Xmx${groovyJUnit_mx}", 
'-Duser.language=en']
     if (JavaVersion.current().isJava9Compatible()) {
         jvmArgs(*common, *jdk9)
-        systemProperty "groovy.force.illegal.access", 
findProperty("groovy.force.illegal.access")
+        systemProperty 'groovy.force.illegal.access', 
findProperty('groovy.force.illegal.access')
     } else {
         jvmArgs(*common, *jdk8)
     }
@@ -58,7 +57,8 @@ tasks.withType(Test).configureEach {
     if (rootProject.hasProperty('target.java.home')) {
         String targetJavaHome = 
rootProject.property('target.java.home')?.trim()
         if (targetJavaHome) {
-            executable = "${targetJavaHome}/bin/java"
+            executable = [targetJavaHome,'bin','java'].join(File.separator)
+            if (Os.isFamily(Os.FAMILY_WINDOWS)) executable += '.exe'
             println "Using ${executable} to run tests"
         }
     }
@@ -89,7 +89,7 @@ tasks.withType(Test).configureEach {
     }
     doLast {
         fs.delete {
-            delete(files(".").filter { it.name.endsWith '.class' })
+            delete(files('.').filter { it.name.endsWith '.class' })
         }
     }
 }
@@ -116,6 +116,6 @@ Closure buildExcludeFilter(boolean legacyTestSuite) {
 }
 
 interface TestServices {
-    @Inject
+    @javax.inject.Inject
     FileSystemOperations getFileSystemOperations()
 }