Merge branch 'master' into vampire/mixin-spec-internals

Author: AndreasTu

docs/release_notes.adoc

@@ -59,6 +59,7 @@ will now require that the spec is annotated with <<parallel_execution.adoc#isola
 
 * Fix vararg handling in SpyStatic spockIssue:2161[]
 * Fix incompatibility with JUnit 6 in OSGi environment spockIssue:2231[]
+* OSGi: Pin the `Require-Capability:osgi.ee=JavaSE` to Java `8` spockPull:2233[]
 
 == 2.4-M6 (2025-04-15)
 

spock-core/core.gradle

@@ -91,6 +91,18 @@ tasks.named("jar", Jar) {
        * https://bnd.bndtools.org/instructions/reproducible.html
        */
       '-reproducible': 'true',
+      /*
+       * Disable automatic EE detection: https://bnd.bndtools.org/instructions/noee.html
+       * Which would generate something like:
+       * {@code Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=21))"}
+       * in Java 21, which is wrong, because we want to be runnable in Java 8 and newer.
+       *
+       * Note: Currently in bnd 7.1.0 and Java 25 you will get:
+       * {@code Require-Capability: osgi.ee;filter:="(osgi.ee=UNKNOWN)"}
+       */
+      '-noee': 'true',
+      //Instead set the osgi.ee manually to Java 8
+      'Require-Capability': 'osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"'
     )
   }
 }