Review Feedback Vol. 1

Author: Vampire

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..javaVersions.max()),
+  "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

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

@@ -1,4 +1,4 @@
-def springVersion = "7.0.0"
+def springVersion = "7.0.6"
 
 java {
   toolchain {

spock-spring/src/main/java/org/spockframework/spring/SpringExtension.java

@@ -132,7 +132,9 @@ private void checkNoSharedFieldsInjected(SpecInfo spec) {
         && (field.getReflection().isAnnotationPresent(Autowired.class)
         // avoid compile-time dependency on optional classes
         || ReflectionUtil.isAnnotationPresent(field.getReflection(), "javax.annotation.Resource")
-        || ReflectionUtil.isAnnotationPresent(field.getReflection(), "javax.inject.Inject"))) {
+        || ReflectionUtil.isAnnotationPresent(field.getReflection(), "jakarta.annotation.Resource")
+        || ReflectionUtil.isAnnotationPresent(field.getReflection(), "javax.inject.Inject")
+        || ReflectionUtil.isAnnotationPresent(field.getReflection(), "jakarta.inject.Inject"))) {
         throw new SpringExtensionException(
           "@Shared field injection is not enabled by default therefore '%s' field cannot be injected. Refer to " +
             "javadoc of %s for information on how to opt-in for @Shared field injection.")

spock-spring/src/test/groovy/org/spockframework/spring/ContextHierarchyExample.groovy

@@ -18,7 +18,8 @@ package org.spockframework.spring
 
 import spock.lang.Specification
 
-import javax.inject.Inject
+import javax.inject.Inject as JavaxInject
+import jakarta.inject.Inject
 
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.test.context.*
@@ -28,6 +29,7 @@ class ContextHierarchyExample extends Specification {
   @Autowired
   Service1 service1
 
+  @JavaxInject
   @Inject
   Service2 service2
 

spock-spring/src/test/groovy/org/spockframework/spring/InjectionExamples.groovy

@@ -38,7 +38,7 @@ class InjectionExamples extends Specification {
   }
 
   @Requires({ReflectionUtil.isClassAvailable("javax.annotation.Resource")})
-  def "injecting a field by name"() {
+  def "injecting a field by name with javax"() {
     def runner = new EmbeddedSpecRunner()
 
     when:
@@ -50,6 +50,35 @@ import org.spockframework.spring.IService1
 import org.springframework.test.context.ContextConfiguration
 import spock.lang.*
 
+@ContextConfiguration(locations = "InjectionExamples-context.xml")
+class Foo extends Specification {
+  @Resource
+  IService1 myService1
+
+  def foo() {
+    expect:
+    myService1 instanceof IService1
+  }
+}
+    """
+
+    then:
+    noExceptionThrown()
+  }
+
+  @Requires({ReflectionUtil.isClassAvailable("jakarta.annotation.Resource")})
+  def "injecting a field by name with jakarta"() {
+    def runner = new EmbeddedSpecRunner()
+
+    when:
+    runner.run """
+package org.spockframework.spring
+
+import jakarta.annotation.Resource
+import org.spockframework.spring.IService1
+import org.springframework.test.context.ContextConfiguration
+import spock.lang.*
+
 @ContextConfiguration(locations = "InjectionExamples-context.xml")
 class Foo extends Specification {
   @Resource

spock-spring/src/test/groovy/org/spockframework/spring/MockInjectionExample.groovy

@@ -22,7 +22,8 @@ import org.springframework.test.context.ContextConfiguration
 import spock.lang.IgnoreIf
 import spock.lang.Specification
 
-import javax.inject.Named
+import javax.inject.Named as JavaxNamed
+import jakarta.inject.Named
 
 @IgnoreIf(
   value = { jvm.java17Compatible },
@@ -32,23 +33,28 @@ import javax.inject.Named
 class MockInjectionExample extends Specification {
 
   @Autowired
+  @JavaxNamed('serviceMock')
   @Named('serviceMock')
   IService1 serviceMock
 
 
   @Autowired
+  @JavaxNamed('serviceStub')
   @Named('serviceStub')
   IService1 serviceStub
 
   @Autowired
+  @JavaxNamed('serviceSpy')
   @Named('serviceSpy')
   IService2 serviceSpy
 
   @Autowired
+  @JavaxNamed('service2')
   @Named('service2')
   IService2 service2
 
   @Autowired
+  @JavaxNamed('nonMock')
   @Named('nonMock')
   ArrayList concreteSpy;
 

spock-spring/src/test/groovy/org/spockframework/spring/SharedFieldsInjection.groovy

@@ -5,7 +5,7 @@ import org.springframework.test.context.ContextConfiguration
 import spock.lang.Specification
 import spock.util.EmbeddedSpecRunner
 
-import javax.inject.Inject
+import jakarta.inject.Inject
 
 import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD
 import static org.springframework.test.annotation.DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD
@@ -45,7 +45,9 @@ class SharedFieldsInjection extends Specification {
     ann << [
       "org.springframework.beans.factory.annotation.Autowired",
       "javax.annotation.Resource",
-      "javax.inject.Inject"
+      "jakarta.annotation.Resource",
+      "javax.inject.Inject",
+      "jakarta.inject.Inject"
     ].findAll(ReflectionUtil.&isClassAvailable)
   }
 
@@ -55,6 +57,7 @@ class SharedFieldsInjection extends Specification {
       @ContextConfiguration(locations = "/org/spockframework/spring/InjectionExamples-context.xml")
       @EnableSharedInjection
       class Foo extends Specification {
+        @javax.inject.Inject
         @Inject
         @Shared
         IService1 sharedService
@@ -79,6 +82,7 @@ class SharedFieldsInjection extends Specification {
     def result = runner.runWithImports '''
       @EnableSharedInjection
       abstract class AbstractSharedInjectionSpec extends Specification {
+        @javax.inject.Inject
         @Inject
         @Shared
         IService1 sharedService
@@ -109,6 +113,7 @@ class SharedFieldsInjection extends Specification {
       @ContextConfiguration
       @EnableSharedInjection
       class Foo extends Specification {
+        @javax.inject.Inject
         @Inject
         @Shared
         IService1 sharedService
@@ -198,6 +203,7 @@ class SharedFieldsInjection extends Specification {
       @EnableSharedInjection
       @DirtiesContext
       class Foo extends Specification {
+        @javax.inject.Inject
         @Inject
         @Shared
         IService1 sharedService

spock-spring/src/test/groovy/org/spockframework/spring/docs/MockExamples.groovy

@@ -19,23 +19,34 @@ package org.spockframework.spring.docs
 import spock.lang.IgnoreIf
 import spock.lang.Specification
 
-import javax.inject.Named
+import javax.inject.Named as JavaxNamed
+import jakarta.inject.Named
 
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.test.context.ContextConfiguration
 
 abstract class MockExampleBase extends Specification {
 
+  @JavaxNamed('serviceMock')
 //tag::example[]
   @Autowired @Named('serviceMock')
   GreeterService serviceMock
 
+//end::example[]
+  @JavaxNamed('serviceStub')
+//tag::example[]
   @Autowired @Named('serviceStub')
   GreeterService serviceStub
 
+//end::example[]
+  @JavaxNamed('serviceSpy')
+//tag::example[]
   @Autowired @Named('serviceSpy')
   GreeterService serviceSpy
 
+//end::example[]
+  @JavaxNamed('alternativeMock')
+//tag::example[]
   @Autowired @Named('alternativeMock')
   GreeterService alternativeMock
 

spock-spring/src/test/groovy/org/spockframework/spring/mock/ComplexUsageSpec.groovy

@@ -21,7 +21,6 @@ import org.spockframework.util.VersionNumber
 import spock.lang.IgnoreIf
 import spock.lang.Specification
 
-import javax.inject.Named
 import java.lang.annotation.*
 
 import org.springframework.beans.factory.annotation.*

spock-spring/src/test/groovy/org/spockframework/spring/mock/imported/SpringSpyWithAopProxyTests.groovy

@@ -20,7 +20,8 @@ import org.spockframework.spring.*
 import org.springframework.core.SpringVersion
 import spock.lang.*
 
-import javax.inject.Inject
+import javax.inject.Inject as JavaxInject
+import jakarta.inject.Inject
 
 import org.springframework.cache.CacheManager
 import org.springframework.cache.annotation.*
@@ -44,6 +45,7 @@ class SpringSpyWithAopProxyTests extends Specification {
   @UnwrapAopProxy
   private DateService spyService
 
+  @JavaxInject
   @Inject
   private DateService dateService