Add spring7 tests (#2262)

<!-- This is an auto-generated comment: release notes by coderabbit.ai -->
## Summary by CodeRabbit

* **New Features**
  * Added a Spring 7 test module with Java 17 toolchain and new tests verifying Spring integration and runtime compatibility.

* **Bug Fixes**
  * Broadened detection of injection/resource annotations to include Jakarta variants to avoid false-positive shared-field errors.

* **Chores**
  * Expanded Spring/Java compatibility matrix, added Jakarta injection API, standardized dependency notation, disabled certain test compilation tasks, and included the new test module in the build.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

Author: Vampire

settings.gradle

@@ -104,6 +104,7 @@ if (variant == 2.5) {
   // require Java 17 which isn't supported by Groovy 2.5
   include "spock-spring:boot3-test"
   include "spock-spring:spring6-test"
+  include "spock-spring:spring7-test"
 }
 
 // https://issues.apache.org/jira/projects/TAP5/issues/TAP5-2588

spock-spring/spring.gradle

@@ -13,7 +13,8 @@ def springVersion = "4.3.5.RELEASE"
 def testSpringVersions = [
   (springVersion): (8..11),
   "5.0.2.RELEASE": (8..11),
-  "6.0.0"        : (17..17)
+  "6.0.0"        : (17..21),
+  "7.0.6"        : (17..javaVersions.max())
 ].findAll { javaVersion in it.value }.keySet()
 
 dependencies {
@@ -29,6 +30,7 @@ testing {
       useJUnitJupiter()
       dependencies {
         implementation "javax.inject:javax.inject:1"
+        implementation "jakarta.inject:jakarta.inject-api:2.0.1"
         implementation groovylibs.groovySql // for groovy.sql.Sql
         implementation libs.junit.platform.testkit
         runtimeOnly libs.h2database
@@ -95,10 +97,15 @@ testing {
 
 ["compileTestJava", "compileTestGroovy"].each { taskName ->
   tasks.named(taskName).configure {
-    onlyIf { false } //skip normal test task
+    enabled = false //skip normal test task
   }
 }
 
+tasks.withType(GroovyCompile).configureEach {
+  // this is needed for Spring 7 bean names from parameter names
+  groovyOptions.parameters = true
+}
+
 tasks.named("jar", Jar) {
   manifest {
     attributes(

spock-spring/spring3-test/spring3-test.gradle

@@ -5,7 +5,7 @@ dependencies {
 
   testImplementation projects.spockCore
   testImplementation "org.springframework:spring-context"
-  testImplementation ("org.springframework:spring-test")
+  testImplementation "org.springframework:spring-test"
 
   testRuntimeOnly projects.spockSpring
 }

spock-spring/spring5-test/spring5-test.gradle

@@ -7,7 +7,7 @@ dependencies {
   testImplementation projects.spockSpring
   testImplementation libs.junit4
   testImplementation "org.springframework:spring-context"
-  testImplementation ("org.springframework:spring-test")
+  testImplementation "org.springframework:spring-test"
 
 }
 

spock-spring/spring6-test/spring6-test.gradle

@@ -20,7 +20,7 @@ dependencies {
   testImplementation projects.spockSpring
   testImplementation libs.junit4
   testImplementation "org.springframework:spring-context"
-  testImplementation("org.springframework:spring-test")
+  testImplementation "org.springframework:spring-test"
 
 }
 

spock-spring/spring7-test/spring7-test.gradle

@@ -0,0 +1,34 @@
+def springVersion = "7.0.6"
+
+java {
+  toolchain {
+    languageVersion = JavaLanguageVersion.of(17)
+  }
+}
+
+tasks.withType(JavaCompile).configureEach {
+  javaCompiler = javaToolchains.compilerFor {
+    languageVersion = JavaLanguageVersion.of(17)
+  }
+  options.encoding = 'UTF-8'
+}
+
+dependencies {
+  implementation "org.springframework:spring-core"
+
+  testImplementation projects.spockCore
+  testImplementation projects.spockSpring
+  testImplementation libs.junit4
+  testImplementation "org.springframework:spring-context"
+  testImplementation "org.springframework:spring-test"
+
+}
+
+
+configurations.all {
+  resolutionStrategy.eachDependency {
+    if (requested.group == "org.springframework" ) {
+      useVersion(springVersion)
+    }
+  }
+}

spock-spring/spring7-test/src/test/groovy/org/spockframework/spring7/NoMockConfig.groovy

@@ -0,0 +1,35 @@
+package org.spockframework.spring7
+
+import groovy.transform.CompileStatic
+import org.springframework.context.annotation.Bean
+
+import java.util.concurrent.Callable
+import java.util.concurrent.ExecutorService
+
+@CompileStatic
+class NoMockConfig {
+
+  @Bean
+  ExecutorService executor() {
+    throw new RuntimeException("This should not be called")
+  }
+
+  @Bean
+  ServiceExecutor serviceExecutor(ExecutorService executorService) {
+    return new ServiceExecutor(executorService)
+  }
+
+
+}
+
+class ServiceExecutor {
+  private final ExecutorService executorService
+
+  ServiceExecutor(ExecutorService executorService) {
+    this.executorService = executorService
+  }
+
+  def exec() {
+    executorService.submit({"done"} as Callable).get()
+  }
+}

spock-spring/spring7-test/src/test/groovy/org/spockframework/spring7/RuntimeCompatibilitySpec.groovy

@@ -0,0 +1,24 @@
+package org.spockframework.spring7
+
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.test.context.ContextConfiguration
+import spock.lang.Specification
+
+import java.util.concurrent.Executor
+
+@ContextConfiguration(classes = TestConfig)
+class RuntimeCompatibilitySpec extends Specification {
+
+  @Autowired
+  Executor injectMe
+
+  def "no runtime errors are thrown"() {
+    expect:
+    1 == 1
+  }
+
+  def "injection works"() {
+    expect:
+    injectMe != null
+  }
+}

spock-spring/spring7-test/src/test/groovy/org/spockframework/spring7/SpringBeanTest.groovy

@@ -0,0 +1,30 @@
+package org.spockframework.spring7
+
+import org.spockframework.spring.SpringBean
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.test.context.ContextConfiguration
+import spock.lang.Specification
+
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Future
+
+@ContextConfiguration(classes = NoMockConfig)
+class SpringBeanTest extends Specification {
+
+  @Autowired
+  ServiceExecutor serviceExecutor
+
+  @SpringBean
+  ExecutorService executor = Mock()
+
+  def "replace executor"() {
+    when:
+    def result = serviceExecutor.exec()
+
+    then:
+    result == 'mocked'
+    1 * executor.submit(_) >> Stub(Future) {
+      get() >> 'mocked'
+    }
+  }
+}

spock-spring/spring7-test/src/test/groovy/org/spockframework/spring7/SpringRunnerTest.java

@@ -0,0 +1,21 @@
+package org.spockframework.spring7;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * Make sure we still can correctly execute tests executed by the SpringRunner that are not spock tests
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+public class SpringRunnerTest {
+
+  @Test
+  public void testThatSpringRunnerExecutesCorrectly() {
+    Assert.assertTrue(true);
+  }
+
+}