Do not override system properties for Windows OS. Fixes #9867 (#9996)

* Do not override system properties for Windows OS. Fixes #9867

* Take into account that ApplicationContextCommandTask extends JavaExec. Fixes #9867

* Add type back for variables in configurePathingJar method. #9867

Author: inicolas

grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsGradlePlugin.groovy

@@ -16,6 +16,7 @@ import org.gradle.api.artifacts.Configuration
 import org.gradle.api.artifacts.ConfigurationContainer
 import org.gradle.api.artifacts.Dependency
 import org.gradle.api.file.CopySpec
+import org.gradle.api.file.FileCollection
 import org.gradle.api.java.archives.Manifest
 import org.gradle.api.plugins.GroovyPlugin
 import org.gradle.api.tasks.AbstractCopyTask
@@ -434,30 +435,33 @@ class GrailsGradlePlugin extends GroovyPlugin {
 
     protected void configurePathingJar(Project project) {
         project.afterEvaluate {
-            ConfigurationContainer configurations =  project.configurations
+            ConfigurationContainer configurations = project.configurations
             Configuration runtime = configurations.getByName('runtime')
             Configuration console = configurations.getByName('console')
 
             Jar pathingJar = createPathingJarTask(project, "pathingJar", runtime)
+            FileCollection pathingClasspath = project.files("${project.buildDir}/classes/main",
+              "${project.buildDir}/resources/main", "${project.projectDir}/gsp-classes", pathingJar.archivePath)
             Jar pathingJarCommand = createPathingJarTask(project, "pathingJarCommand", runtime, console)
+            FileCollection pathingClasspathCommand = project.files("${project.buildDir}/classes/main",
+              "${project.buildDir}/resources/main", "${project.projectDir}/gsp-classes", pathingJarCommand.archivePath)
 
             GrailsExtension grailsExt = project.extensions.getByType(GrailsExtension)
 
             if (grailsExt.pathingJar && Os.isFamily(Os.FAMILY_WINDOWS)) {
-
-                TaskContainer tasks = project.tasks
-
-                tasks.withType(JavaExec) { JavaExec task ->
-                    task.dependsOn(pathingJar)
-                    task.doFirst {
-                        classpath = project.files("${project.buildDir}/classes/main", "${project.buildDir}/resources/main", "${project.projectDir}/gsp-classes", pathingJar.archivePath)
+                project.tasks.withType(JavaExec) { JavaExec task ->
+                    if (task.name in ['console', 'shell'] || task instanceof ApplicationContextCommandTask) {
+                        task.dependsOn(pathingJarCommand)
+                        task.doFirst {
+                            classpath = pathingClasspathCommand
+                        }
+                    } else {
+                        task.dependsOn(pathingJar)
+                        task.doFirst {
+                            classpath = pathingClasspath
+                        }
                     }
                 }
-
-                tasks.withType(ApplicationContextCommandTask) { ApplicationContextCommandTask task ->
-                    task.dependsOn(pathingJarCommand)
-                    task.systemProperties = ['grails.env': 'development']
-                }
             }
         }
     }